Merge pull request #1534 from bitmark-inc/upgrade_flutter_3.19

fix: upgrade flutter, xcode version
bitmark-inc · Feb 27, 2024 · 0a1882b · 0a1882b
2 parents c652485 + b7ee398
commit 0a1882b
Show file tree

Hide file tree

Showing 39 changed files with 272 additions and 218 deletions.
diff --git a/.github/workflows/android-release-appcenter.yaml b/.github/workflows/android-release-appcenter.yaml
@@ -27,7 +27,7 @@ jobs:
           java-version: "17"
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.13.6"
+          flutter-version: "3.19.0"
           channel: stable
       - name: Set env
         run: |

diff --git a/.github/workflows/bmvn_build_appcenter_android.yaml b/.github/workflows/bmvn_build_appcenter_android.yaml
@@ -57,7 +57,7 @@ jobs:
           java-version: "17"
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.13.0"
+          flutter-version: "3.19.0"
           channel: stable
       - name: Set env
         run: |

diff --git a/.github/workflows/bmvn_build_appcenter_ios.yaml b/.github/workflows/bmvn_build_appcenter_ios.yaml
@@ -38,7 +38,7 @@ jobs:
       - name: Clone Flutter repository with master channel
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.13.0"
+          flutter-version: "3.19.0"
           channel: stable
       #      - uses: maxim-lobanov/setup-xcode@v1
       #        with:

diff --git a/.github/workflows/ios-release-appcenter.yaml b/.github/workflows/ios-release-appcenter.yaml
@@ -17,17 +17,17 @@ on:
 
 jobs:
   fastlane-deploy:
-    runs-on: macOS-12
+    runs-on: macOS-13
     steps:
       # Set up Flutter.
       - name: Clone Flutter repository with master channel
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.13.0"
+          flutter-version: "3.19.0"
           channel: stable
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "14.0"
+          xcode-version: "15.2"
 
       - name: Set env
         run: |

diff --git a/.github/workflows/ios-release-testflight.yaml b/.github/workflows/ios-release-testflight.yaml
@@ -12,17 +12,17 @@ on:
 
 jobs:
   fastlane-deploy:
-    runs-on: macOS-12
+    runs-on: macOS-13
     steps:
       # Set up Flutter.
       - name: Clone Flutter repository with master channel
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: "3.13.0"
+          flutter-version: "3.19.0"
           channel: stable
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: "14.2"
+          xcode-version: "15.2"
 
       - name: Set env
         run: |

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -4,6 +4,7 @@ buildscript {
         maven { url 'https://plugins.gradle.org/m2/' } // Gradle Plugin Portal
         google()  // Google's Maven repository
     }
+    ext.kotlin_version = '1.7.20'
     dependencies {
         // ...
         // OneSignal-Gradle-Plugin
@@ -12,6 +13,14 @@ buildscript {
     }
 }
 
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "kotlinx-serialization"
+    id "com.google.gms.google-services"
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -20,11 +29,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def environment = System.getenv()
 
 def flutterVersionCode = environment["FLUTTER_VERSION_CODE"]
@@ -59,14 +63,6 @@ if (branchKeyTest == null) {
 
 def branchTestMode = localProperties["branch.testMode"] ?: environment["BRANCH_IS_TEST"] ?: false
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlinx-serialization'
-apply plugin: 'com.google.gms.google-services'
-
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
-
 android {
     compileSdkVersion 34
     flavorDimensions 'env'

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,22 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.20'
-    repositories {
-        google()
-        mavenCentral {
-            content {
-                excludeGroup("com.facebook.react")
-            }
-        }
-
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1,11 +1,29 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
+    ext.kotlin_version = '1.7.20'
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.7.20" apply false
+    id "org.jetbrains.kotlin.plugin.serialization" version "1.7.20" apply false
+    id "com.google.gms.google-services" version "4.3.14" apply false
+}
+
+include ":app"
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -576,11 +576,11 @@
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
+				588939D828052E3E00FE3313 /* Embed App Extensions */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				FE698D0D002D57A6963D685A /* [CP] Embed Pods Frameworks */,
-				588939D828052E3E00FE3313 /* Embed App Extensions */,
 			);
 			buildRules = (
 			);

diff --git a/lib/screen/account/recovery_phrase_page.dart b/lib/screen/account/recovery_phrase_page.dart
@@ -160,8 +160,10 @@ class _RecoveryPhrasePageState extends State<RecoveryPhrasePage> {
 
   Widget _getBackUpState(BuildContext context) {
     final theme = Theme.of(context);
-    final customLinkStyle = theme.textTheme.ppMori400Black14
-        .copyWith(decoration: TextDecoration.underline);
+    final customLinkStyle = theme.textTheme.ppMori400Black14.copyWith(
+      decoration: TextDecoration.underline,
+      decorationColor: AppColor.primaryBlack,
+    );
     if (_isBackUpAvailable == null) {
       return const SizedBox();
     }

diff --git a/lib/screen/customer_support/support_thread_page.dart b/lib/screen/customer_support/support_thread_page.dart
@@ -603,8 +603,10 @@ class _SupportThreadPageState extends State<SupportThreadPage>
                       },
                       child: Text(
                         'retry'.tr(),
-                        style: theme.textTheme.ppMori400Black12
-                            .copyWith(decoration: TextDecoration.underline),
+                        style: theme.textTheme.ppMori400Black12.copyWith(
+                          decoration: TextDecoration.underline,
+                          decorationColor: AppColor.primaryBlack,
+                        ),
                       ),
                     ),
                     Text(
@@ -625,8 +627,10 @@ class _SupportThreadPageState extends State<SupportThreadPage>
                       },
                       child: Text(
                         'delete'.tr(),
-                        style: theme.textTheme.ppMori400Black12
-                            .copyWith(decoration: TextDecoration.underline),
+                        style: theme.textTheme.ppMori400Black12.copyWith(
+                          decoration: TextDecoration.underline,
+                          decorationColor: AppColor.primaryBlack,
+                        ),
                       ),
                     ),
                     const SizedBox(width: 6),

