v0.3.5: update DealListScreen.kt
This commit is contained in:
1 parent
c9213d4b2f
commit
bd3fcf42f6
1 file changed
+3
-5
@@ -62,7 +62,7 @@ fun DealListScreen(
|
|||||||
|
|
||||||
// Pull to Refresh
|
// Pull to Refresh
|
||||||
val pullToRefreshState = rememberPullToRefreshState(positionalThreshold = 40.dp)
|
val pullToRefreshState = rememberPullToRefreshState(positionalThreshold = 40.dp)
|
||||||
var isRefreshing by remember { mutableStateOf(false) }
|
val isRefreshingByVm by viewModel.isRefreshing.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
val listState = rememberLazyListState()
|
val listState = rememberLazyListState()
|
||||||
val scope = rememberCoroutineScope()
|
val scope = rememberCoroutineScope()
|
||||||
@@ -70,9 +70,8 @@ fun DealListScreen(
|
|||||||
derivedStateOf { listState.firstVisibleItemIndex > 3 }
|
derivedStateOf { listState.firstVisibleItemIndex > 3 }
|
||||||
}
|
}
|
||||||
|
|
||||||
LaunchedEffect(uiState) {
|
LaunchedEffect(isRefreshingByVm) {
|
||||||
if (uiState !is MainUiState.Loading) {
|
if (!isRefreshingByVm) {
|
||||||
isRefreshing = false
|
|
||||||
pullToRefreshState.endRefresh()
|
pullToRefreshState.endRefresh()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -421,7 +420,6 @@ fun DealListScreen(
|
|||||||
|
|
||||||
LaunchedEffect(pullToRefreshState.isRefreshing) {
|
LaunchedEffect(pullToRefreshState.isRefreshing) {
|
||||||
if (pullToRefreshState.isRefreshing) {
|
if (pullToRefreshState.isRefreshing) {
|
||||||
isRefreshing = true
|
|
||||||
viewModel.refresh()
|
viewModel.refresh()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user