Merge pull request #55 from icapps/feature/ProviderValue

Feature/provider value
icapps · Sep 29, 2021 · 6e67cb2 · 6e67cb2
2 parents 10f72e2 + 2833de5
commit 6e67cb2
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Changelog
+## [0.4.3] - 2021-09-29
+### Added
+- Add .value constructor for BaseProviderWidget
+
 ## [0.4.2] - 2021-09-02
 ### Fixed
 - Expose the SimpleKeyValueStorage interface

diff --git a/lib/src/widget/provider/provider_widget.dart b/lib/src/widget/provider/provider_widget.dart
@@ -4,6 +4,7 @@ import 'package:provider/provider.dart';
 
 class BaseProviderWidget<T extends ChangeNotifier, Theme, Localization>
     extends StatelessWidget {
+  final T? value;
   final T Function() create;
   final Widget? child;
   final Widget Function(
@@ -27,39 +28,63 @@ class BaseProviderWidget<T extends ChangeNotifier, Theme, Localization>
     this.consumerChild,
     this.childBuilderWithViewModel,
     this.lazy = true,
-  });
+  }) : this.value = null;
+
+  const BaseProviderWidget.value({
+    required this.value,
+    this.child,
+    this.childBuilder,
+    this.consumer,
+    this.consumerWithThemeAndLocalization,
+    this.consumerChild,
+    this.childBuilderWithViewModel,
+  })  : this.lazy = false,
+        this.create = _notImplemented;
 
   @override
   Widget build(BuildContext context) {
+    final consumerCreator = Builder(
+      builder: (context) {
+        if (consumerWithThemeAndLocalization != null || consumer != null) {
+          return Consumer<T>(
+            child: consumerChild ?? Container(),
+            builder: consumer ??
+                (context, t, widget) => consumerWithThemeAndLocalization!(
+                    context,
+                    t,
+                    widget,
+                    themeLookup(context),
+                    localizationLookup(context)),
+          );
+        } else if (child != null) {
+          return child!;
+        } else if (childBuilder != null) {
+          return childBuilder!(
+              context, themeLookup(context), localizationLookup(context));
+        } else if (childBuilderWithViewModel != null) {
+          return childBuilderWithViewModel!(context, Provider.of<T>(context),
+              themeLookup(context), localizationLookup(context));
+        }
+        throw ArgumentError(
+            'child, childBuilder, childBuilderWithViewModel, consumer or consumerWithThemeAndLocalization should be passed');
+      },
+    );
+
+    if (value != null) {
+      return ChangeNotifierProvider.value(
+        value: value,
+        child: consumerCreator,
+      );
+    }
+
     return ChangeNotifierProvider<T>(
       lazy: lazy,
-      child: LayoutBuilder(
-        builder: (context, constraints) {
-          if (consumerWithThemeAndLocalization != null || consumer != null) {
-            return Consumer<T>(
-              child: consumerChild ?? Container(),
-              builder: consumer ??
-                  (context, t, widget) => consumerWithThemeAndLocalization!(
-                      context,
-                      t,
-                      widget,
-                      themeLookup(context),
-                      localizationLookup(context)),
-            );
-          } else if (child != null) {
-            return child!;
-          } else if (childBuilder != null) {
-            return childBuilder!(
-                context, themeLookup(context), localizationLookup(context));
-          } else if (childBuilderWithViewModel != null) {
-            return childBuilderWithViewModel!(context, Provider.of<T>(context),
-                themeLookup(context), localizationLookup(context));
-          }
-          throw ArgumentError(
-              'child, childBuilder, childBuilderWithViewModel, consumer or consumerWithThemeAndLocalization should be passed');
-        },
-      ),
+      child: consumerCreator,
       create: (context) => create(),
     );
   }
+
+  static T _notImplemented<T>() {
+    throw UnimplementedError();
+  }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -3,7 +3,7 @@ description: icapps architecture components for flutter projects. Contains commo
 homepage: https://github.com/icapps/flutter-icapps-architecture
 repository: https://github.com/icapps/flutter-icapps-architecture
 
-version: 0.4.2
+version: 0.4.3
 
 environment:
   sdk: '>=2.12.0 <3.0.0'

diff --git a/test/provider/change_notifier_ex_test.dart b/test/provider/change_notifier_ex_test.dart
@@ -81,7 +81,10 @@ void main() {
       verify(subscription.cancel()).called(1);
     });
     test('Double dispose throws', () {
-      expect(() => TestableChangeNotifier()..dispose()..dispose(),
+      expect(
+          () => TestableChangeNotifier()
+            ..dispose()
+            ..dispose(),
           throwsA(isInstanceOf<FlutterError>()));
     });
   });

diff --git a/test/widget/provider/img/provider_widget_value_child_builder.png b/test/widget/provider/img/provider_widget_value_child_builder.png
diff --git a/test/widget/provider/provider_widget_test.dart b/test/widget/provider/provider_widget_test.dart
@@ -38,6 +38,29 @@ class ProviderWidget<T extends ChangeNotifier>
           consumerWithThemeAndLocalization: consumerWithThemeAndLocalization,
           lazy: lazy,
         );
+
+  ProviderWidget.value({
+    required T value,
+    Widget? child,
+    Widget Function(BuildContext context, Theme theme, Locale localization)?
+        childBuilder,
+    Widget Function(BuildContext context, T viewModel, Theme theme,
+            Locale localization)?
+        childBuilderWithViewModel,
+    Widget? consumerChild,
+    Widget Function(BuildContext context, T viewModel, Widget? child)? consumer,
+    Widget Function(BuildContext context, T viewModel, Widget? child,
+            Theme theme, Locale localization)?
+        consumerWithThemeAndLocalization,
+  }) : super.value(
+          value: value,
+          child: child,
+          childBuilder: childBuilder,
+          childBuilderWithViewModel: childBuilderWithViewModel,
+          consumerChild: consumerChild,
+          consumer: consumer,
+          consumerWithThemeAndLocalization: consumerWithThemeAndLocalization,
+        );
 }
 
 LocaleT getLocale<LocaleT>(BuildContext _) => Locale() as LocaleT;
@@ -81,6 +104,29 @@ void main() {
       await TestUtil.takeScreenshot(tester, 'provider_widget_child_builder');
     });
 
+    testWidgets('ProviderWidget.value should show childbuilder with viewmodel',
+        (tester) async {
+      final sut = ProviderWidget<TestViewModel>.value(
+        childBuilderWithViewModel: (context, item, _, __) =>
+            const Material(child: Text('Test')),
+        value: TestViewModel(),
+      );
+
+      await TestUtil.loadWidgetWithText(tester, sut);
+      await TestUtil.takeScreenshot(
+          tester, 'provider_widget_value_child_builder');
+    });
+
+    testWidgets('ProviderWidget.value create should throw', (tester) async {
+      final sut = ProviderWidget<TestViewModel>.value(
+        childBuilderWithViewModel: (context, item, _, __) =>
+            const Material(child: Text('Test')),
+        value: TestViewModel(),
+      );
+
+      expect(() => sut.create(), throwsA(isInstanceOf<UnimplementedError>()));
+    });
+
     testWidgets('ProviderWidget should show childbuilder with consumer',
         (tester) async {
       final sut = ProviderWidget<TestViewModel>(