diff --git a/lib/screen/detail/artwork_detail_page.dart b/lib/screen/detail/artwork_detail_page.dart
@@ -260,7 +260,9 @@ class _ArtworkDetailPageState extends State<ArtworkDetailPage>
           appBar: AppBar(
             systemOverlayStyle: systemUiOverlayDarkStyle,
             leadingWidth: 0,
+            leading: const SizedBox(),
             centerTitle: false,
+            backgroundColor: Colors.transparent,
             title: ArtworkDetailsHeader(
               title: asset.title ?? '',
               subTitle: subTitle,

diff --git a/lib/screen/exhibitions/exhibitions_page.dart b/lib/screen/exhibitions/exhibitions_page.dart
@@ -157,7 +157,10 @@ class ExhibitionsPageState extends State<ExhibitionsPage> with RouteAware {
                         if (exhibition.curator != null)
                           RichText(
                               text: TextSpan(
-                                  style: theme.textTheme.ppMori400Grey14,
+                                  style: theme.textTheme.ppMori400Grey14
+                                      .copyWith(
+                                          decorationColor:
+                                              AppColor.disabledColor),
                                   children: [
                                 TextSpan(text: 'curated_by'.tr()),
                                 TextSpan(

diff --git a/lib/screen/interactive_postcard/postcard_detail_page.dart b/lib/screen/interactive_postcard/postcard_detail_page.dart
@@ -477,6 +477,7 @@ class ClaimedPostcardDetailPageState extends State<ClaimedPostcardDetailPage>
                   statusBarIconBrightness: Brightness.dark,
                   statusBarBrightness: Brightness.light,
                 ),
+                scrolledUnderElevation: 0,
                 toolbarHeight: 70,
                 centerTitle: false,
                 title: Text(

diff --git a/lib/screen/interactive_postcard/postcard_explain.dart b/lib/screen/interactive_postcard/postcard_explain.dart
@@ -207,8 +207,8 @@ class _PostcardExplainState extends State<PostcardExplain> {
 
   Widget _page1(VideoPlayerController controller) {
     final theme = Theme.of(context);
-    final termsConditionsStyle = theme.textTheme.moMASans400Grey12
-        .copyWith(color: AppColor.auQuickSilver);
+    final termsConditionsStyle = theme.textTheme.moMASans400Grey12.copyWith(
+        color: AppColor.auQuickSilver, decorationColor: AppColor.auQuickSilver);
     return SingleChildScrollView(
       child: Column(
         children: [

diff --git a/lib/screen/migration/key_sync_page.dart b/lib/screen/migration/key_sync_page.dart
@@ -163,7 +163,9 @@ class KeySyncPage extends StatelessWidget {
                                           ? theme.textTheme.ppMori400Black14
                                           : theme.textTheme.ppMori400Black16)
                                       .copyWith(
-                                          decoration: TextDecoration.underline),
+                                    decoration: TextDecoration.underline,
+                                    decorationColor: AppColor.primaryBlack,
+                                  ),
                                 ),
                               ),
                             ],

diff --git a/lib/screen/onboarding/view_address/view_existing_address.dart b/lib/screen/onboarding/view_address/view_existing_address.dart
@@ -121,8 +121,10 @@ class _ViewExistingAddressState extends State<ViewExistingAddress> {
                   );
                 },
                 child: Text('or_import_address'.tr(),
-                    style: theme.textTheme.ppMori400Black14
-                        .copyWith(decoration: TextDecoration.underline)),
+                    style: theme.textTheme.ppMori400Black14.copyWith(
+                      decoration: TextDecoration.underline,
+                      decorationColor: AppColor.primaryBlack,
+                    )),
               )
             ],
           ),

diff --git a/lib/screen/playlists/view_playlist/view_playlist.dart b/lib/screen/playlists/view_playlist/view_playlist.dart
@@ -187,14 +187,18 @@ class _ViewPlaylistScreenState extends State<ViewPlaylistScreen> {
                           ),
                           Align(
                             alignment: Alignment.centerRight,
-                            child: IconButton(
-                              onPressed: () => Navigator.pop(context),
-                              padding: const EdgeInsets.all(5),
-                              constraints: const BoxConstraints(
-                                  maxHeight: 28, maxWidth: 28),
-                              icon: const Icon(
-                                AuIcon.close,
-                                size: 18,
+                            child: SizedBox(
+                              height: 28,
+                              width: 28,
+                              child: IconButton(
+                                onPressed: () => Navigator.pop(context),
+                                padding: const EdgeInsets.all(0),
+                                icon: const Icon(
+                                  AuIcon.close,
+                                  size: 18,
+                                  color: AppColor.primaryBlack,
+                                  weight: 2,
+                                ),
                               ),
                             ),
                           ),

diff --git a/lib/screen/release_notes_page.dart b/lib/screen/release_notes_page.dart
@@ -71,8 +71,10 @@ class _ReleaseNotesPageState extends State<ReleaseNotesPage> {
                         GestureDetector(
                           child: Text(
                             'open_source'.tr(),
-                            style: theme.textTheme.ppMori400Black16
-                                .copyWith(decoration: TextDecoration.underline),
+                            style: theme.textTheme.ppMori400Black16.copyWith(
+                              decoration: TextDecoration.underline,
+                              decorationColor: AppColor.primaryBlack,
+                            ),
                           ),
                           onTap: () async => launchUrl(
                               Uri.parse(AUTONOMY_CLIENT_GITHUB_LINK),

diff --git a/lib/screen/scan_qr/scan_qr_page.dart b/lib/screen/scan_qr/scan_qr_page.dart
@@ -192,6 +192,7 @@ class ScanQRPageState extends State<ScanQRPage>
                         'show_my_code'.tr(),
                         style: theme.textTheme.ppMori400White14.copyWith(
                           decoration: TextDecoration.underline,
+                          decorationColor: AppColor.white,
                         ),
                       ),
                     )

diff --git a/lib/screen/settings/connection/accounts_view.dart b/lib/screen/settings/connection/accounts_view.dart
@@ -99,13 +99,8 @@ class _AccountsViewState extends State<AccountsView> {
                       ),
                     ),
                   ),
-                  Divider(
-                      height: 1,
-                      thickness: 1,
-                      color: (_editingAccountKey == null ||
-                              _editingAccountKey != account.key)
-                          ? null
-                          : theme.colorScheme.primary)
+                  const Divider(
+                      height: 1, thickness: 1, color: AppColor.auLightGrey)
                 ],
               ),
             ),
@@ -122,10 +117,12 @@ class _AccountsViewState extends State<AccountsView> {
       CustomSlidableAction(
         backgroundColor: AppColor.secondarySpanishGrey,
         foregroundColor: theme.colorScheme.secondary,
+        padding: EdgeInsets.zero,
         child: Semantics(
           label: '${account.key}_hide',
           child: SvgPicture.asset(
-              isHidden ? 'assets/images/unhide.svg' : 'assets/images/hide.svg'),
+            isHidden ? 'assets/images/unhide.svg' : 'assets/images/hide.svg',
+          ),
         ),
         onPressed: (_) {
           unawaited(account.setViewAccount(!isHidden));
@@ -135,6 +132,7 @@ class _AccountsViewState extends State<AccountsView> {
       CustomSlidableAction(
         backgroundColor: AppColor.auGreyBackground,
         foregroundColor: theme.colorScheme.secondary,
+        padding: EdgeInsets.zero,
         child: Semantics(
             label: '${account.name}_edit',
             child: SvgPicture.asset(
@@ -152,6 +150,7 @@ class _AccountsViewState extends State<AccountsView> {
       CustomSlidableAction(
         backgroundColor: Colors.red,
         foregroundColor: theme.colorScheme.secondary,
+        padding: EdgeInsets.zero,
         child: Semantics(
             label: '${account.name}_delete',
             child: SvgPicture.asset('assets/images/trash.svg')),