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/BrowseSourceScreen.kt

@@ -1,213 +1,37 @@
 package eu.kanade.presentation.browse
 
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.foundation.background
-import androidx.compose.foundation.horizontalScroll
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.navigationBarsPadding
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.grid.GridCells
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Favorite
-import androidx.compose.material.icons.outlined.FilterList
 import androidx.compose.material.icons.outlined.HelpOutline
-import androidx.compose.material.icons.outlined.NewReleases
 import androidx.compose.material.icons.outlined.Public
 import androidx.compose.material.icons.outlined.Refresh
-import androidx.compose.material3.FilterChip
-import androidx.compose.material3.FilterChipDefaults
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SnackbarDuration
-import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.State
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
-import androidx.paging.compose.collectAsLazyPagingItems
 import eu.kanade.data.source.NoResultsException
 import eu.kanade.domain.library.model.LibraryDisplayMode
 import eu.kanade.domain.manga.model.Manga
-import eu.kanade.domain.source.interactor.GetRemoteManga
 import eu.kanade.presentation.browse.components.BrowseSourceComfortableGrid
 import eu.kanade.presentation.browse.components.BrowseSourceCompactGrid
 import eu.kanade.presentation.browse.components.BrowseSourceList
-import eu.kanade.presentation.browse.components.BrowseSourceToolbar
-import eu.kanade.presentation.components.AppStateBanners
-import eu.kanade.presentation.components.Divider
 import eu.kanade.presentation.components.EmptyScreen
 import eu.kanade.presentation.components.EmptyScreenAction
-import eu.kanade.presentation.components.ExtendedFloatingActionButton
 import eu.kanade.presentation.components.LoadingScreen
