From afbb4b70b15817de472e4dc174d743cf8a7e1248 Mon Sep 17 00:00:00 2001
From: Cuong-Tran <cuongtran.tm@gmail.com>
Date: Mon, 22 Jul 2024 11:36:49 +0700
Subject: [PATCH] feat: show libraryColored by default on all list/grid

---
 .../library/components/CommonMangaItem.kt      | 18 +++++++++---------
 .../components/LibraryComfortableGrid.kt       |  3 ---
 .../library/components/LibraryCompactGrid.kt   |  3 ---
 .../library/components/LibraryList.kt          |  3 ---
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt b/app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt
index a3def0302..fcd62e3f1 100644
--- a/app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt
@@ -81,12 +81,12 @@ fun MangaCompactGridItem(
     coverBadgeStart: @Composable (RowScope.() -> Unit)? = null,
     coverBadgeEnd: @Composable (RowScope.() -> Unit)? = null,
     // KMK -->
-    libraryColored: Boolean? = null,
+    libraryColored: Boolean = true,
     // KMK <--
 ) {
     // KMK -->
-    val bgColor = libraryColored?.let { coverData.dominantCoverColors?.first?.let { Color(it) } }
-    val onBgColor = libraryColored?.let { coverData.dominantCoverColors?.second }
+    val bgColor = coverData.dominantCoverColors?.first?.let { Color(it) }.takeIf { libraryColored }
+    val onBgColor = coverData.dominantCoverColors?.second.takeIf { libraryColored }
     // KMK <--
     GridItemSelectable(
         isSelected = isSelected,
@@ -212,12 +212,12 @@ fun MangaComfortableGridItem(
     coverBadgeEnd: (@Composable RowScope.() -> Unit)? = null,
     onClickContinueReading: (() -> Unit)? = null,
     // KMK -->
-    libraryColored: Boolean? = null,
+    libraryColored: Boolean = true,
     // KMK <--
 ) {
     // KMK -->
-    val bgColor = libraryColored?.let { coverData.dominantCoverColors?.first?.let { Color(it) } }
-    val onBgColor = libraryColored?.let { coverData.dominantCoverColors?.second }
+    val bgColor = coverData.dominantCoverColors?.first?.let { Color(it) }.takeIf { libraryColored }
+    val onBgColor = coverData.dominantCoverColors?.second.takeIf { libraryColored }
     // KMK <--
     GridItemSelectable(
         isSelected = isSelected,
@@ -390,12 +390,12 @@ fun MangaListItem(
     coverAlpha: Float = 1f,
     onClickContinueReading: (() -> Unit)? = null,
     // KMK -->
-    libraryColored: Boolean? = null,
+    libraryColored: Boolean = true,
     // KMK <--
 ) {
     // KMK -->
-    val bgColor = libraryColored?.let { coverData.dominantCoverColors?.first?.let { Color(it) } }
-    val onBgColor = libraryColored?.let { coverData.dominantCoverColors?.second }
+    val bgColor = coverData.dominantCoverColors?.first?.let { Color(it) }.takeIf { libraryColored }
+    val onBgColor = coverData.dominantCoverColors?.second.takeIf { libraryColored }
     // KMK <--
     Row(
         modifier = Modifier
diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt
index 33d2c13ab..dd209ce40 100644
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt
@@ -61,9 +61,6 @@ internal fun LibraryComfortableGrid(
                 } else {
                     null
                 },
-                // KMK -->
-                libraryColored = true,
-                // KMK <--
             )
         }
     }
diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt
index 6a529ae23..23cd51cfe 100644
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt
@@ -62,9 +62,6 @@ internal fun LibraryCompactGrid(
                 } else {
                     null
                 },
-                // KMK -->
-                libraryColored = true,
-                // KMK <--
             )
         }
     }
diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt
index 5c26946fb..4f20f0274 100644
--- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt
+++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt
@@ -69,9 +69,6 @@ internal fun LibraryList(
                 } else {
                     null
                 },
-                // KMK -->
-                libraryColored = true,
-                // KMK <--
             )
         }
     }