From 94da911f934c7861337336410d2f89eec0392e87 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <99822064+revonateB0T@users.noreply.github.com>
Date: Sat, 2 Nov 2024 12:51:06 +0800
Subject: [PATCH] Fix DrawerContent ColorScheme

* Fix listItemOnDrawerColor()

* Fix topBarOnDrawerColor

* Refine location

---------

Co-authored-by: Dude so hot <djohn@fbi.gov>
---
 .../hippo/ehviewer/ui/screen/DownloadsScreen.kt |  4 ++++
 .../ehviewer/ui/screen/DrawerContentStyle.kt    | 17 +++++++++++++++++
 .../hippo/ehviewer/ui/screen/FavoritesScreen.kt |  2 ++
 .../ehviewer/ui/screen/GalleryListScreen.kt     |  4 ++++
 4 files changed, 27 insertions(+)
 create mode 100644 app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DrawerContentStyle.kt

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt
index 9220777c2..6b444cc8c 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DownloadsScreen.kt
@@ -218,6 +218,7 @@ fun AnimatedVisibilityScope.DownloadsScreen(navigator: DestinationsNavigator) =
         TopAppBar(
             title = { Text(text = labelsStr) },
             windowInsets = EmptyWindowInsets,
+            colors = topBarOnDrawerColor(),
             actions = {
                 if (DownloadsFilterMode.CUSTOM == filterMode) {
                     IconButton(
@@ -314,6 +315,7 @@ fun AnimatedVisibilityScope.DownloadsScreen(navigator: DestinationsNavigator) =
                     headlineContent = {
                         Text("$allName [$totalCount]")
                     },
+                    colors = listItemOnDrawerColor(),
                 )
             }
             item {
@@ -327,6 +329,7 @@ fun AnimatedVisibilityScope.DownloadsScreen(navigator: DestinationsNavigator) =
                     headlineContent = {
                         Text("$emptyLabelName [${downloadsCount.getOrDefault(null, 0)}]")
                     },
+                    colors = listItemOnDrawerColor(),
                 )
             }
 
@@ -431,6 +434,7 @@ fun AnimatedVisibilityScope.DownloadsScreen(navigator: DestinationsNavigator) =
                                     }
                                 }
                             },
+                            colors = listItemOnDrawerColor(),
                         )
                     }
                 }
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DrawerContentStyle.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DrawerContentStyle.kt
new file mode 100644
index 000000000..eeb6e020a
--- /dev/null
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/DrawerContentStyle.kt
@@ -0,0 +1,17 @@
+package com.hippo.ehviewer.ui.screen
+
+import androidx.compose.material3.ListItemDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+
+@Composable
+fun listItemOnDrawerColor() = ListItemDefaults.colors(
+    containerColor = MaterialTheme.colorScheme.surfaceContainerLow,
+)
+
+@Composable
+fun topBarOnDrawerColor() = TopAppBarDefaults.topAppBarColors(
+    containerColor = MaterialTheme.colorScheme.surfaceContainerLow,
+    scrolledContainerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
+)
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt
index 416da2a0e..bbf1c2ac7 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/FavoritesScreen.kt
@@ -188,6 +188,7 @@ fun AnimatedVisibilityScope.FavouritesScreen(navigator: DestinationsNavigator) =
         TopAppBar(
             title = { Text(text = stringResource(id = R.string.collections)) },
             windowInsets = EmptyWindowInsets,
+            colors = topBarOnDrawerColor(),
         )
         val scope = currentRecomposeScope
         LaunchedEffect(Unit) {
@@ -219,6 +220,7 @@ fun AnimatedVisibilityScope.FavouritesScreen(navigator: DestinationsNavigator) =
                         Settings.recentFavCat = newCat
                         launch { sheetState.close() }
                     },
+                    colors = listItemOnDrawerColor(),
                 )
             }
         }
diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt
index 36b50f972..d24453c1b 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/GalleryListScreen.kt
@@ -255,6 +255,7 @@ fun AnimatedVisibilityScope.GalleryListScreen(lub: ListUrlBuilder, navigator: De
             TopAppBar(
                 title = { Text(text = stringResource(id = R.string.toplist)) },
                 windowInsets = EmptyWindowInsets,
+                colors = topBarOnDrawerColor(),
             )
             toplists.forEach { (name, keyword) ->
                 ListItem(
@@ -267,6 +268,7 @@ fun AnimatedVisibilityScope.GalleryListScreen(lub: ListUrlBuilder, navigator: De
                     headlineContent = {
                         Text(text = name)
                     },
+                    colors = listItemOnDrawerColor(),
                 )
             }
         }
@@ -274,6 +276,7 @@ fun AnimatedVisibilityScope.GalleryListScreen(lub: ListUrlBuilder, navigator: De
         ProvideSideSheetContent { sheetState ->
             TopAppBar(
                 title = { Text(text = stringResource(id = R.string.quick_search)) },
+                colors = topBarOnDrawerColor(),
                 actions = {
                     IconButton(onClick = {
                         launch {
@@ -437,6 +440,7 @@ fun AnimatedVisibilityScope.GalleryListScreen(lub: ListUrlBuilder, navigator: De
                                             Icon(imageVector = Icons.Default.Reorder, contentDescription = null)
                                         }
                                     },
+                                    colors = listItemOnDrawerColor(),
                                 )
                             }
                         }