Update of provider to v4.1.0 and related changes

Flutter v1.17+ is required now.
kaboc · May 7, 2020 · 55a1d19 · 55a1d19
1 parent 481b62b
commit 55a1d19
Show file tree

Hide file tree

Showing 17 changed files with 62 additions and 70 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -192,6 +192,7 @@ linter:
     - unnecessary_overrides
     - unnecessary_parenthesis
     - unnecessary_statements
+    - unnecessary_string_interpolations
     - unnecessary_this
     - unrelated_type_equality_checks
     # - unsafe_html # not yet tested

diff --git a/lib/main.dart b/lib/main.dart
@@ -7,7 +7,7 @@ void main() => runApp(
         title: 'provider examples',
         theme: ThemeData(
           textTheme: const TextTheme(
-            body1: TextStyle(fontSize: 32.0),
+            bodyText2: TextStyle(fontSize: 48.0),
           ),
         ),
       ),

diff --git a/lib/pages/change_notifier_provider.dart b/lib/pages/change_notifier_provider.dart
@@ -25,10 +25,14 @@ class _FloatingButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final counter = Provider.of<CnCounter>(context, listen: false);
-
     return FloatingActionButton(
-      onPressed: counter.increment,
+      // OK
+      // - onPressed: () => context.read<CnCounter>().increment()
+      // - onPressed: context.watch<CnCounter>().increment
+      // Bad
+      // - onPressed: context.read<CnCounter>().increment
+      // - onPressed: () => context.watch<CnCounter>().increment()
+      onPressed: () => context.read<CnCounter>().increment(),
       child: const Icon(Icons.add),
     );
   }
@@ -39,10 +43,10 @@ class _CounterText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final counter = Provider.of<CnCounter>(context);
+    final number = context.select((CnCounter counter) => counter.number);
 
     return Center(
-      child: Text(counter.number.toString()),
+      child: Text(number.toString()),
     );
   }
 }
diff --git a/lib/pages/change_notifier_provider_value.dart b/lib/pages/change_notifier_provider_value.dart
@@ -41,10 +41,10 @@ class _CounterText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final counter = Provider.of<CnCounter>(context);
+    final number = context.select((CnCounter counter) => counter.number);
 
     return Center(
-      child: Text(counter.number.toString()),
+      child: Text(number.toString()),
     );
   }
 }
