Bump Flutter v3.10.3 & Dart SDK >=3.0.1 <4.0.0" (#1259)

* bump flutter&&dart versions

* impeller enable for IOS

* fix depracated callback_dispatcher test

* Delete BazaarSearch widget

* bump test version

* Try fix melos error

* Migrate to dart 3 Part 2 (refactoring `switch case`)  (#1260)

* change melos version

* migrated switch case to dart 3

* v1.10.0

* migrate swithc case in ew_http to dart 3

* tested on IOS & Android

* Migrate to Material 3 (#1245)

* try Migrate to Material 3 (01)

* try fix Iphone 8 plus CI test

---------

Co-authored-by: clangenb <37865735+clangenb@users.noreply.github.com>

---------

Co-authored-by: clangenb <37865735+clangenb@users.noreply.github.com>

* refactored by comments

---------

Co-authored-by: clangenb <37865735+clangenb@users.noreply.github.com>

Author: Eldar2021

.flutter

@@ -2,5 +2,5 @@
     "dart.flutterSdkPath": ".flutter",
     "dart.lineLength": 120,
     "git.ignoreLimitWarning": true,
-    "explorer.autoReveal": false,  
+    "explorer.autoReveal": false,
 }

.vscode/settings.json

@@ -28,8 +28,8 @@ Encointer wallet and client for mobile phones
 </p>
 
 ### Requirements
-- Dart sdk: ">=2.19.0 <3.0.0"
-- Flutter: "3.7.12"
+- Dart sdk: ">=3.0.1 <3.0.0"
+- Flutter: "3.10.3"
 - Android: minSdkVersion 17
 - iOS: --ios-language swift, Xcode version >= 14.0.0
 

README.md

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

app/android/build.gradle

@@ -126,12 +126,12 @@ DEPENDENCIES:
   - local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`)
   - mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
-  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
+  - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - printing (from `.symlinks/plugins/printing/ios`)
   - screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
   - share_plus (from `.symlinks/plugins/share_plus/ios`)
-  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
   - wakelock (from `.symlinks/plugins/wakelock/ios`)
 
@@ -183,7 +183,7 @@ EXTERNAL SOURCES:
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
-    :path: ".symlinks/plugins/path_provider_foundation/ios"
+    :path: ".symlinks/plugins/path_provider_foundation/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
   printing:
@@ -193,7 +193,7 @@ EXTERNAL SOURCES:
   share_plus:
     :path: ".symlinks/plugins/share_plus/ios"
   shared_preferences_foundation:
-    :path: ".symlinks/plugins/shared_preferences_foundation/ios"
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   url_launcher_ios:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
   wakelock:

app/ios/Podfile.lock

@@ -301,6 +301,7 @@
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (

app/ios/Runner.xcodeproj/project.pbxproj

@@ -104,6 +104,9 @@
 	<!-- local_auth -->
 	<key>NSFaceIDUsageDescription</key>
 	<string>Used to unlock the app to send transactions to other members</string>
+	<!-- Impeller -->
+	<key>FLTEnableImpeller</key>
+    <true/>
 	<!-- ... other tags -->
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>

app/ios/Runner/Info.plist

@@ -27,7 +27,7 @@ class WalletApp extends StatelessWidget {
       child: Observer(builder: (_) {
         return MaterialApp(
           title: 'EncointerWallet',
-          locale: context.watch<AppSettings>().locale,
+          locale: appSettings.locale,
           localizationsDelegates: [
             AppLocalizationsDelegate(appSettings.locale),
             GlobalMaterialLocalizations.delegate,

app/lib/app.dart

@@ -2,7 +2,6 @@ import 'dart:io';
 
 import 'package:encointer_wallet/config/node.dart';
 import 'package:encointer_wallet/config/prod_community.dart';
-import 'package:encointer_wallet/service/log/log_service.dart';
 import 'package:encointer_wallet/store/settings.dart';
 
 const String androidLocalHost = '10.0.2.2';
@@ -119,25 +118,17 @@ const assignmentFAQLinkEN = 'https://leu.zuerich/en/#why-have-i-not-been-assigne
 const assignmentFAQLinkDE = 'https://leu.zuerich/#warum-wurde-ich-keinem-cycle-zugewiesen';
 
 String leuZurichCycleAssignmentFAQLink(String locale) {
-  switch (locale) {
-    case 'en':
-      return assignmentFAQLinkEN;
-    case 'de':
-      return assignmentFAQLinkDE;
-    default:
-      Log.d('[replaceLocale] unsupported locale, defaulting to english', 'consts.dart');
-      return assignmentFAQLinkEN;
-  }
+  return switch (locale) {
+    'en' => assignmentFAQLinkEN,
+    'de' => assignmentFAQLinkDE,
+    _ => assignmentFAQLinkEN,
+  };
 }
 
 String replaceLocalePlaceholder(String link, String locale) {
-  switch (locale) {
-    case 'en':
-      return link.replaceAll(localePlaceHolder, 'en');
-    case 'de':
-      return link.replaceAll(localePlaceHolder, '');
-    default:
-      Log.d('[replaceLocale] unsupported locale, defaulting to english', 'consts.dart');
-      return link.replaceAll(localePlaceHolder, 'en');
-  }
+  return switch (locale) {
+    'en' => link.replaceAll(localePlaceHolder, 'en'),
+    'de' => link.replaceAll(localePlaceHolder, ''),
+    _ => link.replaceAll(localePlaceHolder, 'en'),
+  };
 }

app/lib/config/consts.dart

@@ -55,11 +55,9 @@ enum TransactionType {
 
   String getText(BuildContext context) {
     final dic = I18n.of(context)!.translationsForLocale().transaction;
-    switch (this) {
-      case TransactionType.outgoing:
-        return dic.sent;
-      case TransactionType.incoming:
-        return dic.received;
-    }
+    return switch (this) {
+      TransactionType.outgoing => dic.sent,
+      TransactionType.incoming => dic.received,
+    };
   }
 }

app/lib/models/transfer/transfer_history.dart

@@ -13,25 +13,21 @@ mixin HandleNewAccountResultMixin on Widget {
     required void Function() onOk,
     void Function()? onDuplicateAccount,
   }) async {
-    switch (type) {
-      case NewAccountResultType.ok:
-        onOk();
-        break;
-      case NewAccountResultType.error:
-        final dic = I18n.of(context)!.translationsForLocale();
-        AppAlert.showErrorDialog(context, errorText: dic.account.createError, buttontext: dic.home.ok);
-        break;
-      case NewAccountResultType.emptyPassword:
-        final appStore = context.read<AppStore>();
-        await AppAlert.showPasswordInputDialog(
+    final dic = I18n.of(context)!.translationsForLocale();
+    final appStore = context.read<AppStore>();
+    return switch (type) {
+      NewAccountResultType.ok => onOk(),
+      NewAccountResultType.error => AppAlert.showErrorDialog(
+          context,
+          errorText: dic.account.createError,
+          buttontext: dic.home.ok,
+        ),
+      NewAccountResultType.emptyPassword => await AppAlert.showPasswordInputDialog(
           context,
           account: appStore.account.currentAccount,
           onSuccess: appStore.settings.setPin,
-        );
-        break;
-      case NewAccountResultType.duplicateAccount:
-        if (onDuplicateAccount != null) onDuplicateAccount();
-        break;
-    }
+        ),
+      NewAccountResultType.duplicateAccount => onDuplicateAccount != null ? onDuplicateAccount() : null,
+    };
   }
 }

app/lib/modules/account/view/handle_new_account_result_mixin.dart

@@ -15,6 +15,7 @@ class AppService {
     if (code != null) {
       return Locale(code);
     } else {
+      // ignore: deprecated_member_use
       final deviceLocal = window.locale.languageCode;
       if (deviceLocal == 'en' || deviceLocal == 'de' || deviceLocal == 'ru' || deviceLocal == 'fr') {
         return Locale(deviceLocal);
@@ -37,17 +38,12 @@ class AppService {
   bool? getIsBiometricAuthenticationEnabled() => storage.getBool(enableBiometricAuthKey);
 
   String getLocaleName(String code) {
-    switch (code) {
-      case 'en':
-        return 'English';
-      case 'de':
-        return 'Deutsch';
-      case 'fr':
-        return 'Français';
-      case 'ru':
-        return 'Русский';
-      default:
-        return '';
-    }
+    return switch (code) {
+      'en' => 'English',
+      'de' => 'Deutsch',
+      'fr' => 'Français',
+      'ru' => 'Русский',
+      _ => '',
+    };
   }
 }

app/lib/modules/settings/service/app_service.dart

@@ -26,19 +26,16 @@ class TransferHistoryView extends StatelessWidget {
         style: context.textTheme.displayMedium,
       )),
       body: Observer(builder: (_) {
-        switch (transferHistoryStore.fetchStatus) {
-          case FetchStatus.loading:
-            return const CenteredActivityIndicator();
-          case FetchStatus.success:
-            return TransactionsList(transactions: transferHistoryStore.transactions ?? []);
-          case FetchStatus.error:
-            return ErrorView(
+        return switch (transferHistoryStore.fetchStatus) {
+          FetchStatus.loading => const CenteredActivityIndicator(),
+          FetchStatus.success => TransactionsList(transactions: transferHistoryStore.transactions ?? []),
+          FetchStatus.error => ErrorView(
               onRetryPressed: () {
                 final appStore = context.read<AppStore>();
                 context.read<TransferHistoryViewStore>().getTransfers(appStore);
               },
-            );
-        }
+            ),
+        };
       }),
     );
   }

app/lib/modules/transfer/view/transfer_history_view.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 
-import 'package:encointer_wallet/page-encointer/bazaar/1_home/bazaar_search/bazaar_search.dart';
 import 'package:encointer_wallet/page-encointer/bazaar/shared/bazaar_item_horizontal.dart';
 import 'package:encointer_wallet/page-encointer/bazaar/shared/data_model/demo_data/demo_data.dart';
 import 'package:encointer_wallet/utils/translations/index.dart';
@@ -23,7 +22,6 @@ class Home extends StatelessWidget {
           HorizontalBazaarItemList(lastVisited, dic.bazaar.lastVisited, cardHeight, cardWidth),
         ]),
       ),
-      const BazaarSearch(),
     ]);
   }
 }

app/lib/page-encointer/bazaar/1_home/bazaar_search/bazaar_search.dart

@@ -61,7 +61,7 @@ class BusinessDetail extends StatelessWidget {
                           headingRowHeight: 32,
                           columnSpacing: 4,
                           horizontalMargin: 8,
-                          dataRowHeight: 32,
+                          dataRowMinHeight: 32,
                           rows: List<DataRow>.generate(
                             7,
                             (int index) => DataRow(

app/lib/page-encointer/bazaar/1_home/home.dart

@@ -72,9 +72,9 @@ class CeremonyInfo extends StatelessWidget {
                 ),
               ],
             )
-          : Row(
+          : const Row(
               mainAxisAlignment: MainAxisAlignment.center,
-              children: const [
+              children: [
                 CupertinoActivityIndicator(),
               ],
             ),

app/lib/page-encointer/bazaar/3_businesses/business_detail.dart

@@ -120,14 +120,11 @@ class _AnnouncementViewState extends State<AnnouncementView> {
 
   /// NOTE: Do not write any functions inside [build]!
   Widget buildAnnouncementList(List<Announcement> announcements) {
-    switch (_announcementStore.fetchStatus) {
-      case FetchStatus.loading:
-        return const Center(child: CupertinoActivityIndicator());
-      case FetchStatus.success:
-        return AnnouncementList(announcements: announcements);
-      case FetchStatus.error:
-        return const SizedBox.shrink();
-    }
+    return switch (_announcementStore.fetchStatus) {
+      FetchStatus.loading => const Center(child: CupertinoActivityIndicator()),
+      FetchStatus.success => AnnouncementList(announcements: announcements),
+      FetchStatus.error => const SizedBox.shrink(),
+    };
   }
 
   String _getErrorMessages({
@@ -141,15 +138,11 @@ class _AnnouncementViewState extends State<AnnouncementView> {
     if (error.isNotNullOrEmpty) {
       return '${_dic.announcements} ${_dic.errorMessageWithStatusCode(error!)}';
     }
-    switch (failureType) {
-      case FailureType.badRequest:
-        return '${_dic.announcements} ${_dic.badRequest}';
-      case FailureType.noAuthorization:
-        return '${_dic.announcements} ${_dic.noAuthorizationError}';
-      // ignore: no_default_cases
-      default:
-        return '${_dic.announcements} ${_dic.somethingWentWrong}';
-    }
+    return switch (failureType) {
+      FailureType.badRequest => '${_dic.announcements} ${_dic.badRequest}',
+      FailureType.noAuthorization => '${_dic.announcements} ${_dic.noAuthorizationError}',
+      _ => '${_dic.announcements} ${_dic.somethingWentWrong}',
+    };
   }
 }
 

app/lib/page-encointer/ceremony_box/ceremony_info.dart

@@ -36,9 +36,9 @@ class PaymentOverview extends StatelessWidget {
               ),
             ],
           ),
-          Column(
+          const Column(
             mainAxisAlignment: MainAxisAlignment.center,
-            children: const [Icon(Icons.arrow_forward_ios_outlined), SizedBox(height: 20)],
+            children: [Icon(Icons.arrow_forward_ios_outlined), SizedBox(height: 20)],
           ),
           Column(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,