From 697e806dd82b5241c63f706f2a2443d79eadc559 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 7 Mar 2021 11:42:34 +0530 Subject: [PATCH] app: switch to PullToRefresh Signed-off-by: Harsh Shandilya --- app/build.gradle.kts | 1 + .../msfjarvis/lobsters/ui/main/LobstersApp.kt | 3 +- .../lobsters/ui/posts/HottestPosts.kt | 65 +++++++++++-------- buildSrc/src/main/java/Dependencies.kt | 1 + 4 files changed, 43 insertions(+), 27 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 143c4f79..5a0aa43e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -55,6 +55,7 @@ dependencies { implementation(Dependencies.ThirdParty.accompanist) implementation(Dependencies.ThirdParty.composeFlowLayout) implementation(Dependencies.ThirdParty.Moshi.lib) + implementation(Dependencies.ThirdParty.pullToRefresh) implementation(Dependencies.ThirdParty.Retrofit.moshi) implementation(Dependencies.ThirdParty.SQLDelight.androidDriver) testImplementation(Dependencies.Testing.junit) diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/main/LobstersApp.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/main/LobstersApp.kt index 0febc3df..bbcea9f7 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/main/LobstersApp.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/main/LobstersApp.kt @@ -64,9 +64,10 @@ fun LobstersApp() { HottestPosts( posts = hottestPosts, listState = hottestPostsListState, + modifier = Modifier.padding(bottom = innerPadding.calculateBottomPadding()), isPostSaved = viewModel::isPostSaved, saveAction = viewModel::toggleSave, - modifier = Modifier.padding(bottom = innerPadding.calculateBottomPadding()), + refreshAction = viewModel::reloadPosts, ) } composable(Destination.Saved.route) { diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt index 6f81db0d..bea13542 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/posts/HottestPosts.kt @@ -11,6 +11,7 @@ import androidx.compose.ui.Modifier import androidx.paging.LoadState import androidx.paging.compose.LazyPagingItems import androidx.paging.compose.items +import com.puculek.pulltorefresh.PullToRefresh import dev.msfjarvis.lobsters.data.local.SavedPost import dev.msfjarvis.lobsters.model.LobstersPost import dev.msfjarvis.lobsters.ui.urllauncher.LocalUrlLauncher @@ -20,39 +21,51 @@ import dev.msfjarvis.lobsters.util.toDbModel fun HottestPosts( posts: LazyPagingItems, listState: LazyListState, - isPostSaved: (String) -> Boolean, modifier: Modifier = Modifier, + isPostSaved: (String) -> Boolean, saveAction: (SavedPost) -> Unit, + refreshAction: () -> Unit, ) { val urlLauncher = LocalUrlLauncher.current + var isRefreshing by mutableStateOf(false) - if (posts.loadState.refresh == LoadState.Loading) { - LazyColumn { - items(15) { - LoadingLobstersItem() + PullToRefresh( + isRefreshing = isRefreshing, + onRefresh = { + if (posts.loadState.refresh != LoadState.Loading) { + isRefreshing = isRefreshing.not() + refreshAction() } - } - } else { - LazyColumn( - state = listState, - modifier = Modifier.then(modifier), - ) { - items(posts) { item -> - if (item != null) { - @Suppress("NAME_SHADOWING") - val item = item.toDbModel() - var isSaved by remember(item.shortId) { mutableStateOf(isPostSaved(item.shortId)) } + }, + ) { + if (posts.loadState.refresh == LoadState.Loading) { + LazyColumn { + items(15) { + LoadingLobstersItem() + } + } + } else { + LazyColumn( + state = listState, + modifier = Modifier.then(modifier), + ) { + items(posts) { item -> + if (item != null) { + @Suppress("NAME_SHADOWING") + val item = item.toDbModel() + var isSaved by remember(item.shortId) { mutableStateOf(isPostSaved(item.shortId)) } - LobstersItem( - post = item, - isSaved = isSaved, - onClick = { urlLauncher.launch(item.url.ifEmpty { item.commentsUrl }) }, - onLongClick = { urlLauncher.launch(item.commentsUrl) }, - onSaveButtonClick = { - isSaved = isSaved.not() - saveAction.invoke(item) - }, - ) + LobstersItem( + post = item, + isSaved = isSaved, + onClick = { urlLauncher.launch(item.url.ifEmpty { item.commentsUrl }) }, + onLongClick = { urlLauncher.launch(item.commentsUrl) }, + onSaveButtonClick = { + isSaved = isSaved.not() + saveAction.invoke(item) + }, + ) + } } } } diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index c61fd8e4..d700b6a6 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -67,6 +67,7 @@ object Dependencies { const val accompanist = "dev.chrisbanes.accompanist:accompanist-coil:0.6.2" const val composeFlowLayout = "com.star-zero:compose-flowlayout:0.0.1" + const val pullToRefresh = "com.puculek.pulltorefresh:pull-to-refresh-compose:1.0.0" object Moshi {