Skip to content

Commit d07f921

Browse files
committed
refactor: move ScrollState
1 parent 542f981 commit d07f921

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package io.github.shinhyo.brba.presentation.ui
1818
import androidx.activity.compose.BackHandler
1919
import androidx.compose.foundation.layout.navigationBarsPadding
2020
import androidx.compose.foundation.layout.padding
21-
import androidx.compose.foundation.rememberScrollState
2221
import androidx.compose.material.*
2322
import androidx.compose.runtime.Composable
2423
import androidx.compose.runtime.MutableState
@@ -99,12 +98,10 @@ fun NavScreen(
9998
},
10099
) {
101100
val modifier = Modifier.padding(it)
102-
val listScrollState = rememberScrollState()
103101
when (selectedTab.value) {
104102
BottomNavTabs.LIST -> ListScreen(
105103
hiltViewModel(),
106104
actions.moveDetail,
107-
listScrollState,
108105
modifier
109106
)
110107
BottomNavTabs.FAVORITE -> FavoriteScreen(

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,22 @@ import kotlin.math.ceil
4545
fun ListScreen(
4646
viewModel: ListViewModel,
4747
select: (Character) -> Unit,
48-
state: ScrollState,
4948
modifier: Modifier = Modifier
5049
) {
51-
val uiState = viewModel.uiState.collectAsState()
50+
val listScrollState = rememberScrollState()
5251
val clickFavorite: (Character) -> Unit = viewModel::upsertFavorite
53-
Body(uiState.value.list, select, clickFavorite, state, modifier)
52+
Body(viewModel, select, clickFavorite, listScrollState, modifier)
5453
}
5554

5655
@Composable
5756
private fun Body(
58-
list: List<Character>,
57+
viewModel: ListViewModel,
5958
select: (Character) -> Unit,
6059
clickFavorite: (Character) -> Unit,
6160
state: ScrollState,
6261
modifier: Modifier
6362
) {
63+
val uiState = viewModel.uiState.collectAsState()
6464
Column(
6565
modifier = modifier
6666
.verticalScroll(state)
@@ -78,7 +78,7 @@ private fun Body(
7878
maxColumnWidth = 160.dp,
7979
modifier = Modifier.padding(4.dp)
8080
) {
81-
list.forEach {
81+
uiState.value.list.forEach {
8282
FeaturedList(
8383
character = it, select = select,
8484
clickFavorite = clickFavorite

0 commit comments

Comments
 (0)