From 447829b1b9ec12b4b4e3f096774e7b23cff100cb Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Mon, 27 Jun 2022 09:16:19 -0400
Subject: [PATCH] Improve handling of tags

---
 .../eu/kanade/presentation/manga/MangaScreen.kt    |  4 ++--
 .../presentation/manga/components/NamespaceTags.kt | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
index 400094d88..b71f8cc2f 100644
--- a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt
@@ -343,7 +343,7 @@ private fun MangaScreenSmallImpl(
                         openMetadataViewer = onMetadataViewerClicked,
                         search = { onSearch(it, false) },
                     ),
-                    searchMetadataChips = remember { SearchMetadataChips(state.meta, state.source, state.manga.genre) },
+                    searchMetadataChips = remember(state) { SearchMetadataChips(state.meta, state.source, state.manga.genre) },
                     scrollBehavior = scrollBehavior,
                     actionModeCounter = selected.size,
                     onSelectAll = {
@@ -708,7 +708,7 @@ fun MangaScreenLargeImpl(
                         openMetadataViewer = onMetadataViewerClicked,
                         search = { onSearch(it, false) },
                     ),
-                    searchMetadataChips = remember { SearchMetadataChips(state.meta, state.source, state.manga.genre) },
+                    searchMetadataChips = remember(state) { SearchMetadataChips(state.meta, state.source, state.manga.genre) },
                 )
 
                 val chaptersWeight = if (windowWidthSizeClass == WindowWidthSizeClass.Medium) 1f else 2f
diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/NamespaceTags.kt b/app/src/main/java/eu/kanade/presentation/manga/components/NamespaceTags.kt
index a65629367..6fd718120 100644
--- a/app/src/main/java/eu/kanade/presentation/manga/components/NamespaceTags.kt
+++ b/app/src/main/java/eu/kanade/presentation/manga/components/NamespaceTags.kt
@@ -18,8 +18,8 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.google.accompanist.flowlayout.FlowRow
 import eu.kanade.presentation.components.SuggestionChip
@@ -38,7 +38,7 @@ data class DisplayTag(
     val namespace: String?,
     val text: String,
     val search: String,
-    val border: Dp?,
+    val border: Int?,
 )
 
 @Immutable
@@ -63,8 +63,8 @@ value class SearchMetadataChips(
                                 } ?: it.name,
                                 border = if (source.id == EXH_SOURCE_ID || source.id == EH_SOURCE_ID) {
                                     when (it.type) {
-                                        EHentaiSearchMetadata.TAG_TYPE_NORMAL -> 3.dp
-                                        EHentaiSearchMetadata.TAG_TYPE_LIGHT -> 1.dp
+                                        EHentaiSearchMetadata.TAG_TYPE_NORMAL -> 3
+                                        EHentaiSearchMetadata.TAG_TYPE_LIGHT -> 1
                                         else -> null
                                     }
                                 } else null,
@@ -110,7 +110,11 @@ fun NamespaceTags(
                             text = text,
                             onClick = { onClick(search) },
                             onLongClick = { onLongClick(search) },
-                            border = border?.let { SuggestionChipDefaults.suggestionChipBorder(borderWidth = it) },
+                            border = border?.let {
+                                with(LocalDensity.current) {
+                                    SuggestionChipDefaults.suggestionChipBorder(borderWidth = it.toDp())
+                                }
+                            },
                         )
                     }
                 }