Merge pull request #19 from AhmedLSayed9/enhance/update_flutter_sdk

Update flutter sdk and do migrations
AhmedLSayed9 · Oct 18, 2024 · 26a9a6d · 26a9a6d
2 parents de8454b + 5115667
commit 26a9a6d
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,9 +18,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Flutter environment
-        uses: subosito/flutter-action@v2.10.0
+        uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.16.0"
+          channel: stable
+          flutter-version-file: pubspec.yaml # path to pubspec.yaml
 
       - name: Setup Firebase
         shell: bash

diff --git a/lib/core/core_features/theme/presentation/utils/app_theme.dart b/lib/core/core_features/theme/presentation/utils/app_theme.dart
@@ -114,7 +114,7 @@ class AppTheme {
     surfaceTintColor: Colors.transparent,
     shadowColor: _appColors.navBarColor,
     indicatorColor: _appColors.navBarIndicatorColor,
-    labelTextStyle: MaterialStatePropertyAll(
+    labelTextStyle: WidgetStatePropertyAll(
       TextStyles.navigationLabel(_appColors.customColors.font12Color!),
     ),
     elevation: Sizes.navBarElevation,

diff --git a/lib/core/presentation/components/no_internet_error_component.dart b/lib/core/presentation/components/no_internet_error_component.dart
@@ -48,7 +48,7 @@ class NoInternetErrorComponent extends StatelessWidget {
               await networkInfo.hasInternetConnection.then(
                 (value) {
                   if (value) {
-                    const SplashRoute().go(context);
+                    if (context.mounted) const SplashRoute().go(context);
                   }
                 },
               );

diff --git a/lib/core/presentation/screens/no_internet_screen/no_internet_screen.dart b/lib/core/presentation/screens/no_internet_screen/no_internet_screen.dart
@@ -12,7 +12,7 @@ class NoInternetScreen extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     return PopScope(
       canPop: false,
-      onPopInvoked: (_) => const SplashRoute().go(context),
+      onPopInvokedWithResult: (_, __) => const SplashRoute().go(context),
       child: WindowClassLayout(
         compact: (_) => OrientationLayout(
           portrait: (_) => const NoInternetScreenCompact(),

diff --git a/lib/core/presentation/screens/route_error_screen/route_error_screen.dart b/lib/core/presentation/screens/route_error_screen/route_error_screen.dart
@@ -14,7 +14,7 @@ class RouteErrorScreen extends HookConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     return PopScope(
       canPop: false,
-      onPopInvoked: (_) => const SplashRoute().go(context),
+      onPopInvokedWithResult: (_, __) => const SplashRoute().go(context),
       child: WindowClassLayout(
         compact: (_) => OrientationLayout(
           portrait: (_) => const ErrorScreenCompact(),

diff --git a/lib/features/home/domain/order.dart b/lib/features/home/domain/order.dart
@@ -35,7 +35,7 @@ class AppOrder with _$AppOrder {
   //Use custom equality implementation to ignore deliveryGeoPoint value
   //this helps [upcomingOrdersProvider] to ignore deliveryGeoPoint in deep equality of distinct method
   @override
-  bool operator ==(dynamic other) {
+  bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$_AppOrder &&

diff --git a/lib/features/home_shell/presentation/screens/home_shell_screen.dart b/lib/features/home_shell/presentation/screens/home_shell_screen.dart
@@ -70,7 +70,7 @@ class HomeShellScreen extends HookConsumerWidget {
 
     return PopScope(
       canPop: TabItem.values[navigationShell.currentIndex] == TabItem.home,
-      onPopInvoked: (canPop) {
+      onPopInvokedWithResult: (canPop, __) {
         //This prevent popping when tab isn't (Home) & instead will back to home.
         if (canPop) {
           navigationShell.goBranch(TabItem.home.index);

diff --git a/.../settings/presentation/components/settings_components/app_settings_section_component.dart b/.../settings/presentation/components/settings_components/app_settings_section_component.dart
@@ -35,7 +35,7 @@ class AppSettingsSectionComponent extends ConsumerWidget {
                 final changeTheme = value ? AppThemeMode.light : AppThemeMode.dark;
                 ref.read(appThemeControllerProvider.notifier).changeTheme(changeTheme);
               },
-              thumbColor: MaterialStatePropertyAll(customColors(context).whiteColor),
+              thumbColor: WidgetStatePropertyAll(customColors(context).whiteColor),
               activeColor: AppStaticColors.lightOrange,
               activeTrackColor: AppStaticColors.lightOrange,
             ),