refactor(*): optimize the color scheme

ZhuJHua · Oct 1, 2024 · 555d66f · 555d66f
1 parent 325d392
commit 555d66f
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 37 deletions.
diff --git a/lib/components/audio_player/audio_player_view.dart b/lib/components/audio_player/audio_player_view.dart
@@ -43,6 +43,7 @@ class AudioPlayerComponent extends StatelessWidget {
                   )),
               Expanded(
                 child: Column(
+                  mainAxisSize: MainAxisSize.min,
                   children: [
                     Obx(() {
                       return Slider(

diff --git a/lib/components/dashboard/dashboard_logic.dart b/lib/components/dashboard/dashboard_logic.dart
@@ -32,7 +32,7 @@ class DashboardLogic extends GetxController {
   }
 
   Future<void> getDiaryCount() async {
-    int count = await Utils().isarUtil.countDiaries();
+    int count = await Utils().isarUtil.countShowDiary();
     state.diaryCount.value = count.toString();
   }
 

diff --git a/lib/components/diary_card/calendar_diary_card/calendar_diary_card_view.dart b/lib/components/diary_card/calendar_diary_card/calendar_diary_card_view.dart
@@ -76,7 +76,7 @@ class CalendarDiaryCardComponent extends StatelessWidget with BasicCardLogic {
         await toDiaryInCalendar(diary);
       },
       child: Card.filled(
-          color: colorScheme.surfaceContainer,
+          color: colorScheme.surfaceContainerLow,
           child: Padding(
               padding: const EdgeInsets.all(12.0),
               child: Column(

diff --git a/lib/components/diary_card/large_diary_card/large_diary_card_view.dart b/lib/components/diary_card/large_diary_card/large_diary_card_view.dart
@@ -12,7 +12,6 @@ class LargeDiaryCardComponent extends StatelessWidget with BasicCardLogic {
 
   final Diary diary;
 
-
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
@@ -37,7 +36,7 @@ class LargeDiaryCardComponent extends StatelessWidget with BasicCardLogic {
         await toDiary(diary);
       },
       child: Card.filled(
-        color: colorScheme.surfaceContainer,
+        color: colorScheme.surfaceContainerLow,
         child: Column(
           children: [
             if (diary.imageName.isNotEmpty) ...[buildImage()],

diff --git a/lib/components/diary_card/small_diary_card/small_diary_card_view.dart b/lib/components/diary_card/small_diary_card/small_diary_card_view.dart
@@ -39,7 +39,7 @@ class SmallDiaryCardComponent extends StatelessWidget with BasicCardLogic {
         await toDiary(diary);
       },
       child: Card.filled(
-        color: colorScheme.surfaceContainer,
+        color: colorScheme.surfaceContainerLow,
         child: SizedBox(
           height: 122.0,
           child: Row(

diff --git a/lib/components/diary_tab_view/diary_tab_view_view.dart b/lib/components/diary_tab_view/diary_tab_view_view.dart
@@ -5,6 +5,7 @@ import 'package:get/get.dart';
 import 'package:mood_diary/common/values/view_mode.dart';
 import 'package:mood_diary/components/diary_card/large_diary_card/large_diary_card_view.dart';
 import 'package:mood_diary/components/diary_card/small_diary_card/small_diary_card_view.dart';
+import 'package:sliver_tools/sliver_tools.dart';
 
 import 'diary_tab_view_logic.dart';
 
@@ -57,16 +58,6 @@ class DiaryTabViewComponent extends StatelessWidget {
       );
     }
 
-    Widget buildCustomScrollView({required Widget sliver}) {
-      return CustomScrollView(
-        key: UniqueKey(),
-        slivers: [
-          SliverOverlapInjector(handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context)),
-          SliverPadding(padding: const EdgeInsets.all(4.0), sliver: sliver),
-        ],
-      );
-    }
-
     return GetBuilder<DiaryTabViewLogic>(
         assignId: true,
         init: logic,
@@ -76,21 +67,22 @@ class DiaryTabViewComponent extends StatelessWidget {
           return Stack(
             children: [
               buildPlaceHolder(),
-              Obx(() {
-                return !state.isFetching.value
-                    ? AnimatedSwitcher(
-                        duration: const Duration(milliseconds: 500),
-                        child: switch (logic.diaryLogic.state.viewModeType.value) {
-                          ViewModeType.list => buildCustomScrollView(sliver: Obx(() {
-                              return buildList();
-                            })),
-                          ViewModeType.grid => buildCustomScrollView(sliver: Obx(() {
-                              return buildGrid();
-                            })),
-                        },
-                      )
-                    : const SizedBox.shrink();
-              }),
+              CustomScrollView(
+                slivers: [
+                  SliverOverlapInjector(handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context)),
+                  SliverPadding(
+                      padding: const EdgeInsets.all(4.0),
+                      sliver: Obx(() {
+                        return SliverAnimatedSwitcher(
+                          duration: const Duration(milliseconds: 400),
+                          child: switch (logic.diaryLogic.state.viewModeType.value) {
+                            ViewModeType.list => buildList(),
+                            ViewModeType.grid => buildGrid(),
+                          },
+                        );
+                      })),
+                ],
+              ),
             ],
           );
         });

diff --git a/lib/pages/about/about_view.dart b/lib/pages/about/about_view.dart
@@ -56,7 +56,7 @@ class AboutPage extends StatelessWidget {
         children: [
           buildLogoTitle(),
           Card.filled(
-            color: colorScheme.surfaceContainer,
+            color: colorScheme.surfaceContainerLow,
             child: Column(
               children: ListTile.divideTiles(tiles: [
                 ListTile(

diff --git a/lib/pages/home/home_view.dart b/lib/pages/home/home_view.dart
@@ -152,8 +152,9 @@ class HomePage extends StatelessWidget {
           ? AnimatedBuilder(
               animation: logic.barAnimation,
               builder: (context, child) {
-                return SizedBox(
+                return Container(
                   height: state.navigatorBarHeight * logic.barAnimation.value,
+                  decoration: BoxDecoration(border: Border(top: BorderSide(color: colorScheme.outline, width: 0.2))),
                   child: child,
                 );
               },
@@ -185,7 +186,6 @@ class HomePage extends StatelessWidget {
                       ],
                       selectedIndex: state.navigatorIndex.value,
                       height: state.navigatorBarHeight,
-                      backgroundColor: colorScheme.surface,
                       onDestinationSelected: (index) {
                         logic.changeNavigator(index);
                       },

diff --git a/lib/pages/home/setting/setting_view.dart b/lib/pages/home/setting/setting_view.dart
@@ -50,7 +50,7 @@ class SettingPage extends StatelessWidget {
                     ),
                   ),
                   Card.filled(
-                    color: colorScheme.surfaceContainer,
+                    color: colorScheme.surfaceContainerLow,
                     child: Column(
                       children: [
                         ListTile(
@@ -141,7 +141,7 @@ class SettingPage extends StatelessWidget {
                     ),
                   ),
                   Card.filled(
-                    color: colorScheme.surfaceContainer,
+                    color: colorScheme.surfaceContainerLow,
                     child: Column(
                       children: [
                         ListTile(
@@ -412,7 +412,7 @@ class SettingPage extends StatelessWidget {
                     ),
                   ),
                   Card.filled(
-                    color: colorScheme.surfaceContainer,
+                    color: colorScheme.surfaceContainerLow,
                     child: Column(
                       children: [
                         Obx(() {
@@ -490,7 +490,7 @@ class SettingPage extends StatelessWidget {
                     ),
                   ),
                   Card.filled(
-                    color: colorScheme.surfaceContainer,
+                    color: colorScheme.surfaceContainerLow,
                     child: Column(
                       children: [
                         ListTile(