Merge pull request #285 from GIfatahTH/dev

update to dart 3 (issue #284 )

examples/ex001_00_sync_global_and_local_state/lib/ex_013_00_state_persistance_List_of_Object.dart

@@ -107,6 +107,7 @@ class CounterViewModel {
     // set the state mutably
     _counter.setState((s) {
       s[index] = CounterModel(s[index].value + 1);
+      return null;
     });
   }
 }

examples/ex001_00_sync_global_and_local_state/lib/ex_013_00_state_persistence_List_of_Object.dart

@@ -107,6 +107,7 @@ class CounterViewModel {
     // set the state mutably
     _counter.setState((s) {
       s[index] = CounterModel(s[index].value + 1);
+      return null;
     });
   }
 }

examples/ex001_00_sync_global_and_local_state/lib/ex_014_00_state_interceptor.dart

@@ -20,6 +20,7 @@ enum WeatherCondition {
   snowy,
   unknown,
 }
+
 const defaultColor = Color(0xFF2196F3);
 
 // Set primary color theme depending on the weather condition
@@ -84,6 +85,7 @@ class WeatherService {
           ),
         );
       }
+      return null;
     },
   );
   Weather? get weather => weatherRM.state;

examples/ex001_00_sync_global_and_local_state/pubspec.yaml

@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.15.0 <3.0.0"
+  sdk: ">=2.15.0 <3.0.0" 
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions

examples/ex002_00_async_global_and_local_state/lib/ex_002_00_async_counter_app_with_state_rebuilder_full_api.dart

@@ -72,6 +72,7 @@ class CounterViewModel {
         // if the next state will be the waiting or the error state,
         // just return the current sate
         if (!nextSnap.hasData) return currentSnap;
+        return null;
         //
         // This is the right place to do some state validation before mutation
       },

examples/ex002_00_async_global_and_local_state/lib/ex_007_00_plugins_intialization.dart

@@ -26,7 +26,7 @@ class SemBastLocalStorage {
   }
 
   Future<void> write<T>(String key, T value) async {
-    return store.record('key').put(db, value);
+    await store.record('key').put(db, value);
   }
 
   Future<T> read<T>(String key) async {

examples/ex002_00_async_global_and_local_state/lib/ex_016_00_pessimistic_update.dart

@@ -64,6 +64,7 @@ class TodosViewModel {
         }
         // in all other cases set the _isWaitingForAddTodo to false
         _isWaitingForAddTodo.state = false;
+        return null;
       },
     );
   }

examples/ex002_00_async_global_and_local_state/lib/ex_017_00_optimistic_update.dart

@@ -65,6 +65,7 @@ class TodosViewModel {
             data: next.state.where((todo) => todo.id != todoToAdd.id).toList(),
           );
         }
+        return null;
       },
     );
   }

examples/ex004_00_navigation/lib/ex04_to_deeply_1.dart

@@ -7,7 +7,7 @@ void main() {
   runApp(const MyApp());
 }
 
-final navigator = RM.injectNavigator(
+final InjectedNavigator navigator = RM.injectNavigator(
   builder: (routerOutlet) {
     return Builder(
       builder: (context) {

examples/ex004_00_navigation/lib/ex07_on_navigate_cyclic_redirect.dart

@@ -25,6 +25,7 @@ final navigator = RM.injectNavigator(
     if (location == '/page4') {
       return data.redirectTo('/page5');
     }
+    return null;
   },
 );
 

examples/ex004_00_navigation/lib/ex08_on_navigate_redirection_from.dart

@@ -42,6 +42,7 @@ final navigator = RM.injectNavigator(
     if (location == '/page4' && data.queryParams['q'] == 'NaN') {
       return data.redirectTo('/redirect-page');
     }
+    return null;
   },
 );
 

examples/ex004_00_navigation/lib/ex09_on_navigate_signin.dart

@@ -34,6 +34,7 @@ final navigator = RM.injectNavigator(
       // Redirect the user to the home page
       return data.redirectTo('/');
     }
+    return null;
   },
 );
 

examples/ex004_00_navigation/lib/ex10_on_global_back_navigation.dart

@@ -29,6 +29,7 @@ final navigator = RM.injectNavigator(
       );
       return false;
     }
+    return null;
   },
 );
 

examples/ex004_00_navigation/lib/ex10_on_local_back_navigation.dart

@@ -22,6 +22,7 @@ final navigator = RM.injectNavigator(
       );
       return false;
     }
+    return null;
   },
 );
 

