Merge branch 'feature-editNavBar'

lib/main.dart

@@ -20,6 +20,7 @@ import 'package:pilipala/services/disable_battery_opt.dart';
 import 'package:pilipala/services/service_locator.dart';
 import 'package:pilipala/utils/app_scheme.dart';
 import 'package:pilipala/utils/data.dart';
+import 'package:pilipala/utils/global_data.dart';
 import 'package:pilipala/utils/storage.dart';
 import 'package:media_kit/media_kit.dart'; // Provides [Player], [Media], [Playlist] etc.
 import 'package:pilipala/utils/recommend_filter.dart';
@@ -64,14 +65,8 @@ void main() async {
       },
     );
 
-    // 小白条、导航栏沉浸
-    SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
-    SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
-      systemNavigationBarColor: Colors.transparent,
-      systemNavigationBarDividerColor: Colors.transparent,
-      statusBarColor: Colors.transparent,
-    ));
     Data.init();
+    GlobalData();
     PiliSchame.init();
     DisableBatteryOpt();
   });
@@ -134,45 +129,51 @@ class MyApp extends StatelessWidget {
             brightness: Brightness.dark,
           );
         }
+
+        final SnackBarThemeData snackBarThemeData = SnackBarThemeData(
+          actionTextColor: darkColorScheme.primary,
+          backgroundColor: darkColorScheme.secondaryContainer,
+          closeIconColor: darkColorScheme.secondary,
+          contentTextStyle: TextStyle(color: darkColorScheme.secondary),
+          elevation: 20,
+        );
+
+        ThemeData themeData = ThemeData(
+          // fontFamily: 'HarmonyOS',
+          colorScheme: currentThemeValue == ThemeType.dark
+              ? darkColorScheme
+              : lightColorScheme,
+          snackBarTheme: snackBarThemeData,
+          pageTransitionsTheme: const PageTransitionsTheme(
+            builders: <TargetPlatform, PageTransitionsBuilder>{
+              TargetPlatform.android: ZoomPageTransitionsBuilder(
+                allowEnterRouteSnapshotting: false,
+              ),
+            },
+          ),
+        );
+
+        // 小白条、导航栏沉浸
+        SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+        SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(
+          systemNavigationBarColor: GlobalData().enableMYBar
+              ? themeData.colorScheme.surfaceVariant
+              : themeData.canvasColor,
+          systemNavigationBarDividerColor: GlobalData().enableMYBar
+              ? themeData.colorScheme.surfaceVariant
+              : themeData.canvasColor,
+          systemNavigationBarIconBrightness: currentThemeValue == ThemeType.dark
+              ? Brightness.light
+              : Brightness.dark,
+          statusBarColor: Colors.transparent,
+        ));
+
         // 图片缓存
         // PaintingBinding.instance.imageCache.maximumSizeBytes = 1000 << 20;
         return GetMaterialApp(
           title: 'PiLiPaLa',
-          theme: ThemeData(
-            // fontFamily: 'HarmonyOS',
-            colorScheme: currentThemeValue == ThemeType.dark
-                ? darkColorScheme
-                : lightColorScheme,
-            useMaterial3: true,
-            snackBarTheme: SnackBarThemeData(
-              actionTextColor: lightColorScheme.primary,
-              backgroundColor: lightColorScheme.secondaryContainer,
-              closeIconColor: lightColorScheme.secondary,
-              contentTextStyle: TextStyle(color: lightColorScheme.secondary),
-              elevation: 20,
-            ),
-            pageTransitionsTheme: const PageTransitionsTheme(
-              builders: <TargetPlatform, PageTransitionsBuilder>{
-                TargetPlatform.android: ZoomPageTransitionsBuilder(
-                  allowEnterRouteSnapshotting: false,
-                ),
-              },
-            ),
-          ),
-          darkTheme: ThemeData(
-            // fontFamily: 'HarmonyOS',
-            colorScheme: currentThemeValue == ThemeType.light
-                ? lightColorScheme
-                : darkColorScheme,
-            useMaterial3: true,
-            snackBarTheme: SnackBarThemeData(
-              actionTextColor: darkColorScheme.primary,
-              backgroundColor: darkColorScheme.secondaryContainer,
-              closeIconColor: darkColorScheme.secondary,
-              contentTextStyle: TextStyle(color: darkColorScheme.secondary),
-              elevation: 20,
-            ),
-          ),
+          theme: themeData,
+          darkTheme: themeData,
           localizationsDelegates: const [
             GlobalCupertinoLocalizations.delegate,
             GlobalMaterialLocalizations.delegate,

lib/pages/main/view.dart

@@ -10,6 +10,7 @@ import 'package:pilipala/pages/media/index.dart';
 import 'package:pilipala/pages/rank/index.dart';
 import 'package:pilipala/utils/event_bus.dart';
 import 'package:pilipala/utils/feed_back.dart';
+import 'package:pilipala/utils/global_data.dart';
 import 'package:pilipala/utils/storage.dart';
 import './controller.dart';
 
@@ -29,7 +30,6 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
 
   int? _lastSelectTime; //上次点击时间
   Box setting = GStrorage.setting;
-  late bool enableMYBar;
 
   @override
   void initState() {
@@ -37,7 +37,6 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
     _lastSelectTime = DateTime.now().millisecondsSinceEpoch;
     _mainController.pageController =
         PageController(initialPage: _mainController.selectedIndex);
-    enableMYBar = setting.get(SettingBoxKey.enableMYBar, defaultValue: true);
   }
 
   void setIndex(int value) async {
@@ -138,7 +137,7 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                     curve: Curves.easeInOutCubicEmphasized,
                     duration: const Duration(milliseconds: 500),
                     offset: Offset(0, snapshot.data ? 0 : 1),
-                    child: enableMYBar
+                    child: GlobalData().enableMYBar
                         ? NavigationBar(
                             onDestinationSelected: (value) => setIndex(value),
                             selectedIndex: _mainController.selectedIndex,
@@ -169,6 +168,7 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                           )
                         : BottomNavigationBar(
                             currentIndex: _mainController.selectedIndex,
+                            type: BottomNavigationBarType.fixed,
                             onTap: (value) => setIndex(value),
                             iconSize: 16,
                             selectedFontSize: 12,

lib/utils/global_data.dart

@@ -1,10 +1,16 @@
+import 'package:hive/hive.dart';
+import 'package:pilipala/utils/storage.dart';
 import '../models/common/index.dart';
 
+Box setting = GStrorage.setting;
+
 class GlobalData {
   int imgQuality = 10;
   FullScreenGestureMode fullScreenGestureMode =
       FullScreenGestureMode.values.last;
   bool enablePlayerControlAnimation = true;
+  final bool enableMYBar =
+      setting.get(SettingBoxKey.enableMYBar, defaultValue: true);
 
   // 私有构造函数
   GlobalData._();