-import eu.kanade.presentation.components.Scaffold
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.LocalSource
-import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter
-import eu.kanade.tachiyomi.ui.more.MoreController
-
-@Composable
-fun BrowseSourceScreen(
-    presenter: BrowseSourcePresenter,
-    navigateUp: () -> Unit,
-    openFilterSheet: () -> Unit,
-    onMangaClick: (Manga) -> Unit,
-    onMangaLongClick: (Manga) -> Unit,
-    onWebViewClick: () -> Unit,
-    incognitoMode: Boolean,
-    downloadedOnlyMode: Boolean,
-) {
-    val columns by presenter.getColumnsPreferenceForCurrentOrientation()
-
-    val mangaList = presenter.getMangaList().collectAsLazyPagingItems()
-
-    val snackbarHostState = remember { SnackbarHostState() }
-
-    val uriHandler = LocalUriHandler.current
-
-    val onHelpClick = {
-        uriHandler.openUri(LocalSource.HELP_URL)
-    }
-
-    Scaffold(
-        topBar = {
-            Column(modifier = Modifier.background(MaterialTheme.colorScheme.surface)) {
-                BrowseSourceToolbar(
-                    state = presenter,
-                    source = presenter.source,
-                    displayMode = presenter.displayMode,
-                    onDisplayModeChange = { presenter.displayMode = it },
-                    navigateUp = navigateUp,
-                    onWebViewClick = onWebViewClick,
-                    onHelpClick = onHelpClick,
-                    onSearch = { presenter.search(it) },
-                )
-
-                Row(
-                    modifier = Modifier
-                        .horizontalScroll(rememberScrollState())
-                        .padding(horizontal = 8.dp),
-                    horizontalArrangement = Arrangement.spacedBy(8.dp),
-                ) {
-                    FilterChip(
-                        selected = presenter.currentFilter == BrowseSourcePresenter.Filter.Popular,
-                        onClick = {
-                            presenter.reset()
-                            presenter.search(GetRemoteManga.QUERY_POPULAR)
-                        },
-                        leadingIcon = {
-                            Icon(
-                                imageVector = Icons.Outlined.Favorite,
-                                contentDescription = "",
-                                modifier = Modifier
-                                    .size(FilterChipDefaults.IconSize),
-                            )
-                        },
-                        label = {
-                            Text(text = stringResource(R.string.popular))
-                        },
-                    )
-                    if (presenter.source?.supportsLatest == true) {
-                        FilterChip(
-                            selected = presenter.currentFilter == BrowseSourcePresenter.Filter.Latest,
-                            onClick = {
-                                presenter.reset()
-                                presenter.search(GetRemoteManga.QUERY_LATEST)
-                            },
-                            leadingIcon = {
-                                Icon(
-                                    imageVector = Icons.Outlined.NewReleases,
-                                    contentDescription = "",
-                                    modifier = Modifier
-                                        .size(FilterChipDefaults.IconSize),
-                                )
-                            },
-                            label = {
-                                Text(text = stringResource(R.string.latest))
-                            },
-                        )
-                    }
-                    if (presenter.filters.isNotEmpty()) {
-                        FilterChip(
-                            selected = presenter.currentFilter is BrowseSourcePresenter.Filter.UserInput,
-                            onClick = openFilterSheet,
-                            leadingIcon = {
-                                Icon(
-                                    imageVector = Icons.Outlined.FilterList,
-                                    contentDescription = "",
-                                    modifier = Modifier
-                                        .size(FilterChipDefaults.IconSize),
-                                )
-                            },
-                            label = {
-                                Text(text = stringResource(R.string.action_filter))
-                            },
-                        )
-                    }
-                }
-
-                Divider()
-
-                AppStateBanners(downloadedOnlyMode, incognitoMode)
-            }
-        },
-        snackbarHost = {
-            SnackbarHost(hostState = snackbarHostState)
-        },
-    ) { paddingValues ->
-        BrowseSourceContent(
-            state = presenter,
-            mangaList = mangaList,
-            getMangaState = { presenter.getManga(it) },
-            columns = columns,
-            displayMode = presenter.displayMode,
-            snackbarHostState = snackbarHostState,
-            contentPadding = paddingValues,
-            onWebViewClick = onWebViewClick,
-            onHelpClick = { uriHandler.openUri(MoreController.URL_HELP) },
-            onLocalSourceHelpClick = onHelpClick,
-            onMangaClick = onMangaClick,
-            onMangaLongClick = onMangaLongClick,
-        )
-    }
-}
-
-@Composable
-fun BrowseSourceFloatingActionButton(
-    modifier: Modifier = Modifier.navigationBarsPadding(),
-    isVisible: Boolean,
-    onFabClick: () -> Unit,
-) {
-    AnimatedVisibility(visible = isVisible) {
-        ExtendedFloatingActionButton(
-            modifier = modifier,
-            text = { Text(text = stringResource(R.string.action_filter)) },
-            icon = { Icon(Icons.Outlined.FilterList, contentDescription = "") },
-            onClick = onFabClick,
-        )
-    }
-}
+import kotlinx.coroutines.flow.StateFlow
 
 @Composable
 fun BrowseSourceContent(
-    state: BrowseSourceState,
-    mangaList: LazyPagingItems<Manga>,
-    getMangaState: @Composable ((Manga) -> State<Manga>),
+    source: CatalogueSource?,
+    mangaList: LazyPagingItems<StateFlow<Manga>>,
     columns: GridCells,
     displayMode: LibraryDisplayMode,
     snackbarHostState: SnackbarHostState,
@@ -249,7 +73,7 @@ fun BrowseSourceContent(
     if (mangaList.itemCount <= 0 && errorState != null && errorState is LoadState.Error) {
         EmptyScreen(
             message = getErrorMessage(errorState),
-            actions = if (state.source is LocalSource) {
+            actions = if (source is LocalSource) {
                 listOf(
                     EmptyScreenAction(
                         stringResId = R.string.local_source_help_guide,
@@ -290,7 +114,6 @@ fun BrowseSourceContent(
         LibraryDisplayMode.ComfortableGrid -> {
             BrowseSourceComfortableGrid(
                 mangaList = mangaList,
-                getMangaState = getMangaState,
                 columns = columns,
                 contentPadding = contentPadding,
                 onMangaClick = onMangaClick,
@@ -300,16 +123,14 @@ fun BrowseSourceContent(
         LibraryDisplayMode.List -> {
             BrowseSourceList(
                 mangaList = mangaList,
-                getMangaState = getMangaState,
                 contentPadding = contentPadding,
                 onMangaClick = onMangaClick,
                 onMangaLongClick = onMangaLongClick,
             )
         }
-        else -> {
+        LibraryDisplayMode.CompactGrid, LibraryDisplayMode.CoverOnlyGrid -> {
             BrowseSourceCompactGrid(
                 mangaList = mangaList,
-                getMangaState = getMangaState,
                 columns = columns,
                 contentPadding = contentPadding,
                 onMangaClick = onMangaClick,

app/src/main/java/eu/kanade/presentation/browse/BrowseSourceState.kt

@@ -1,41 +0,0 @@
-package eu.kanade.presentation.browse
-
-import androidx.compose.runtime.Stable
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.setValue
-import eu.davidea.flexibleadapter.items.IFlexible
-import eu.kanade.tachiyomi.source.CatalogueSource
-import eu.kanade.tachiyomi.source.model.FilterList
-import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter
-import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter.Filter
-import eu.kanade.tachiyomi.ui.browse.source.browse.toItems
-
-@Stable
-interface BrowseSourceState {
-    val source: CatalogueSource?
-    var searchQuery: String?
-    val currentFilter: Filter
-    val isUserQuery: Boolean
-    val filters: FilterList
-    val filterItems: List<IFlexible<*>>
-    var dialog: BrowseSourcePresenter.Dialog?
-}
-
-fun BrowseSourceState(initialQuery: String?): BrowseSourceState {
-    return when (val filter = Filter.valueOf(initialQuery ?: "")) {
-        Filter.Latest, Filter.Popular -> BrowseSourceStateImpl(initialCurrentFilter = filter)
-        is Filter.UserInput -> BrowseSourceStateImpl(initialQuery = initialQuery, initialCurrentFilter = filter)
-    }
-}
-
-class BrowseSourceStateImpl(initialQuery: String? = null, initialCurrentFilter: Filter) : BrowseSourceState {
-    override var source: CatalogueSource? by mutableStateOf(null)
-    override var searchQuery: String? by mutableStateOf(initialQuery)
-    override var currentFilter: Filter by mutableStateOf(initialCurrentFilter)
-    override val isUserQuery: Boolean by derivedStateOf { currentFilter is Filter.UserInput && currentFilter.query.isNotEmpty() }
-    override var filters: FilterList by mutableStateOf(FilterList())
-    override val filterItems: List<IFlexible<*>> by derivedStateOf { filters.toItems() }
-    override var dialog: BrowseSourcePresenter.Dialog? by mutableStateOf(null)
-}

app/src/main/java/eu/kanade/presentation/browse/SourceSearchScreen.kt

@@ -1,72 +0,0 @@
-package eu.kanade.presentation.browse
-
-import androidx.compose.material3.SnackbarHost
-import androidx.compose.material3.SnackbarHostState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.paging.compose.collectAsLazyPagingItems
-import eu.kanade.domain.manga.model.Manga
-import eu.kanade.presentation.components.Scaffold
-import eu.kanade.presentation.components.SearchToolbar
-import eu.kanade.tachiyomi.source.LocalSource
-import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter
-import eu.kanade.tachiyomi.ui.more.MoreController
-
-@Composable
-fun SourceSearchScreen(
-    presenter: BrowseSourcePresenter,
-    navigateUp: () -> Unit,
-    onFabClick: () -> Unit,
-    onMangaClick: (Manga) -> Unit,
-    onWebViewClick: () -> Unit,
-) {
-    val columns by presenter.getColumnsPreferenceForCurrentOrientation()
-
-    val mangaList = presenter.getMangaList().collectAsLazyPagingItems()
-
-    val snackbarHostState = remember { SnackbarHostState() }
-
-    val uriHandler = LocalUriHandler.current
-
-    val onHelpClick = {
-        uriHandler.openUri(LocalSource.HELP_URL)
-    }
-
-    Scaffold(
-        topBar = { scrollBehavior ->
-            SearchToolbar(
-                searchQuery = presenter.searchQuery ?: "",
-                onChangeSearchQuery = { presenter.searchQuery = it },
-                onClickCloseSearch = navigateUp,
-                onSearch = { presenter.search(it) },
-                scrollBehavior = scrollBehavior,
-            )
-        },
-        floatingActionButton = {
-            BrowseSourceFloatingActionButton(
-                isVisible = presenter.filters.isNotEmpty(),
-                onFabClick = onFabClick,
-            )
-        },
-        snackbarHost = {
-            SnackbarHost(hostState = snackbarHostState)
-        },
-    ) { paddingValues ->
-        BrowseSourceContent(
-            state = presenter,
-            mangaList = mangaList,
-            getMangaState = { presenter.getManga(it) },
-            columns = columns,
-            displayMode = presenter.displayMode,
-            snackbarHostState = snackbarHostState,
-            contentPadding = paddingValues,
-            onWebViewClick = onWebViewClick,
-            onHelpClick = { uriHandler.openUri(MoreController.URL_HELP) },
-            onLocalSourceHelpClick = onHelpClick,
-            onMangaClick = onMangaClick,
-            onMangaLongClick = onMangaClick,
-        )
-    }
-}

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 = {