Fix CupertinoButton Style

3003h · Dec 19, 2024 · ef37535 · ef37535
1 parent 86ecb81
commit ef37535
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/lib/common/service/theme_service.dart b/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;
     }
   }
 

diff --git a/lib/const/theme_colors.dart b/lib/const/theme_colors.dart
@@ -182,6 +182,7 @@ class ThemeColors {
     brightness: Brightness.light,
     barBackgroundColor: navigationBarBackground,
     textTheme: ehTextTheme,
+    primaryColor: CupertinoColors.systemBlue,
     // scaffoldBackgroundColor: CupertinoColors.secondarySystemBackground,
   );
 

diff --git a/lib/pages/gallery/view/gallery_widget.dart b/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))),
       ),
     );
   }

diff --git a/lib/pages/login/view/login_page.dart b/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),
+                                ),
                         );
                       },
                     ),