From a03ff1a60baead481b8c72c893b879aa85636194 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 27 Nov 2022 20:02:51 +0530 Subject: [PATCH] chore: rename paging-related parameters and variables --- .../dev/msfjarvis/claw/android/ui/LobstersApp.kt | 4 ++-- .../msfjarvis/claw/android/ui/lists/NetworkPosts.kt | 12 ++++++------ detekt-baselines/android.xml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt index e1083d48..c565e5a3 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt @@ -171,7 +171,7 @@ fun LobstersApp( ) { setWebUri("https://lobste.rs/") NetworkPosts( - items = hottestPosts, + lazyPagingItems = hottestPosts, listState = hottestListState, isPostSaved = viewModel::isPostSaved, reloadPosts = viewModel::refreshHottestPosts, @@ -183,7 +183,7 @@ fun LobstersApp( ) { setWebUri("https://lobste.rs/") NetworkPosts( - items = newestPosts, + lazyPagingItems = newestPosts, listState = newestListState, isPostSaved = viewModel::isPostSaved, reloadPosts = viewModel::refreshNewestPosts, diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt index c54fa9ac..1d143960 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt @@ -32,28 +32,28 @@ import dev.msfjarvis.claw.model.LobstersPost @OptIn(ExperimentalMaterialApi::class) @Composable fun NetworkPosts( - items: LazyPagingItems, + lazyPagingItems: LazyPagingItems, listState: LazyListState, isPostSaved: suspend (SavedPost) -> Boolean, reloadPosts: () -> Unit, postActions: PostActions, modifier: Modifier = Modifier, ) { - val loadState = items.loadState.refresh - val isRefreshing = loadState == LoadState.Loading + val refreshLoadState = lazyPagingItems.loadState.refresh + val isRefreshing = refreshLoadState == LoadState.Loading val pullRefreshState = rememberPullRefreshState(isRefreshing, reloadPosts) Box(modifier = modifier.fillMaxSize().pullRefresh(pullRefreshState)) { - if (items.itemCount == 0 && loadState is LoadState.Error) { + if (lazyPagingItems.itemCount == 0 && refreshLoadState is LoadState.Error) { NetworkError( label = "Failed to load posts", - error = loadState.error, + error = refreshLoadState.error, modifier = Modifier.align(Alignment.Center), ) } else { LazyColumn( state = listState, ) { - items(items) { item -> + items(lazyPagingItems) { item -> if (item != null) { val dbModel = item.toDbModel() ListItem( diff --git a/detekt-baselines/android.xml b/detekt-baselines/android.xml index b74c6349..2d00d3cf 100644 --- a/detekt-baselines/android.xml +++ b/detekt-baselines/android.xml @@ -3,6 +3,6 @@ LongMethod:LobstersApp.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun LobstersApp( urlLauncher: UrlLauncher, htmlConverter: HTMLConverter, setWebUri: (String?) -> Unit, modifier: Modifier = Modifier, viewModel: ClawViewModel = injectedViewModel(), ) - LongParameterList:NetworkPosts.kt$( items: LazyPagingItems<LobstersPost>, listState: LazyListState, isPostSaved: suspend (SavedPost) -> Boolean, reloadPosts: () -> Unit, postActions: PostActions, modifier: Modifier = Modifier, ) + LongParameterList:NetworkPosts.kt$( lazyPagingItems: LazyPagingItems<LobstersPost>, listState: LazyListState, isPostSaved: suspend (SavedPost) -> Boolean, reloadPosts: () -> Unit, postActions: PostActions, modifier: Modifier = Modifier, )