diff --git a/lib/pages/dependency_injection.dart b/lib/pages/dependency_injection.dart
@@ -7,20 +7,14 @@ class DependencyInjectionPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return MultiProvider(
-      providers: [
-        ChangeNotifierProvider<CounterContainer>(
-          create: (_) => CounterContainer()..newCounter = DecCounter(),
-        ),
-        Consumer<CounterContainer>(
-          builder: (_, container, child) {
-            return ChangeNotifierProvider<CounterInterface>.value(
-              value: container.counter,
-              child: child,
-            );
-          },
-        ),
-      ],
+    return ChangeNotifierProvider<CounterContainer>(
+      create: (_) => CounterContainer()..newCounter = DecCounter(),
+      builder: (context, child) {
+        return ChangeNotifierProvider<CounterInterface>.value(
+          value: context.watch<CounterContainer>().counter,
+          child: child,
+        );
+      },
       child: Scaffold(
         appBar: AppBar(
           title: const Text('Dependency Injection'),
@@ -38,7 +32,7 @@ class _Switch extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final container = Provider.of<CounterContainer>(context);
+    final container = context.watch<CounterContainer>();
     final counter = container.counter;
 
     return Switch(
@@ -57,13 +51,13 @@ class _FloatingButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final counter = Provider.of<CounterInterface>(context);
+    final type =
+        context.select((CounterInterface counter) => counter.runtimeType);
 
     return FloatingActionButton(
-      onPressed: counter.increment,
+      onPressed: () => context.read<CounterInterface>().increment(),
       child: const Icon(Icons.add),
-      backgroundColor:
-          counter.runtimeType == DecCounter ? Colors.blue : Colors.green,
+      backgroundColor: type == DecCounter ? Colors.blue : Colors.green,
     );
   }
 }
@@ -73,7 +67,7 @@ class _CounterText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final counter = Provider.of<CounterInterface>(context);
+    final counter = context.watch<CounterInterface>();
 
     return Center(
       child: Column(

diff --git a/lib/pages/future_provider.dart b/lib/pages/future_provider.dart
@@ -28,7 +28,7 @@ class _FutureText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final description = Provider.of<String>(context);
+    final description = context.watch<String>();
 
     return Center(
       child: Text(

diff --git a/lib/pages/listenable_provider.dart b/lib/pages/listenable_provider.dart
@@ -36,10 +36,11 @@ class _Spinner extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final controller = Provider.of<AnimationController>(context);
+    final value =
+        context.select((AnimationController controller) => controller.value);
 
     return Transform.rotate(
-      angle: controller.value * 2.0 * math.pi,
+      angle: value * 2.0 * math.pi,
       child: const SizedBox(
         width: 200.0,
         height: 200.0,

diff --git a/lib/pages/provider.dart b/lib/pages/provider.dart
@@ -41,6 +41,9 @@ class _CounterText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    // Using context.read<CounterBloc>() inside build() causes an exception.
+    // Either of Provider.of(), context.watch() or context.select() has to be
+    // used instead.
     final bloc = Provider.of<CounterBloc>(context, listen: false);
 
     return StreamBuilder<String>(

diff --git a/lib/pages/proxy_provider.dart b/lib/pages/proxy_provider.dart
@@ -35,10 +35,8 @@ class _FloatingButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final counter = Provider.of<VnCounter>(context, listen: false);
-
     return FloatingActionButton(
-      onPressed: counter.increment,
+      onPressed: () => context.read<VnCounter>().increment(),
       child: const Icon(Icons.add),
     );
   }
@@ -49,8 +47,8 @@ class _CounterResults extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final decCounter = Provider.of<VnCounter>(context);
-    final hexCounter = Provider.of<HexCounter>(context);
+    final dec = context.select((VnCounter counter) => counter.value);
+    final hex = context.select((HexCounter counter) => counter.hex);
 
     return Center(
       child: Column(
@@ -60,13 +58,13 @@ class _CounterResults extends StatelessWidget {
             'Decimal',
             style: TextStyle(fontSize: 16.0),
           ),
-          Text(decCounter.value.toString()),
+          Text(dec.toString()),
           const SizedBox(height: 32.0),
           const Text(
             'Hexadecimal',
             style: TextStyle(fontSize: 16.0),
           ),
-          Text(hexCounter.hex),
+          Text(hex),
         ],
       ),
     );

diff --git a/lib/pages/proxy_provider0.dart b/lib/pages/proxy_provider0.dart
@@ -8,19 +8,14 @@ class ProxyProvider0Page extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return MultiProvider(
-      providers: [
-        ChangeNotifierProvider<VnCounter>(
-          create: (_) => VnCounter(),
-        ),
-        Consumer<VnCounter>(
-          builder: (_, vnCounter, child) => ProxyProvider0<HexCounter>(
-            create: (_) => HexCounter(),
-            update: (_, prev) => prev..newValue = vnCounter.value,
-            child: child,
-          ),
-        ),
-      ],
+    return ChangeNotifierProvider<VnCounter>(
+      create: (_) => VnCounter(),
+      builder: (context, child) => ProxyProvider0<HexCounter>(
+        create: (_) => HexCounter(),
+        update: (_, prev) => prev
+          ..newValue = context.select((VnCounter vnCounter) => vnCounter.value),
+        child: child,
+      ),
       child: Scaffold(
         appBar: AppBar(
           title: const Text('ProxyProvider0()'),
@@ -37,10 +32,8 @@ class _FloatingButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final counter = Provider.of<VnCounter>(context, listen: false);
-
     return FloatingActionButton(
-      onPressed: counter.increment,
+      onPressed: () => context.read<VnCounter>().increment(),
       child: const Icon(Icons.add),
     );
   }
@@ -51,8 +44,8 @@ class _CounterResults extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final decCounter = Provider.of<VnCounter>(context);
-    final hexCounter = Provider.of<HexCounter>(context);
+    final dec = context.select((VnCounter counter) => counter.value);
+    final hex = context.select((HexCounter counter) => counter.hex);
 
     return Center(
       child: Column(
@@ -62,13 +55,13 @@ class _CounterResults extends StatelessWidget {
             'Decimal',
             style: TextStyle(fontSize: 16.0),
           ),
-          Text(decCounter.value.toString()),
+          Text(dec.toString()),
           const SizedBox(height: 32.0),
           const Text(
             'Hexadecimal',
             style: TextStyle(fontSize: 16.0),
           ),
-          Text(hexCounter.hex),
+          Text(hex),
         ],
       ),
     );

diff --git a/lib/pages/selector.dart b/lib/pages/selector.dart
@@ -25,10 +25,8 @@ class _FloatingButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final counter = Provider.of<CnCounter>(context);
-
     return FloatingActionButton(
-      onPressed: counter.increment,
+      onPressed: () => context.read<CnCounter>().increment(),
       child: const Icon(Icons.add),
     );
   }

diff --git a/lib/pages/stream_provider.dart b/lib/pages/stream_provider.dart
@@ -43,7 +43,7 @@ class _CounterText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final number = Provider.of<int>(context);
+    final number = context.watch<int>();
 
     return Center(
       child: Text(number.toString()),

diff --git a/lib/pages/stream_provider_value.dart b/lib/pages/stream_provider_value.dart
@@ -43,7 +43,7 @@ class _CounterText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final number = Provider.of<int>(context);
+    final number = context.watch<int>();
 
     return Center(
       child: Text(number.toString()),

diff --git a/lib/pages/value_listenable_provider.dart b/lib/pages/value_listenable_provider.dart
@@ -30,7 +30,7 @@ class _CounterText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final number = Provider.of<int>(context);
+    final number = context.watch<int>();
 
     return Center(
       child: Text(number.toString()),

diff --git a/lib/pages/value_listenable_provider_value.dart b/lib/pages/value_listenable_provider_value.dart
@@ -41,7 +41,7 @@ class _CounterText extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final number = Provider.of<int>(context);
+    final number = context.watch<int>();
 
     return Center(
       child: Text(number.toString()),

diff --git a/pubspec.lock b/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.11"
+    version: "1.14.12"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -33,7 +33,7 @@ packages:
       name: provider
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.5"
+    version: "4.1.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -54,5 +54,5 @@ packages:
     source: hosted
     version: "2.0.8"
 sdks:
-  dart: ">=2.2.2 <3.0.0"
-  flutter: ">=1.12.1"
+  dart: ">=2.7.0 <3.0.0"
+  flutter: ">=1.17.0"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -10,7 +10,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  provider: ^4.0.5
+  provider: ^4.1.0
 
 flutter:
   uses-material-design: true