Fix CupertinoButton Style

Author: 3003h

android/app/build.gradle

@@ -116,7 +116,7 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20"
-    implementation "androidx.startup:startup-runtime:1.1.1"
+    implementation "androidx.startup:startup-runtime:1.2.0"
     implementation 'com.google.mlkit:barcode-scanning:17.3.0'
 }
 
@@ -129,5 +129,5 @@ configurations.configureEach {
 ext {
     compileSdkVersion   = 34
     targetSdkVersion    = 34
-    appCompatVersion    = "1.7.0"
+    appCompatVersion    = "1.9.0"
 }

android/settings.gradle

@@ -20,7 +20,7 @@ plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version '7.4.2' apply false
     id "org.jetbrains.kotlin.android" version "1.7.20" apply false
-    id "com.google.gms.google-services" version "4.4.0" apply false
+    id "com.google.gms.google-services" version "4.4.2" apply false
     id "com.google.firebase.crashlytics" version "2.9.9" apply false
 }
 

lib/common/service/theme_service.dart

@@ -36,8 +36,6 @@ class ThemeService extends ProfileService {
         return ThemeColors.lightTheme;
       case ThemesModeEnum.darkMode:
         return _getDarkTheme;
-      default:
-        return null;
     }
   }
 

lib/const/theme_colors.dart

@@ -182,6 +182,7 @@ class ThemeColors {
     brightness: Brightness.light,
     barBackgroundColor: navigationBarBackground,
     textTheme: ehTextTheme,
+    primaryColor: CupertinoColors.systemBlue,
     // scaffoldBackgroundColor: CupertinoColors.secondarySystemBackground,
   );
 

lib/pages/gallery/view/gallery_widget.dart

@@ -239,21 +239,20 @@ class ReadButton extends StatelessWidget {
   Widget build(BuildContext context) {
     return Obx(
       () => MouseRegionClick(
-        child: CupertinoButton(
+        child: CupertinoButton.filled(
             minSize: 24,
             padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 6),
             borderRadius: BorderRadius.circular(20),
-            color: CupertinoColors.activeBlue,
+            // color: CupertinoColors.activeBlue,
             onPressed: _pageState.enableRead
                 ? () => _toViewPage(_pageState.galleryProvider?.gid ?? '0',
                     _pageState.lastIndex)
                 : null,
             child: Text(
-              (_pageState.lastIndex > 0)
-                  ? '${L10n.of(context).read.toUpperCase()} ${_pageState.lastIndex + 1}'
-                  : L10n.of(context).read.toUpperCase(),
-              style: const TextStyle(fontSize: 15, height: 1.2),
-            )),
+                (_pageState.lastIndex > 0)
+                    ? '${L10n.of(context).read.toUpperCase()} ${_pageState.lastIndex + 1}'
+                    : L10n.of(context).read.toUpperCase(),
+                style: const TextStyle(fontSize: 15, height: 1.2))),
       ),
     );
   }

lib/pages/login/view/login_page.dart

@@ -97,13 +97,16 @@ class LoginPage extends GetView<LoginController> {
                     height: 50,
                     child: GetBuilder<LoginController>(
                       builder: (logic) {
-                        return CupertinoButton(
-                          color: CupertinoColors.activeBlue,
+                        return CupertinoButton.filled(
+                          // color: CupertinoColors.activeBlue,
                           onPressed:
                               logic.loadingLogin ? null : logic.pressLogin,
                           child: logic.loadingLogin
                               ? const CupertinoActivityIndicator()
-                              : Text(L10n.of(context).login),
+                              : Text(
+                                  L10n.of(context).login,
+                                  style: const TextStyle(height: 1.2),
+                                ),
                         );
                       },
                     ),