@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.Column
77import androidx.compose.foundation.layout.PaddingValues
88import androidx.compose.foundation.layout.Spacer
99import androidx.compose.foundation.layout.consumeWindowInsets
10- import androidx.compose.foundation.layout.fillMaxWidth
10+ import androidx.compose.foundation.layout.fillMaxSize
1111import androidx.compose.foundation.layout.height
1212import androidx.compose.foundation.layout.padding
1313import androidx.compose.foundation.pager.HorizontalPager
@@ -53,28 +53,27 @@ fun HomeScreen(modifier: Modifier = Modifier, viewModel: HomeViewModel = hiltVie
5353 val appNavigator = LocalNavigator .current
5454
5555 // TODO: show fetched data immediately
56- PullToRefreshBox (
57- isRefreshing = uiState.isLoading,
58- onRefresh = { viewModel.updateTrending() },
56+ Scaffold (
5957 modifier = modifier,
58+ bottomBar = { SharedBottomBar () },
59+ floatingActionButton = {
60+ SharedFab (onClick = { appNavigator goto AppNavigator .Search }) {
61+ Icon (
62+ imageVector = Icons .Default .Search ,
63+ contentDescription = " Perform search" ,
64+ )
65+ }
66+ },
6067 ) {
61- Scaffold (
62- bottomBar = { SharedBottomBar () },
63- floatingActionButton = {
64- SharedFab (onClick = { appNavigator goto AppNavigator .Search }) {
65- Icon (
66- imageVector = Icons .Default .Search ,
67- contentDescription = " Perform search" ,
68- )
69- }
70- },
68+ PullToRefreshBox (
69+ isRefreshing = uiState.isLoading,
70+ onRefresh = { viewModel.updateTrending() },
71+ modifier = Modifier .padding(it).consumeWindowInsets(it),
7172 ) {
7273 Column (
73- modifier = Modifier
74- .padding(it)
75- .consumeWindowInsets(it)
76- .fillMaxWidth()
77- .verticalScroll(rememberScrollState()),
74+ // PullToRefresh relies on child scroll event to detect scroll gestures,
75+ // so make sure child composable has enough height.
76+ modifier = Modifier .fillMaxSize().verticalScroll(rememberScrollState()),
7877 verticalArrangement = Arrangement .spacedBy(16 .dp, Alignment .Top ),
7978 ) {
8079 // Book
0 commit comments