From ab2fb39952938d48c977ab6e5dc9dac1d6bc2589 Mon Sep 17 00:00:00 2001
From: orz12 <ms_lyq@hotmail.com>
Date: Wed, 13 Mar 2024 20:02:30 +0800
Subject: [PATCH] =?UTF-8?q?mod:=20=E5=AF=BC=E8=88=AA=E6=A0=8F=E3=80=81?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/models/common/nav_bar_config.dart |  4 ++--
 lib/pages/main/view.dart              | 13 +++++++++----
 lib/pages/rank/view.dart              |  4 +++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/models/common/nav_bar_config.dart b/lib/models/common/nav_bar_config.dart
index 9ebe8e6f..e43a799d 100644
--- a/lib/models/common/nav_bar_config.dart
+++ b/lib/models/common/nav_bar_config.dart
@@ -17,11 +17,11 @@ List defaultNavigationBars = [
   {
     'id': 1,
     'icon': const Icon(
-      Icons.trending_up,
+      Icons.leaderboard_outlined,
       size: 21,
     ),
     'selectIcon': const Icon(
-      Icons.trending_up_outlined,
+      Icons.leaderboard,
       size: 21,
     ),
     'label': "排行榜",
diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart
index de5764e3..a24fcbea 100644
--- a/lib/pages/main/view.dart
+++ b/lib/pages/main/view.dart
@@ -153,11 +153,11 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                                           e['count'] > 0,
                                   child: e['icon'],
                                   backgroundColor:
-                                  Theme.of(context).colorScheme.primary,
+                                      Theme.of(context).colorScheme.primary,
                                   textColor: Theme.of(context)
                                       .colorScheme
                                       .onInverseSurface,
-                                  ),
+                                ),
                               ),
                               selectedIcon: e['selectIcon'],
                               label: e['label'],
@@ -171,6 +171,11 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                         iconSize: 16,
                         selectedFontSize: 12,
                         unselectedFontSize: 12,
+                        type: BottomNavigationBarType.fixed,
+                        // selectedItemColor:
+                        //     Theme.of(context).colorScheme.primary, // 选中项的颜色
+                        // unselectedItemColor:
+                        //     Theme.of(context).colorScheme.onSurface,
                         items: [
                           ..._mainController.navigationBars.map((e) {
                             return BottomNavigationBarItem(
@@ -189,11 +194,11 @@ class _MainAppState extends State<MainApp> with SingleTickerProviderStateMixin {
                                           e['count'] > 0,
                                   child: e['icon'],
                                   backgroundColor:
-                                  Theme.of(context).colorScheme.primary,
+                                      Theme.of(context).colorScheme.primary,
                                   textColor: Theme.of(context)
                                       .colorScheme
                                       .onInverseSurface,
-                                  ),
+                                ),
                               ),
                               activeIcon: e['selectIcon'],
                               label: e['label'],
diff --git a/lib/pages/rank/view.dart b/lib/pages/rank/view.dart
index 65a8ed9f..5d699673 100644
--- a/lib/pages/rank/view.dart
+++ b/lib/pages/rank/view.dart
@@ -85,15 +85,17 @@ class _RankPageState extends State<RankPage>
                 const SizedBox(height: 4),
                 SizedBox(
                   width: double.infinity,
-                  height: 42,
+                  height: 50,
                   child: Align(
                     alignment: Alignment.center,
                     child: TabBar(
+                      padding: const EdgeInsets.symmetric(horizontal: 10),
                       controller: _rankController.tabController,
                       tabs: [
                         for (var i in _rankController.tabs)
                           Tab(text: i['label'])
                       ],
+                      labelPadding: const EdgeInsets.symmetric(horizontal: 4),
                       isScrollable: true,
                       dividerColor: Colors.transparent,
                       enableFeedback: true,