From 906cfb5e43501a647aa1f816276aa1bc6afe074e Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 29 Oct 2020 16:22:10 +0530 Subject: [PATCH] Fix pagination Signed-off-by: Harsh Shandilya --- app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt | 5 +---- app/src/main/java/dev/msfjarvis/lobsters/ui/HottestPosts.kt | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt b/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt index 05003017..f8df0b1d 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/MainActivity.kt @@ -10,7 +10,6 @@ import androidx.compose.material.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.Providers import androidx.compose.runtime.ambientOf -import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.ui.platform.setContent import androidx.navigation.compose.KEY_ROUTE @@ -53,8 +52,6 @@ fun LobstersApp( viewModel: LobstersViewModel ) { val urlLauncher = UrlLauncherAmbient.current - val posts = viewModel.posts.collectAsState() - val lastIndex = posts.value.lastIndex val navController = rememberNavController() val destinations = arrayOf(Destination.Hottest, Destination.Saved) @@ -92,7 +89,7 @@ fun LobstersApp( ) { NavHost(navController, startDestination = Destination.Hottest.route) { composable(Destination.Hottest.route) { - HottestPosts(lastIndex = lastIndex, urlLauncher = urlLauncher , viewModel = viewModel) + HottestPosts(urlLauncher = urlLauncher, viewModel = viewModel) } composable(Destination.Saved.route) { SavedPosts(urlLauncher = urlLauncher, viewModel = viewModel) diff --git a/app/src/main/java/dev/msfjarvis/lobsters/ui/HottestPosts.kt b/app/src/main/java/dev/msfjarvis/lobsters/ui/HottestPosts.kt index f3ad7f26..48b754b1 100644 --- a/app/src/main/java/dev/msfjarvis/lobsters/ui/HottestPosts.kt +++ b/app/src/main/java/dev/msfjarvis/lobsters/ui/HottestPosts.kt @@ -13,7 +13,6 @@ import dev.msfjarvis.lobsters.urllauncher.UrlLauncher @Composable fun HottestPosts( - lastIndex: Int, urlLauncher: UrlLauncher, viewModel: LobstersViewModel, ) { @@ -28,7 +27,7 @@ fun HottestPosts( state = listState, modifier = Modifier.padding(horizontal = 8.dp) ) { index, item -> - if (lastIndex == index) { + if (posts.lastIndex == index) { viewModel.getMorePosts() } LobstersItem(