ignore season and language change for scheme

DatL4g · Nov 14, 2023 · d885f2a · d885f2a
1 parent 3356319
commit d885f2a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...d/src/commonMain/kotlin/dev/datlag/burningseries/ui/screen/initial/series/SeriesScreen.kt b/...d/src/commonMain/kotlin/dev/datlag/burningseries/ui/screen/initial/series/SeriesScreen.kt
@@ -67,7 +67,7 @@ fun SeriesScreen(component: SeriesComponent) {
     val href by component.href.collectAsStateWithLifecycle()
     val dialogState by component.dialog.subscribeAsState()
 
-    SchemeTheme.setCommon(href)
+    SchemeTheme.setCommon(BSUtil.commonSeriesHref(href))
     when (calculateWindowSizeClass().widthSizeClass) {
         WindowWidthSizeClass.Compact -> CompactScreen(component)
         else -> DefaultScreen(component)
@@ -105,7 +105,7 @@ private fun CompactScreen(component: SeriesComponent) {
                         contentDescription = title,
                         contentScale = ContentScale.FillWidth,
                     )
-                    loadImageScheme(href, resource.value)
+                    loadImageScheme(BSUtil.commonSeriesHref(href), resource.value)
                 }
             }
 
@@ -337,7 +337,7 @@ private fun DefaultScreen(component: SeriesComponent) {
                                     contentDescription = title,
                                     contentScale = ContentScale.FillWidth,
                                 )
-                                loadImageScheme(BSUtil.fixSeriesHref(href), resource.value)
+                                loadImageScheme(BSUtil.commonSeriesHref(href), resource.value)
                             }
                         }
                     }

diff --git a/model/src/commonMain/kotlin/dev/datlag/burningseries/model/BSUtil.kt b/model/src/commonMain/kotlin/dev/datlag/burningseries/model/BSUtil.kt
@@ -31,6 +31,10 @@ data object BSUtil {
         return rebuildHrefFromData(hrefDataFromHref(normalizeHref(href)))
     }
 
+    fun commonSeriesHref(href: String): String {
+        return rebuildHrefFromData(hrefDataFromHref(fixSeriesHref(href)).copy(second = null, third = null))
+    }
+
     fun hrefDataFromHref(href: String): Triple<String, String?, String?> {
         fun getTitle(): String {
             val newHref = if (href.startsWith("series/")) {