diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/SearchList.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/SearchList.kt index 97db94ea..e7d21bbe 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/SearchList.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/SearchList.kt @@ -19,16 +19,14 @@ import androidx.compose.ui.semantics.isTraversalGroup import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex -import androidx.paging.PagingData -import androidx.paging.compose.collectAsLazyPagingItems +import androidx.paging.compose.LazyPagingItems import dev.msfjarvis.claw.common.posts.PostActions import dev.msfjarvis.claw.common.ui.SearchBar import dev.msfjarvis.claw.model.UIPost -import kotlinx.coroutines.flow.Flow @Composable fun SearchList( - items: Flow>, + lazyPagingItems: LazyPagingItems, listState: LazyListState, postActions: PostActions, searchQuery: String, @@ -36,7 +34,6 @@ fun SearchList( contentPadding: PaddingValues, modifier: Modifier = Modifier, ) { - val lazyPagingItems = items.collectAsLazyPagingItems() val triggerSearch = { query: String -> setSearchQuery(query) lazyPagingItems.refresh() diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/SearchScreen.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/SearchScreen.kt index 4d72a009..9ba8aabc 100644 --- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/SearchScreen.kt +++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/SearchScreen.kt @@ -15,6 +15,7 @@ import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable import androidx.navigation.compose.rememberNavController import androidx.navigation.toRoute +import androidx.paging.compose.collectAsLazyPagingItems import com.deliveryhero.whetstone.compose.injectedViewModel import dev.msfjarvis.claw.android.ui.lists.SearchList import dev.msfjarvis.claw.android.ui.navigation.Comments @@ -38,12 +39,13 @@ fun SearchScreen( val navController = rememberNavController() val postActions = rememberPostActions(LocalContext.current, urlLauncher, navController, viewModel) val listState = rememberLazyListState() + val searchResults = viewModel.searchResults.collectAsLazyPagingItems() Scaffold(modifier = modifier) { contentPadding -> NavHost(navController = navController, startDestination = Search) { composable { setWebUri("https://lobste.rs/search") SearchList( - items = viewModel.searchResults, + lazyPagingItems = searchResults, listState = listState, postActions = postActions, searchQuery = viewModel.searchQuery,