refactor: Use default Column instead of LayyColumn

app-tv/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailShell.kt

@@ -15,14 +15,10 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Brush
@@ -31,13 +27,13 @@ import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
-import hu.bbara.purefin.image.ImageUrlBuilder
 import hu.bbara.purefin.image.ArtworkKind
+import hu.bbara.purefin.image.ImageUrlBuilder
+import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
 
 internal val MediaDetailHorizontalPadding = 48.dp
-private val MediaDetailHeaderTopPadding = 104.dp
-private val MediaDetailHeaderBottomPadding = 36.dp
+private val MediaDetailHeaderTopPadding = 24.dp
+private val MediaDetailHeaderBottomPadding = 24.dp
 private const val MediaDetailBodyImageWidthFraction = 0.66f
 
 internal val TvMediaDetailBringIntoViewSpec: BringIntoViewSpec =
@@ -61,19 +57,13 @@ internal val TvMediaDetailBringIntoViewSpec: BringIntoViewSpec =
 internal fun TvMediaDetailScaffold(
     resetScrollKey: Any,
     modifier: Modifier = Modifier,
-    bodyContent: LazyListScope.(Modifier) -> Unit = { _ -> }
+    bodyContent: @Composable (Modifier) -> Unit = {}
 ) {
     val scheme = MaterialTheme.colorScheme
     val contentPadding = Modifier.padding(horizontal = MediaDetailHorizontalPadding)
-    val listState = rememberLazyListState()
-
-    LaunchedEffect(resetScrollKey) {
-        listState.scrollToItem(0)
-    }
 
     CompositionLocalProvider(LocalBringIntoViewSpec provides TvMediaDetailBringIntoViewSpec) {
-        LazyColumn(
-            state = listState,
+        Column(
             modifier = modifier
                 .fillMaxSize()
                 .background(scheme.background)

app-tv/src/main/java/hu/bbara/purefin/ui/screen/episode/TvEpisodeScreen.kt

@@ -85,9 +85,11 @@ internal fun TvEpisodeScreenContent(
         resetScrollKey = episode.id,
         modifier = modifier
     ) {
-        item(key = "episode-hero") {
         TvMediaDetailBodyBox(
-                backgroundImageUrl = ImageUrlBuilder.finishImageUrl(episode.imageUrlPrefix, ArtworkKind.PRIMARY),
+            backgroundImageUrl = ImageUrlBuilder.finishImageUrl(
+                episode.imageUrlPrefix,
+                ArtworkKind.PRIMARY
+            ),
             modifier = it
         ) {
             TvEpisodeHeroSection(
@@ -99,8 +101,6 @@ internal fun TvEpisodeScreenContent(
             )
             Spacer(modifier = Modifier.height(12.dp))
         }
-        }
-        item(key = "episode-overview") {
         Column(modifier = it.fillMaxWidth()) {
             Spacer(modifier = Modifier.height(16.dp))
             MediaDetailOverviewSection(
@@ -109,8 +109,6 @@ internal fun TvEpisodeScreenContent(
             )
             Spacer(modifier = Modifier.height(20.dp))
         }
-        }
-        item(key = "episode-playback") {
         Column(modifier = it.fillMaxWidth()) {
             MediaDetailPlaybackSection(
                 audioTrack = "ENG",
@@ -119,9 +117,6 @@ internal fun TvEpisodeScreenContent(
             )
             Spacer(modifier = Modifier.height(20.dp))
         }
-        }
-        if (episode.cast.isNotEmpty()) {
-            item(key = "episode-cast") {
         Column(modifier = it.fillMaxWidth()) {
             MediaDetailSectionTitle(text = "Cast")
             Spacer(modifier = Modifier.height(14.dp))
@@ -130,5 +125,4 @@ internal fun TvEpisodeScreenContent(
         }
     }
 }
-    }
-}
+

app-tv/src/main/java/hu/bbara/purefin/ui/screen/movie/TvMovieScreen.kt

@@ -27,7 +27,9 @@ import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
 
 @Composable
 fun TvMovieScreen(
-    movie: MovieDto, viewModel: MovieScreenViewModel = hiltViewModel(), modifier: Modifier = Modifier
+    movie: MovieDto,
+    viewModel: MovieScreenViewModel = hiltViewModel(),
+    modifier: Modifier = Modifier
 ) {
     LaunchedEffect(movie.id) {
         viewModel.selectMovie(movie.id)
@@ -63,10 +65,9 @@ internal fun TvMovieScreenContent(
         resetScrollKey = movie.id,
         modifier = modifier
     ) {
-        item(key = "movie-hero") {
         TvMediaDetailBodyBox(
             backgroundImageUrl = tvMediaDetailBackgroundImageUrl(movie.imageUrlPrefix),
-                modifier = it
+            modifier = Modifier
         ) {
             TvMovieHeroSection(
                 movie = movie,
@@ -76,9 +77,7 @@ internal fun TvMovieScreenContent(
             )
             Spacer(modifier = Modifier.height(12.dp))
         }
-        }
-        item(key = "movie-overview") {
-            Column(modifier = it.fillMaxWidth()) {
+        Column(modifier = Modifier.fillMaxWidth()) {
             Spacer(modifier = Modifier.height(16.dp))
             MediaDetailOverviewSection(
                 synopsis = movie.synopsis,
@@ -87,8 +86,7 @@ internal fun TvMovieScreenContent(
             Spacer(modifier = Modifier.height(20.dp))
         }
     }
-        item(key = "movie-playback") {
-            Column(modifier = it.fillMaxWidth()) {
+    Column(modifier = Modifier.fillMaxWidth()) {
         MediaDetailPlaybackSection(
             audioTrack = "ENG",
             subtitles = "ENG",
@@ -96,10 +94,8 @@ internal fun TvMovieScreenContent(
         )
         Spacer(modifier = Modifier.height(20.dp))
     }
-        }
     if (movie.cast.isNotEmpty()) {
-            item(key = "movie-cast") {
-                Column(modifier = it.fillMaxWidth()) {
+        Column(modifier = Modifier.fillMaxWidth()) {
             MediaDetailSectionTitle(text = "Cast")
             Spacer(modifier = Modifier.height(14.dp))
 //                    MediaCastRow(cast = movie.cast)
@@ -107,5 +103,3 @@ internal fun TvMovieScreenContent(
         }
     }
 }
-    }
-}

app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/TvSeriesScreen.kt

@@ -81,7 +81,6 @@ internal fun TvSeriesScreenContent(
         resetScrollKey = series.id,
         modifier = modifier
     ) {
-        item(key = "series-hero") {
         TvMediaDetailBodyBox(
             backgroundImageUrl = tvMediaDetailBackgroundImageUrl(series.imageUrlPrefix),
             modifier = it
@@ -96,8 +95,6 @@ internal fun TvSeriesScreenContent(
             )
             Spacer(modifier = Modifier.height(12.dp))
         }
-        }
-        item(key = "series-overview") {
         Column(modifier = it.fillMaxWidth()) {
             Spacer(modifier = Modifier.height(16.dp))
             MediaDetailOverviewSection(
@@ -106,8 +103,6 @@ internal fun TvSeriesScreenContent(
             )
             Spacer(modifier = Modifier.height(24.dp))
         }
-        }
-        item(key = "series-season-tabs") {
         TvSeasonTabs(
             seasons = series.seasons,
             selectedSeason = selectedSeason,
@@ -116,16 +111,12 @@ internal fun TvSeriesScreenContent(
             onSelect = { selectedSeason = it },
             modifier = it
         )
-        }
-        item(key = "series-episodes") {
         Spacer(modifier = Modifier.height(20.dp))
         TvEpisodeCarousel(
             episodes = selectedSeason.episodes,
             modifier = it
         )
-        }
         if (series.cast.isNotEmpty()) {
-            item(key = "series-cast") {
             Column(modifier = it) {
                 Spacer(modifier = Modifier.height(20.dp))
                 MediaDetailSectionTitle(text = "Cast")
@@ -136,7 +127,7 @@ internal fun TvSeriesScreenContent(
         }
     }
 }
-}
+
 
 private fun Series.defaultSeason(): Season {
     for (season in seasons) {