From 6ac24ef52c6940296eb9092ca27cd8b75ea07a73 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Wed, 12 Jun 2024 20:18:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BE=A7=E8=BE=B9=E6=A0=8F=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E5=BC=82=E5=BD=A2=E5=B1=8F=E3=80=81=E5=88=86=E5=8C=BA?=
 =?UTF-8?q?=E5=AD=90=E4=BE=A7=E6=A0=8F=E5=86=85=E8=BE=B9=E8=B7=9D=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/main/view.dart      | 16 +++++----
 lib/pages/rank/view.dart      | 65 ++++++++++++++++++++---------------
 lib/pages/rank/zone/view.dart |  2 +-
 3 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart
index b338b847..c841ef9c 100644
--- a/lib/pages/main/view.dart
+++ b/lib/pages/main/view.dart
@@ -39,10 +39,9 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
     _mainController.pageController =
         PageController(initialPage: _mainController.selectedIndex);
     enableMYBar = setting.get(SettingBoxKey.enableMYBar, defaultValue: true);
-    useSideBar =
-        setting.get(SettingBoxKey.useSideBar, defaultValue: false);
-    enableGradientBg = setting.get(SettingBoxKey.enableGradientBg,
-        defaultValue: true);
+    useSideBar = setting.get(SettingBoxKey.useSideBar, defaultValue: false);
+    enableGradientBg =
+        setting.get(SettingBoxKey.enableGradientBg, defaultValue: true);
   }
 
   void setIndex(int value) async {
@@ -152,7 +151,7 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
             children: [
               if (useSideBar) ...[
                 SizedBox(
-                    width: 55,
+                    width: 55 + MediaQuery.of(context).padding.left,
                     child: NavigationRail(
                       groupAlignment: 0.0,
                       minWidth: 40.0,
@@ -170,8 +169,11 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                                           DynamicBadgeMode.number
                                       ? Text(e['count'].toString())
                                       : null,
-                                  padding:
-                                      const EdgeInsets.fromLTRB(2, 0, 2, 0),
+                                  padding: EdgeInsets.fromLTRB(
+                                      2 + MediaQuery.of(context).padding.left,
+                                      0,
+                                      2,
+                                      0),
                                   isLabelVisible:
                                       _mainController.dynamicBadgeType !=
                                               DynamicBadgeMode.hidden &&
diff --git a/lib/pages/rank/view.dart b/lib/pages/rank/view.dart
index 4dc1ef34..f240c4a8 100644
--- a/lib/pages/rank/view.dart
+++ b/lib/pages/rank/view.dart
@@ -88,33 +88,44 @@ class _RankPageState extends State<RankPage>
               child: ConstrainedBox(
                   constraints: BoxConstraints(minHeight: constraint.maxHeight),
                   child: IntrinsicHeight(
-                      child: NavigationRail(
-                    backgroundColor: Colors.transparent,
-                    minWidth: 50.0,
-                    // elevation: 0,
-                    selectedIndex: _selectedTabIndex,
-                    onDestinationSelected: (int index) {
-                      feedBack();
-                      if (_selectedTabIndex == index) {
-                        _rankController.tabsCtrList[index]().animateToTop();
-                      } else {
-                        setState(() {
-                          _rankController.tabController.index = index;
-                          _selectedTabIndex = index;
-                        });
-                      }
-                    },
-                    labelType: NavigationRailLabelType.none,
-                    destinations: [
-                      for (var tab in _rankController.tabs)
-                        NavigationRailDestination(
-                          icon: Text(tab['label']),
-                          // selectedIcon: Text(tab['label']),
-                          label: const SizedBox.shrink(),
-                        ),
-                    ],
-                    trailing: const SizedBox(height: 100),
-                  ))));
+                      child: MediaQuery.removePadding(
+                          context: context,
+                          removeLeft: true,
+                          removeRight: true,
+                          removeTop: true,
+                          child: NavigationRail(
+                            groupAlignment: -1.0,
+                            backgroundColor: Colors.transparent,
+                            minWidth: 40.0,
+                            useIndicator: false,
+                            // elevation: 0,
+                            selectedIndex: _selectedTabIndex,
+                            onDestinationSelected: (int index) {
+                              feedBack();
+                              if (_selectedTabIndex == index) {
+                                _rankController.tabsCtrList[index]()
+                                    .animateToTop();
+                              } else {
+                                setState(() {
+                                  _rankController.tabController.index = index;
+                                  _selectedTabIndex = index;
+                                });
+                              }
+                            },
+                            labelType: NavigationRailLabelType.none,
+                            destinations: [
+                              for (var tab in _rankController.tabs)
+                                NavigationRailDestination(
+                                  icon: Padding(
+                                      padding: const EdgeInsets.symmetric(
+                                          vertical: 4),
+                                      child: Text(tab['label'])),
+                                  // selectedIcon: Text(tab['label']),
+                                  label: const SizedBox.shrink(),
+                                ),
+                            ],
+                            trailing: const SizedBox(height: 100),
+                          )))));
         }),
         Expanded(
           child: TabBarView(
diff --git a/lib/pages/rank/zone/view.dart b/lib/pages/rank/zone/view.dart
index 526e549b..b9eb7ee6 100644
--- a/lib/pages/rank/zone/view.dart
+++ b/lib/pages/rank/zone/view.dart
@@ -85,7 +85,7 @@ class _ZonePageState extends State<ZonePage>
           SliverPadding(
             // 单列布局 EdgeInsets.zero
             padding:
-                const EdgeInsets.fromLTRB(StyleString.safeSpace, StyleString.safeSpace, 0, 0),
+                const EdgeInsets.fromLTRB(StyleString.cardSpace, StyleString.safeSpace, 0, 0),
             sliver: FutureBuilder(
               future: _futureBuilderFuture,
               builder: (context, snapshot) {