changed series screen

DatL4g · Mar 17, 2024 · 24c4cdd · 24c4cdd
1 parent bbaeb4f
commit 24c4cdd
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 296 deletions.
diff --git a/...nMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteConfig.kt b/...nMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteConfig.kt
@@ -1,5 +1,6 @@
 package dev.datlag.burningseries.shared.ui.screen.initial.favorite
 
+import dev.datlag.burningseries.database.common.mainTitle
 import kotlinx.serialization.Serializable
 import dev.datlag.burningseries.database.Series as DBSeries
 
@@ -11,6 +12,6 @@ sealed class FavoriteConfig {
         val href: String,
         val coverHref: String?
     ) : FavoriteConfig() {
-        constructor(item: DBSeries) : this(item.title, item.href, item.coverHref)
+        constructor(item: DBSeries) : this(item.mainTitle, item.href, item.coverHref)
     }
 }
diff --git a/...nMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreen.kt b/...nMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreen.kt
@@ -63,30 +63,15 @@ private fun DefaultView(component: FavoriteComponent) {
 @Composable
 private fun ExpandedView(component: FavoriteComponent) {
     val childState by component.child.subscribeAsState()
-    var rowWidth by remember { mutableIntStateOf(-1) }
 
     Row(
-        modifier = Modifier.onSizeChanged {
-            rowWidth = it.width
-        },
         horizontalArrangement = Arrangement.spacedBy(16.dp)
     ) {
-        val colOne = if (rowWidth > 600) {
-            val third = remember(rowWidth) { rowWidth.toFloat() / 3F }
-            if (third >= 200F) {
-                Modifier.widthIn(max = third.dp)
-            } else {
-                Modifier.weight(1F)
-            }
-        } else {
-            Modifier.weight(1F)
-        }
-
-        MainView(component, colOne)
+        MainView(component, Modifier.weight(1F))
 
         childState.child?.also { (_, instance) ->
             Box(
-                modifier = Modifier.defaultMinSize(minWidth = 400.dp)
+                modifier = Modifier.weight(2F)
             ) {
                 instance.render()
             }

diff --git a/...rc/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeConfig.kt b/...rc/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeConfig.kt
@@ -13,8 +13,8 @@ sealed class HomeConfig {
         val href: String,
         val coverHref: String?,
     ) : HomeConfig() {
-        constructor(series: Home.Series) : this(series.title, series.href, series.coverHref)
+        constructor(series: Home.Series) : this(series.mainTitle, series.href, series.coverHref)
         constructor(episode: Home.Episode) : this(episode.series ?: episode.fullTitle, episode.href, episode.coverHref)
-        constructor(item: Genre.Item) : this(item.title, item.href, null)
+        constructor(item: Genre.Item) : this(item.mainTitle, item.href, null)
     }
 }
diff --git a/...onMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesComponent.kt b/...onMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesComponent.kt
@@ -18,6 +18,7 @@ interface SeriesComponent : Component {
     val dialog: Value<ChildSlot<DialogConfig, DialogComponent>>
 
     val title: StateFlow<String>
+    val subTitle: StateFlow<String?>
     val href: StateFlow<String>
     val commonHref: StateFlow<String>
     val coverHref: StateFlow<String?>