examples/ex004_00_navigation/lib/ex16_nested_route.dart

@@ -60,6 +60,7 @@ final navigator = RM.injectNavigator(
         postponeToNextFrame: true,
       );
     }
+    return null;
   },
 );
 

examples/ex004_00_navigation/lib/ex18_books_app.dart

@@ -74,6 +74,7 @@ final navigator = RM.injectNavigator(
       else if (signedIn && signingIn) {
         return routeData.redirectTo('/books');
       }
+      return null;
     });
 
 class App extends TopStatelessWidget {

examples/ex004_00_navigation/test/ex16_nested_route2_test.dart

@@ -1,5 +1,3 @@
-import 'dart:math';
-
 import 'package:ex_006_5_navigation/ex16_nested_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';

examples/ex005_00_crud_operations/lib/ex_000_crud_app_using_core_state_management/blocs/todos_bloc.dart

@@ -6,7 +6,6 @@ import 'package:uuid/uuid.dart';
 
 import '../data_source/i_todos_repository.dart';
 import '../data_source/todos_fake_repository.dart';
-import '../data_source/todos_http_repository.dart';
 import '../models/todo.dart';
 import '../models/todo_filter.dart';
 

examples/ex005_00_crud_operations/lib/ex_001_crud_app_using_injected_crud/blocs/todos_bloc.dart

@@ -1,11 +1,7 @@
-import 'dart:math';
-
 import 'package:flutter/material.dart';
 import 'package:states_rebuilder/states_rebuilder.dart';
 import 'package:uuid/uuid.dart';
 
-import '../data_source/i_todos_repository.dart';
-import '../data_source/todos_fake_repository.dart';
 import '../data_source/todos_http_repository.dart';
 import '../models/todo.dart';
 import '../models/todo_filter.dart';

examples/ex006_00_authentication_and_authorization/lib/ex_002_user_authentication_using_navigation2_api/navigator.dart

@@ -3,7 +3,6 @@ import 'package:states_rebuilder/scr/state_management/rm.dart';
 import 'blocs/auth_bloc.dart';
 import 'ui/home_page/home_page.dart';
 import 'ui/sign_in_page/sign_in_page.dart';
-import 'ui/sign_in_register_form_page/sign_in_register_form_page.dart';
 
 final navigator = RM.injectNavigator(
   routes: {

examples/ex006_00_authentication_and_authorization/lib/ex_003_auto_logout_and_refresh_token/blocs/auth_bloc.dart

@@ -4,7 +4,6 @@ import 'package:states_rebuilder/scr/state_management/rm.dart';
 
 import '../common/extensions.dart';
 import '../data_source/fake_auth_repository.dart';
-import '../data_source/firebase_auth_repository.dart';
 import '../models/user.dart';
 
 @immutable

examples/ex007_00_app_theme_management/pubspec.yaml

@@ -32,7 +32,7 @@ dependencies:
   hive_flutter: ^1.0.0
   states_rebuilder:
     path: ../../states_rebuilder_package
-  google_fonts: ^2.3.1
+  google_fonts: any
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2

examples/ex008_00_app_i18n_i10n/lib/ex_002_i18n_using_arb/l10n/app_ar.arb

@@ -3,7 +3,7 @@
     "helloWorld": "مرحبا بالجميع!",
     "welcome": "مرحبا {name}",
     "gender": "{gender, select, male {مرحبا يارجل!} female {مرحبا يامرأة!} other {مرحبا هناك!}}",
-    "plural": "{howMany, plural,=0{صفر رسالة} =1{رسالة واحدة} 2{رسالاتان} few{{howMany} رسائل}  other{{howMany} رسالة}}",
+    "plural": "{howMany, plural,=0{صفر رسالة} =1{رسالة واحدة} =2{رسالاتان} few{{howMany} رسائل}  other{{howMany} رسالة}}",
     "formattedNumber": "الرقم بعد التهيئة هو {value}",
     "date": "اليوم هو {date}"
 }

examples/ex008_00_app_i18n_i10n/lib/ex_002_i18n_using_arb/l10n/app_en.arb

@@ -7,7 +7,7 @@
     "welcome": "Welcome {name}",
     "@welcome": {
         "placeholders": {
-            "name": {}
+            "name": {} 
         }
     },
     "gender": "{gender, select, male {Hi man!} female {Hi woman!} other {Hi there!}}",

examples/ex008_00_app_i18n_i10n/pubspec.yaml

@@ -35,8 +35,8 @@ dependencies:
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.2
-  intl: ^0.17.0
+  cupertino_icons: any
+  intl: any
 
 dev_dependencies:
   flutter_test:

examples/ex009_00_animation/.metadata

@@ -1,10 +1,45 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: f4abaa0735eba4dfd8f33f73363911d63931fe03
+  revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
   channel: stable
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
+      base_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
+    - platform: android
+      create_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
+      base_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
+    - platform: ios
+      create_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
+      base_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
+    - platform: linux
+      create_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
+      base_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
+    - platform: macos
+      create_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
+      base_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
+    - platform: web
+      create_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
+      base_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
+    - platform: windows
+      create_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
+      base_revision: 90c64ed42ba53a52d18f0cb3b17666c8662ed2a0
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

examples/ex010_00_form_fields/lib/ex_006_00_other_form_fields.dart

@@ -27,8 +27,8 @@ class _Body extends StatelessWidget {
   static final form = RM.injectForm(
     autovalidateMode: AutovalidateMode.onUserInteraction,
   );
-  static final text = RM.injectTextEditing();
-  static final checkbox = RM.injectFormField(
+  // static final text = RM.injectTextEditing();
+  static final checkbox = RM.injectFormField<bool>(
     false,
     validators: [
       (val) => !val ? 'You must accept terms and conditions to continue' : null,

examples/ex010_00_form_fields/test/ex_002_00_text_fields_validation_using_injectTextEditing_test.dart

@@ -4,8 +4,8 @@ import 'package:flutter_test/flutter_test.dart';
 
 void main() {
   late Finder emailTextField;
-  late Finder passwordTextField;
-  late Finder activeLoginButton;
+  // late Finder passwordTextField;
+  // late Finder activeLoginButton;
   setUp(
     () {
       emailTextField = find.byWidgetPredicate(
@@ -14,15 +14,15 @@ void main() {
             widget.decoration?.labelText == "Email Address",
       );
 
-      passwordTextField = find.byWidgetPredicate(
-        (widget) =>
-            widget is TextField && widget.decoration?.labelText == "Password",
-      );
+      // passwordTextField = find.byWidgetPredicate(
+      //   (widget) =>
+      //       widget is TextField && widget.decoration?.labelText == "Password",
+      // );
 
-      //active login button is that with a non null onPressed parameter
-      activeLoginButton = find.byWidgetPredicate(
-        (widget) => widget is ElevatedButton && widget.onPressed != null,
-      );
+      // //active login button is that with a non null onPressed parameter
+      // activeLoginButton = find.byWidgetPredicate(
+      //   (widget) => widget is ElevatedButton && widget.onPressed != null,
+      // );
     },
   );
 

examples/ex010_00_form_fields/test/ex_003_00_text_fields_validation_using_injectedForm_test.dart

@@ -1,30 +1,29 @@
 import 'package:ex010_00_form_fields/ex_003_00_text_fields_validation_using_injectedForm.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 void main() {
-  late Finder emailTextField;
-  late Finder passwordTextField;
-  late Finder activeLoginButton;
-  setUp(
-    () {
-      emailTextField = find.byWidgetPredicate(
-        (widget) =>
-            widget is TextField &&
-            widget.decoration?.labelText == "Email Address",
-      );
+  // late Finder emailTextField;
+  // late Finder passwordTextField;
+  // late Finder activeLoginButton;
+  // setUp(
+  //   () {
+  //     emailTextField = find.byWidgetPredicate(
+  //       (widget) =>
+  //           widget is TextField &&
+  //           widget.decoration?.labelText == "Email Address",
+  //     );
 
-      passwordTextField = find.byWidgetPredicate(
-        (widget) =>
-            widget is TextField && widget.decoration?.labelText == "Password",
-      );
+  //     passwordTextField = find.byWidgetPredicate(
+  //       (widget) =>
+  //           widget is TextField && widget.decoration?.labelText == "Password",
+  //     );
 
-      //active login button is that with a non null onPressed parameter
-      activeLoginButton = find.byWidgetPredicate(
-        (widget) => widget is ElevatedButton && widget.onPressed != null,
-      );
-    },
-  );
+  //     //active login button is that with a non null onPressed parameter
+  //     activeLoginButton = find.byWidgetPredicate(
+  //       (widget) => widget is ElevatedButton && widget.onPressed != null,
+  //     );
+  //   },
+  // );
 
   testWidgets('email validation', (WidgetTester tester) async {
     // Build our app and trigger a frame.