Use Voyager on BrowseSource and SourceSearch screen (#8650)

Some navigation janks will be dealt with when the migration is complete

app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt

@@ -6,7 +6,7 @@ import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
@@ -17,11 +17,11 @@ import eu.kanade.presentation.browse.InLibraryBadge
 import eu.kanade.presentation.components.CommonMangaItemDefaults
 import eu.kanade.presentation.components.MangaComfortableGridItem
 import eu.kanade.presentation.util.plus
+import kotlinx.coroutines.flow.StateFlow
 
 @Composable
 fun BrowseSourceComfortableGrid(
-    mangaList: LazyPagingItems<Manga>,
-    getMangaState: @Composable ((Manga) -> State<Manga>),
+    mangaList: LazyPagingItems<StateFlow<Manga>>,
     columns: GridCells,
     contentPadding: PaddingValues,
     onMangaClick: (Manga) -> Unit,
@@ -40,8 +40,7 @@ fun BrowseSourceComfortableGrid(
         }
 
         items(mangaList.itemCount) { index ->
-            val initialManga = mangaList[index] ?: return@items
-            val manga by getMangaState(initialManga)
+            val manga by mangaList[index]?.collectAsState() ?: return@items
             BrowseSourceComfortableGridItem(
                 manga = manga,
                 onClick = { onMangaClick(manga) },

app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt

@@ -6,7 +6,7 @@ import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.GridItemSpan
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
@@ -17,11 +17,11 @@ import eu.kanade.presentation.browse.InLibraryBadge
 import eu.kanade.presentation.components.CommonMangaItemDefaults
 import eu.kanade.presentation.components.MangaCompactGridItem
 import eu.kanade.presentation.util.plus
+import kotlinx.coroutines.flow.StateFlow
 
 @Composable
 fun BrowseSourceCompactGrid(
-    mangaList: LazyPagingItems<Manga>,
-    getMangaState: @Composable ((Manga) -> State<Manga>),
+    mangaList: LazyPagingItems<StateFlow<Manga>>,
     columns: GridCells,
     contentPadding: PaddingValues,
     onMangaClick: (Manga) -> Unit,
@@ -40,8 +40,7 @@ fun BrowseSourceCompactGrid(
         }
 
         items(mangaList.itemCount) { index ->
-            val initialManga = mangaList[index] ?: return@items
-            val manga by getMangaState(initialManga)
+            val manga by mangaList[index]?.collectAsState() ?: return@items
             BrowseSourceCompactGridItem(
                 manga = manga,
                 onClick = { onMangaClick(manga) },

app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt

@@ -2,7 +2,7 @@ package eu.kanade.presentation.browse.components
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
@@ -15,11 +15,11 @@ import eu.kanade.presentation.components.CommonMangaItemDefaults
 import eu.kanade.presentation.components.LazyColumn
 import eu.kanade.presentation.components.MangaListItem
 import eu.kanade.presentation.util.plus
+import kotlinx.coroutines.flow.StateFlow
 
 @Composable
 fun BrowseSourceList(
-    mangaList: LazyPagingItems<Manga>,
-    getMangaState: @Composable ((Manga) -> State<Manga>),
+    mangaList: LazyPagingItems<StateFlow<Manga>>,
     contentPadding: PaddingValues,
     onMangaClick: (Manga) -> Unit,
     onMangaLongClick: (Manga) -> Unit,
@@ -33,9 +33,9 @@ fun BrowseSourceList(
             }
         }
 
-        items(mangaList) { initialManga ->
-            initialManga ?: return@items
-            val manga by getMangaState(initialManga)
+        items(mangaList) { mangaflow ->
+            mangaflow ?: return@items
+            val manga by mangaflow.collectAsState()
             BrowseSourceListItem(
                 manga = manga,
                 onClick = { onMangaClick(manga) },

app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt

@@ -14,7 +14,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.res.stringResource
 import eu.kanade.domain.library.model.LibraryDisplayMode
-import eu.kanade.presentation.browse.BrowseSourceState
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.components.AppBarActions
 import eu.kanade.presentation.components.AppBarTitle
@@ -27,7 +26,8 @@ import eu.kanade.tachiyomi.source.LocalSource
 
 @Composable
 fun BrowseSourceToolbar(
-    state: BrowseSourceState,
+    searchQuery: String?,
+    onSearchQueryChange: (String?) -> Unit,
     source: CatalogueSource?,
     displayMode: LibraryDisplayMode,
     onDisplayModeChange: (LibraryDisplayMode) -> Unit,
@@ -44,8 +44,8 @@ fun BrowseSourceToolbar(
     SearchToolbar(
         navigateUp = navigateUp,
         titleContent = { AppBarTitle(title) },
-        searchQuery = state.searchQuery,
-        onChangeSearchQuery = { state.searchQuery = it },
+        searchQuery = searchQuery,
+        onChangeSearchQuery = onSearchQueryChange,
         onSearch = onSearch,
         onClickCloseSearch = navigateUp,
         actions = {