From a28d5085bb9fb5e606f1d4378066079facee1128 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 7 Mar 2021 11:27:21 +0530 Subject: [PATCH 1/2] app: remove LobstersTopAppBar Signed-off-by: Harsh Shandilya --- ...shIconWhenOnSavedPostsScreen_DarkTheme.png | Bin 6170 -> 0 bytes ...hIconWhenOnSavedPostsScreen_LightTheme.png | Bin 5984 -> 0 bytes ...IconWhenOnHottestPostsScreen_DarkTheme.png | Bin 7500 -> 0 bytes ...conWhenOnHottestPostsScreen_LightTheme.png | Bin 7298 -> 0 bytes .../lobsters/ui/main/LobstersTopBarTest.kt | 74 ------------------ .../msfjarvis/lobsters/ui/main/LobstersApp.kt | 38 --------- 6 files changed, 112 deletions(-) delete mode 100644 app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_doesNotShowRefreshIconWhenOnSavedPostsScreen_DarkTheme.png delete mode 100644 app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_doesNotShowRefreshIconWhenOnSavedPostsScreen_LightTheme.png delete mode 100644 app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_showsRefreshIconWhenOnHottestPostsScreen_DarkTheme.png delete mode 100644 app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_showsRefreshIconWhenOnHottestPostsScreen_LightTheme.png delete mode 100644 app/src/androidTest/java/dev/msfjarvis/lobsters/ui/main/LobstersTopBarTest.kt diff --git a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_doesNotShowRefreshIconWhenOnSavedPostsScreen_DarkTheme.png b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_doesNotShowRefreshIconWhenOnSavedPostsScreen_DarkTheme.png deleted file mode 100644 index ad4d0c8f55fad40b5be05c7a62895d9d0e089302..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6170 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 cH2LU%#uMRzopr0Bv+4E&u=k diff --git a/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_showsRefreshIconWhenOnHottestPostsScreen_DarkTheme.png b/app/screenshots/debug/dev.msfjarvis.lobsters.ui.main.LobstersTopBarTest_showsRefreshIconWhenOnHottestPostsScreen_DarkTheme.png deleted file mode 100644 index 8610f311fbf8bd5446aab97a391f0503d3ad02c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7500 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 Unit, -) { - TopAppBar( - title = { - Text( - text = stringResource(id = R.string.app_name), - modifier = Modifier.padding(vertical = 8.dp), - ) - }, - actions = { - if (currentDestination == Destination.Hottest) { - IconResource( - resourceId = R.drawable.ic_refresh_24px, - contentDescription = stringResource(id = R.string.refresh_posts_content_description), - modifier = Modifier - .padding(horizontal = 8.dp, vertical = 8.dp) - .clickable { reloadPosts() }, - ) - } - } - ) -} - @Composable fun LobstersBottomNav( currentDestination: Destination, From 697e806dd82b5241c63f706f2a2443d79eadc559 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 7 Mar 2021 11:42:34 +0530 Subject: [PATCH 2/2] 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 {