packages/wyatt_bloc_helper/README.md

@@ -116,19 +116,6 @@ Widget onBuild(BuildContext context, CounterState state) {
 }
 ```
 
-If needed, you can wrap what depends on the state with the function `onWrap`.
-
-```dart
-@override
-Widget onWrap(BuildContext context, Widget child) {
-    return Scaffold(
-        appBar: AppBar(
-            title: const Text('Title'),
-        ),
-        body: child,
-    );
-```
-
 > Note: you can override `onBuild`, but also `onListen`, `shouldBuildWhen` and `shouldListenWhen` methods.
 
 ### Both BlocProvider and BlocConsumer

packages/wyatt_bloc_helper/lib/src/bloc_base/bloc_base_consumer_screen.dart

@@ -36,20 +36,17 @@ abstract class BlocBaseConsumerScreen<B extends BlocBase<S>, S extends Object>
   /// must return a widget.
   Widget onBuild(BuildContext context, S state);
 
-  /// The [onWrap] function which will be invoked on each widget build.
-  /// The [onWrap] takes the `BuildContext`
-  /// Used to wrap which depends on the state.
-  Widget onWrap(BuildContext context, Widget child) => child;
-
   /// Takes the `BuildContext` along with the `state`
   /// and is responsible for executing in response to `state` changes.
   void onListen(BuildContext context, S state) {}
 
   @override
-  Widget build(BuildContext context) => BlocConsumer<B, S>(
+  Widget build(BuildContext context) {
+    return BlocConsumer<B, S>(
       listenWhen: shouldListenWhen,
       listener: onListen,
       buildWhen: shouldBuildWhen,
-        builder: (context, state) => onWrap(context, onBuild(context, state)),
+      builder: onBuild,
     );
   }
+}

packages/wyatt_bloc_helper/lib/src/bloc_base/bloc_base_provider_screen.dart

@@ -28,8 +28,10 @@ abstract class BlocBaseProviderScreen<B extends BlocBase<S>, S extends Object>
   Widget buildChild(BuildContext context);
 
   @override
-  Widget build(BuildContext context) => BlocProvider<B>(
+  Widget build(BuildContext context) {
+    return BlocProvider<B>(
       create: (_) => create(context),
       child: Builder(builder: buildChild),
     );
   }
+}

packages/wyatt_bloc_helper/lib/src/bloc_base/bloc_base_screen.dart

@@ -26,8 +26,10 @@ abstract class BlocBaseScreen<B extends BlocBase<S>, S extends Object>
   B create(BuildContext context);
 
   @override
-  Widget build(BuildContext context) => BlocProvider<B>(
+  Widget build(BuildContext context) {
+    return BlocProvider<B>(
       create: (_) => create(context),
       child: super.build(context),
     );
   }
+}

packages/wyatt_bloc_helper/lib/src/mixins/bloc_base_provider_mixin.dart

@@ -21,8 +21,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 /// [Bloc] and [Cubit] widgets.
 mixin BlocBaseProviderMixin<B extends BlocBase<Object>> {
   /// Returns the [BlocBase] used by this [BlocBaseProviderMixin].
-  B bloc(BuildContext context) => context.read<B>();
+  B bloc(BuildContext context) => BlocProvider.of<B>(context);
 
   /// Returns the [BlocBase] used by this [BlocBaseProviderMixin].
-  R repo<R>(BuildContext context) => context.read<R>();
+  R repo<R>(BuildContext context) => RepositoryProvider.of<R>(context);
 }

packages/wyatt_bloc_helper/lib/src/mixins/bloc_provider_mixin.dart

@@ -20,5 +20,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 /// [Bloc] specific mixin that provides implementation 
 /// of helper methods for events.
 mixin BlocProviderMixin<B extends Bloc<E, Object>, E> {
-  void add(BuildContext context, E event) => context.read<B>().add(event);
+  void add(BuildContext context, E event) {
+    BlocProvider.of<B>(context).add(event);
+  }
 }