theme &cache

Author: Notsfsssf

android/app/build.gradle

@@ -84,8 +84,8 @@ android {
         applicationId packageName
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 10006020
-        versionName "0.6.2 sketch"
+        versionCode 10006030
+        versionName "0.6.3 elden"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

lib/constants.dart

@@ -15,7 +15,7 @@
  */
 
 class Constants {
-  static String tagName = "0.6.2";
+  static String tagName = "0.6.3";
   static const isGooglePlay =
       bool.fromEnvironment("IS_GOOGLEPLAY", defaultValue: false);
   static int type = 0;

lib/main.dart

@@ -121,9 +121,19 @@ class _MyAppState extends State<MyApp> {
         title: 'PixEz',
         builder: BotToastInit(),
         themeMode: userSetting.themeMode,
-        theme: userSetting.themeData,
+        theme: ThemeData.light().copyWith(
+            primaryColor: userSetting.themeData.colorScheme.primary,
+            primaryColorLight: userSetting.themeData.colorScheme.primary,
+            primaryColorDark: userSetting.themeData.colorScheme.primary,
+            colorScheme: ThemeData.light().colorScheme.copyWith(
+                  secondary: userSetting.themeData.colorScheme.secondary,
+                  primary: userSetting.themeData.colorScheme.primary,
+                )),
         darkTheme: ThemeData.dark().copyWith(
           scaffoldBackgroundColor: userSetting.isAMOLED ? Colors.black : null,
+          primaryColor: userSetting.themeData.colorScheme.primary,
+          primaryColorLight: userSetting.themeData.colorScheme.primary,
+          primaryColorDark: userSetting.themeData.colorScheme.primary,
           colorScheme: ThemeData.dark().colorScheme.copyWith(
               secondary: userSetting.themeData.colorScheme.secondary,
               primary: userSetting.themeData.colorScheme.primary),

lib/page/hello/android_hello_page.dart

@@ -75,11 +75,12 @@ class _AndroidHelloPageState extends State<AndroidHelloPage> {
       child: Observer(builder: (context) {
         if (accountStore.now != null &&
             (Platform.isIOS || Platform.isAndroid)) {
-          return LayoutBuilder(builder: (context, constraint) {
-            if (constraint.maxHeight > constraint.maxWidth)
-              return _buildPadScafford(context, constraint);
-            return _buildScaffold(context);
-          });
+          return _buildScaffold(context);
+          // return LayoutBuilder(builder: (context, constraint) {
+          //   if (constraint.maxHeight > constraint.maxWidth)
+          //     return _buildPadScafford(context, constraint);
+          //   return _buildScaffold(context);
+          // });
         }
         return LoginPage();
       }),

lib/page/hello/ranking/rank_page.dart

@@ -17,6 +17,7 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:pixez/i18n.dart';
 import 'package:pixez/main.dart';
@@ -168,7 +169,6 @@ class _RankPageState extends State<RankPage>
         children: <Widget>[
           AppBar(
             elevation: 0.0,
-            backgroundColor: Colors.transparent,
             title: Text(I18n.of(context).choice_you_like),
             actions: <Widget>[
               IconButton(

lib/page/hello/recom/recom_spotlight_page.dart

@@ -19,6 +19,7 @@ import 'dart:io';
 
 import 'package:extended_image/extended_image.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:pixez/component/illust_card.dart';
 import 'package:pixez/component/spotlight_card.dart';
@@ -130,6 +131,8 @@ class _RecomSpolightPageState extends State<RecomSpolightPage>
                   SliverAppBar(
                     elevation: 0.0,
                     titleSpacing: 0.0,
+                    systemOverlayStyle: SystemUiOverlayStyle(
+                        statusBarIconBrightness: Brightness.dark),
                     automaticallyImplyLeading: false,
                     backgroundColor: Colors.transparent,
                     title: _buildFirstRow(context),

lib/page/hello/setting/setting_page.dart

@@ -19,6 +19,7 @@ import 'dart:io';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:pixez/component/new_version_chip.dart';
@@ -100,6 +101,8 @@ class _SettingPageState extends State<SettingPage> {
                 AppBar(
                   elevation: 0.0,
                   automaticallyImplyLeading: false,
+                  systemOverlayStyle: SystemUiOverlayStyle(
+                      statusBarIconBrightness: Brightness.dark),
                   backgroundColor: Colors.transparent,
                   actions: [
                     if (kDebugMode)
@@ -358,7 +361,7 @@ class _SettingPageState extends State<SettingPage> {
   }
 
   _showCacheBottomSheet(BuildContext context) async {
-       final result = await showModalBottomSheet(
+    final result = await showModalBottomSheet(
         context: context,
         shape: const RoundedRectangleBorder(
             borderRadius: BorderRadius.only(

lib/page/search/result_page.dart

@@ -50,7 +50,6 @@ class _ResultPageState extends State<ResultPage> {
       child: Scaffold(
         appBar: AppBar(
           elevation: 0.0,
-          backgroundColor: Colors.transparent,
           title: TabBar(
               indicatorSize: TabBarIndicatorSize.label,
               indicator: MD2Indicator(

lib/page/search/search_page.dart

@@ -17,6 +17,7 @@
 import 'dart:io';
 import 'dart:ui';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:pixez/component/pixiv_image.dart';
 import 'package:pixez/i18n.dart';
@@ -327,6 +328,8 @@ class _SearchPageState extends State<SearchPage> with TickerProviderStateMixin {
                 elevation: 0.0,
                 titleSpacing: 0.0,
                 automaticallyImplyLeading: false,
+                systemOverlayStyle: SystemUiOverlayStyle(
+                    statusBarIconBrightness: Brightness.dark),
                 leading: RotationTransition(
                   alignment: Alignment.center,
                   turns: animation,

lib/page/zoom/photo_viewer_page.dart

@@ -63,7 +63,8 @@ class _PhotoViewerPageState extends State<PhotoViewerPage>
   @override
   void dispose() {
     if (Platform.isAndroid || Platform.isIOS)
-      SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual,
+          overlays: [SystemUiOverlay.top, SystemUiOverlay.bottom]);
     _doubleClickAnimationController.dispose();
     rebuildIndex.close();
     rebuildSwiper.close();
@@ -91,7 +92,7 @@ class _PhotoViewerPageState extends State<PhotoViewerPage>
     super.initState();
     index = widget.index;
     if (Platform.isAndroid || Platform.isIOS)
-      SystemChrome.setEnabledSystemUIMode(SystemUiMode.leanBack);
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: []);
   }
 
   Widget _buildContent(BuildContext context) {
@@ -338,7 +339,11 @@ class _PhotoViewerPageState extends State<PhotoViewerPage>
                         onPressed: () async {
                           if (Platform.isAndroid || Platform.isIOS)
                             await SystemChrome.setEnabledSystemUIMode(
-                                SystemUiMode.edgeToEdge);
+                                SystemUiMode.manual,
+                                overlays: [
+                                  SystemUiOverlay.top,
+                                  SystemUiOverlay.bottom
+                                ]);
                           Navigator.of(context).pop();
                         }),
                     IconButton(