Added WithInjector and WithInstance widgets

example/example.dart

@@ -31,7 +31,7 @@ class MyModule implements Module {
 class SomeWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    final injector = FlutterInjector.of(context);
+    final injector = InjectorWidget.of(context);
     final apiKey = injector.get(name: "api_key");
     print(apiKey);
     return Container();

lib/dependencies_flutter.dart

@@ -8,5 +8,5 @@ import 'package:quiver/check.dart';
 part 'src/injector_widget.dart';
 part 'src/injector_widget_mixin.dart';
 part 'src/module_widget.dart';
-part 'src/flutter_injector.dart';
 part 'src/error.dart';
+part 'src/instance_widget.dart';

lib/src/injector_widget.dart

@@ -48,6 +48,17 @@ class InjectorWidget extends StatefulWidget {
 
   @override
   _InjectorWidgetState createState() => _InjectorWidgetState();
+
+  /// Gets an [Injector] from a ]BuildContext]
+  static Injector of(BuildContext context) {
+    final w = context.inheritFromWidgetOfExactType(_InjectorInheritedWidget);
+    if (w == null) {
+      throw InjectorWidgetError._internal(
+          "No `InjectorWidget` was found in the context.");
+    }
+    final injectorWidget = w as _InjectorInheritedWidget;
+    return injectorWidget.injector;
+  }
 }
 
 class _InjectorWidgetState extends State<InjectorWidget> {

lib/src/injector_widget_mixin.dart

@@ -4,7 +4,7 @@ part of 'package:dependencies_flutter/dependencies_flutter.dart';
 /// This can be applied to [State] or to [StatelessWidget] classes.
 abstract class InjectorWidgetMixin {
   Widget build(BuildContext context) {
-    return buildWithInjector(context, FlutterInjector.of(context));
+    return buildWithInjector(context, InjectorWidget.of(context));
   }
 
   /// Build the [Widget] with the existing [Injector].

lib/src/instance_widget.dart

@@ -0,0 +1,62 @@
+part of 'package:dependencies_flutter/dependencies_flutter.dart';
+
+/// Builder to construct a [Widget] for the given [Injector].
+typedef Widget InjectorBuilder(Injector injector);
+
+/// Widget able to build it's child from the [Injector] in the
+/// current [BuildContext].
+class WithInjectorWidget extends StatelessWidget with InjectorWidgetMixin {
+  final InjectorBuilder builder;
+
+  const WithInjectorWidget._internal({Key key, this.builder}) : super(key: key);
+
+  factory WithInjectorWidget({Key key, InjectorBuilder builder}) {
+    checkNotNull(builder, message: () => "builder can't be null");
+    return WithInjectorWidget._internal(
+      key: key,
+      builder: builder,
+    );
+  }
+
+  @override
+  Widget buildWithInjector(BuildContext context, Injector injector) {
+    return builder(injector);
+  }
+}
+
+/// Builder to construct a [Widget] for the given instance of type [T]
+typedef Widget InstanceBuilder<T>(T instance);
+
+/// Widget able to build it's child from the instance found in the [Injector]
+/// in the current [BuildContext].
+class WithInstanceWidget<T> extends StatelessWidget {
+  final InstanceBuilder builder;
+  final String name;
+  final Params params;
+
+  const WithInstanceWidget._internal({
+    Key key,
+    this.builder,
+    this.name,
+    this.params,
+  }) : super(key: key);
+
+  factory WithInstanceWidget(
+      {Key key, InstanceBuilder builder, String name, Params params}) {
+    checkNotNull(builder, message: () => "builder can't be null");
+    return WithInstanceWidget._internal(
+      key: key,
+      builder: builder,
+      name: name,
+      params: params,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return WithInjectorWidget(builder: (injector) {
+      final instance = injector.get<T>(name: name, params: params);
+      return builder(instance);
+    });
+  }
+}

pubspec.yaml

@@ -1,6 +1,6 @@
 name: dependencies_flutter
 description: A simple and modular dependency injection system for Flutter.
-version: 0.1.3
+version: 0.1.4
 homepage: https://github.com/marcguilera/dart_dependencies_flutter
 author: marcguilera <[email protected]>