refactor: fix ScrollState

Author: shinhyo

presentation/src/main/java/io/github/shinhyo/brba/presentation/ui/NavGraph.kt

@@ -18,6 +18,8 @@ package io.github.shinhyo.brba.presentation.ui
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
@@ -98,16 +100,20 @@ fun NavScreen(
         },
     ) {
         val modifier = Modifier.padding(it)
+        val listScrollState = rememberScrollState()
+        val favoriteScrollState = rememberLazyListState()
         when (selectedTab.value) {
             BottomNavTabs.LIST -> ListScreen(
-                hiltViewModel(),
-                actions.moveDetail,
-                modifier
+                modifier = modifier,
+                viewModel = hiltViewModel(),
+                scrollState = listScrollState,
+                select = actions.moveDetail,
             )
             BottomNavTabs.FAVORITE -> FavoriteScreen(
-                hiltViewModel(),
-                actions.moveDetail,
-                modifier
+                modifier = modifier,
+                viewModel = hiltViewModel(),
+                scrollState = favoriteScrollState,
+                select = actions.moveDetail,
             )
         }
     }

presentation/src/main/java/io/github/shinhyo/brba/presentation/ui/favorite/FavoriteScreen.kt

@@ -20,6 +20,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.Card
 import androidx.compose.material.Icon
@@ -46,27 +47,51 @@ import io.github.shinhyo.brba.presentation.ui.common.IconFavorite
 
 @Composable
 fun FavoriteScreen(
+    modifier: Modifier = Modifier,
     viewModel: FavoriteViewModel,
+    scrollState: LazyListState,
+    select: (Character) -> Unit,
+) {
+    Body(
+        modifier = modifier,
+        viewModel = viewModel,
+        scrollState = scrollState,
+        select = select,
+    )
+}
+
+@Composable
+private fun Body(
+    modifier: Modifier,
+    viewModel: FavoriteViewModel,
+    scrollState: LazyListState,
     select: (Character) -> Unit,
-    modifier: Modifier = Modifier
 ) {
     val list = viewModel.list.collectAsState()
     if (list.value.isEmpty()) {
         EmptyScreen()
     } else {
-        ListScreen(modifier, list, select, viewModel)
+        ListScreen(
+            modifier = modifier,
+            list = list,
+            select = select,
+            viewModel = viewModel,
+            state = scrollState
+        )
     }
 }
 
 @Composable
 private fun ListScreen(
     modifier: Modifier,
+    viewModel: FavoriteViewModel,
     list: State<List<Character>>,
+    state: LazyListState,
     select: (Character) -> Unit,
-    viewModel: FavoriteViewModel
 ) {
     LazyColumn(
         modifier = modifier,
+        state = state,
         contentPadding = PaddingValues(start = 8.dp, top = 32.dp, end = 8.dp, bottom = 32.dp),
         verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {

presentation/src/main/java/io/github/shinhyo/brba/presentation/ui/list/ListScreen.kt

@@ -39,31 +39,39 @@ import coil.compose.rememberImagePainter
 import io.github.shinhyo.brba.domain.model.Character
 import io.github.shinhyo.brba.presentation.R
 import io.github.shinhyo.brba.presentation.ui.common.IconFavorite
+import timber.log.Timber
 import kotlin.math.ceil
 
 @Composable
 fun ListScreen(
+    modifier: Modifier = Modifier,
     viewModel: ListViewModel,
+    scrollState: ScrollState,
     select: (Character) -> Unit,
-    modifier: Modifier = Modifier
 ) {
-    val listScrollState = rememberScrollState()
-    val clickFavorite: (Character) -> Unit = viewModel::upsertFavorite
-    Body(viewModel, select, clickFavorite, listScrollState, modifier)
+    Body(
+        modifier = modifier,
+        viewModel = viewModel,
+        scrollState = scrollState,
+        select = select,
+    )
 }
 
 @Composable
 private fun Body(
+    modifier: Modifier,
     viewModel: ListViewModel,
+    scrollState: ScrollState,
     select: (Character) -> Unit,
-    clickFavorite: (Character) -> Unit,
-    state: ScrollState,
-    modifier: Modifier
 ) {
+    Timber.d("Body")
+//    val scrollState = rememberScrollState()
+//    Timber.i("Body: scrollState.value ${scrollState.value}")
     val uiState = viewModel.uiState.collectAsState()
+    val clickFavorite: (Character) -> Unit = viewModel::upsertFavorite
     Column(
         modifier = modifier
-            .verticalScroll(state)
+            .verticalScroll(scrollState)
             .statusBarsPadding()
     ) {
         Text(
@@ -80,7 +88,8 @@ private fun Body(
         ) {
             uiState.value.list.forEach {
                 FeaturedList(
-                    character = it, select = select,
+                    character = it,
+                    select = select,
                     clickFavorite = clickFavorite
                 )
             }