Merge Voyager screens (#8656)

* Merge Voyager screens * cleanups (cherry picked from commit 3d66eaea83) # Conflicts: # app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt # app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/base/changehandler/OneWayFadeChangeHandler.kt # app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/MigrateSearchScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SourceSearchScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesFilterController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/category/CategoryScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/WhatsNewDialogController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt # app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt # app/src/main/res/layout/main_activity.xml
2022-12-03 10:35:30 +07:00
parent 07c7ec972d
commit 726626f2c5
120 changed files with 1685 additions and 3009 deletions
@@ -4,17 +4,16 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.bluelinelabs.conductor.Router
+import cafe.adriel.voyager.navigator.Navigator
 import eu.kanade.tachiyomi.databinding.SourceFilterMangadexHeaderBinding
 import eu.kanade.tachiyomi.source.CatalogueSource
 import eu.kanade.tachiyomi.source.online.RandomMangaSource
-import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
-import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
+import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceScreen
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.lang.withIOContext
-import exh.md.follows.MangaDexFollowsController
+import exh.md.follows.MangaDexFollowsScreen

-class MangaDexFabHeaderAdapter(val router: Router, val source: CatalogueSource, val onClick: () -> Unit) :
+class MangaDexFabHeaderAdapter(val navigator: Navigator, val source: CatalogueSource, val onClick: () -> Unit) :
    RecyclerView.Adapter<MangaDexFabHeaderAdapter.SavedSearchesViewHolder>() {

    private lateinit var binding: SourceFilterMangadexHeaderBinding
@@ -33,7 +32,7 @@ class MangaDexFabHeaderAdapter(val router: Router, val source: CatalogueSource,
    inner class SavedSearchesViewHolder(view: View) : RecyclerView.ViewHolder(view) {
        fun bind() {
            binding.mangadexFollows.setOnClickListener {
-                router.replaceTopController(MangaDexFollowsController(source).withFadeTransaction())
+                navigator.replace(MangaDexFollowsScreen(source.id))
                onClick()
            }
            binding.mangadexRandom.setOnClickListener {
@@ -41,11 +40,11 @@ class MangaDexFabHeaderAdapter(val router: Router, val source: CatalogueSource,
                    val randomMangaUrl = withIOContext {
                        (source as? RandomMangaSource)?.fetchRandomMangaUrl()
                    }
-                    router.replaceTopController(
-                        BrowseSourceController(
-                            source,
+                    navigator.replace(
+                        BrowseSourceScreen(
+                            source.id,
                            "id:$randomMangaUrl",
-                        ).withFadeTransaction(),
+                        ),
                    )
                    onClick()
                }
@@ -1,30 +0,0 @@
-package exh.md.follows
-
-import android.os.Bundle
-import androidx.compose.runtime.Composable
-import androidx.core.os.bundleOf
-import cafe.adriel.voyager.navigator.Navigator
-import eu.kanade.tachiyomi.source.CatalogueSource
-import eu.kanade.tachiyomi.ui.base.controller.BasicFullComposeController
-import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
-
-/**
- * Controller that shows the latest manga from the catalogue. Inherit [BrowseSourceController].
- */
-class MangaDexFollowsController(bundle: Bundle) : BasicFullComposeController(bundle) {
-
-    constructor(source: CatalogueSource) : this(
-        bundleOf(
-            SOURCE_ID_KEY to source.id,
-        ),
-    )
-
-    private val sourceId = args.getLong(SOURCE_ID_KEY)
-
-    @Composable
-    override fun ComposeContent() {
-        Navigator(screen = MangaDexFollowsScreen(sourceId))
-    }
-}
-
-private const val SOURCE_ID_KEY = "source_id"
@@ -1,6 +1,5 @@
 package exh.md.follows

-import androidx.activity.compose.BackHandler
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
@@ -23,19 +22,16 @@ import eu.kanade.presentation.browse.components.RemoveMangaDialog
 import eu.kanade.presentation.components.ChangeCategoryDialog
 import eu.kanade.presentation.components.DuplicateMangaDialog
 import eu.kanade.presentation.components.Scaffold
-import eu.kanade.presentation.util.LocalRouter
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.ui.base.controller.pushController
 import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceScreenModel
-import eu.kanade.tachiyomi.ui.category.CategoryController
-import eu.kanade.tachiyomi.ui.manga.MangaController
+import eu.kanade.tachiyomi.ui.category.CategoryScreen
+import eu.kanade.tachiyomi.ui.manga.MangaScreen
 import eu.kanade.tachiyomi.util.lang.launchIO

 class MangaDexFollowsScreen(private val sourceId: Long) : Screen {

    @Composable
    override fun Content() {
-        val router = LocalRouter.currentOrThrow
        val navigator = LocalNavigator.currentOrThrow
        val scope = rememberCoroutineScope()
        val haptic = LocalHapticFeedback.current
@@ -44,20 +40,13 @@ class MangaDexFollowsScreen(private val sourceId: Long) : Screen {

        val snackbarHostState = remember { SnackbarHostState() }

-        val navigateUp: () -> Unit = {
-            when {
-                navigator.canPop -> navigator.pop()
-                router.backstackSize > 1 -> router.popCurrentController()
-            }
-        }
-
        Scaffold(
            topBar = { scrollBehavior ->
                BrowseSourceSimpleToolbar(
                    title = stringResource(R.string.mangadex_follows),
                    displayMode = screenModel.displayMode,
                    onDisplayModeChange = { screenModel.displayMode = it },
-                    navigateUp = navigateUp,
+                    navigateUp = navigator::pop,
                    scrollBehavior = scrollBehavior,
                )
            },
@@ -82,7 +71,7 @@ class MangaDexFollowsScreen(private val sourceId: Long) : Screen {
                onWebViewClick = null,
                onHelpClick = null,
                onLocalSourceHelpClick = null,
-                onMangaClick = { router.pushController(MangaController(it.id, true)) },
+                onMangaClick = { navigator.push(MangaScreen(it.id, true)) },
                onMangaLongClick = { manga ->
                    scope.launchIO {
                        val duplicateManga = screenModel.getDuplicateLibraryManga(manga)
@@ -109,7 +98,7 @@ class MangaDexFollowsScreen(private val sourceId: Long) : Screen {
                DuplicateMangaDialog(
                    onDismissRequest = onDismissRequest,
                    onConfirm = { screenModel.addFavorite(dialog.manga) },
-                    onOpenManga = { router.pushController(MangaController(dialog.duplicate.id)) },
+                    onOpenManga = { navigator.push(MangaScreen(dialog.duplicate.id)) },
                    duplicateFrom = screenModel.getSourceOrStub(dialog.duplicate),
                )
            }
@@ -127,7 +116,7 @@ class MangaDexFollowsScreen(private val sourceId: Long) : Screen {
                    initialSelection = dialog.initialSelection,
                    onDismissRequest = onDismissRequest,
                    onEditCategories = {
-                        router.pushController(CategoryController())
+                        navigator.push(CategoryScreen())
                    },
                    onConfirm = { include, _ ->
                        screenModel.changeMangaFavorite(dialog.manga)
@@ -137,7 +126,5 @@ class MangaDexFollowsScreen(private val sourceId: Long) : Screen {
            }
            else -> {}
        }
-
-        BackHandler(onBack = navigateUp)
    }
 }
@@ -1,7 +1,7 @@
 package exh.md.follows

 import android.content.Context
-import com.bluelinelabs.conductor.Router
+import cafe.adriel.voyager.navigator.Navigator
 import eu.kanade.domain.manga.model.Manga
 import eu.kanade.domain.source.model.SourcePagingSourceType
 import eu.kanade.tachiyomi.source.model.FilterList
@@ -22,7 +22,7 @@ class MangaDexFollowsScreenModel(sourceId: Long) : BrowseSourceScreenModel(sourc
        return map { it to metadata }
    }

-    override fun initFilterSheet(context: Context, router: Router) {
+    override fun initFilterSheet(context: Context, navigator: Navigator) {
        // No-op: we don't allow filtering in recs
    }
 }
@@ -1,34 +0,0 @@
-package exh.md.similar
-
-import android.os.Bundle
-import androidx.compose.runtime.Composable
-import androidx.core.os.bundleOf
-import cafe.adriel.voyager.navigator.Navigator
-import eu.kanade.domain.manga.model.Manga
-import eu.kanade.tachiyomi.source.CatalogueSource
-import eu.kanade.tachiyomi.ui.base.controller.BasicFullComposeController
-import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController
-
-/**
- * Controller that shows the latest manga from the catalogue. Inherit [BrowseSourceController].
- */
-class MangaDexSimilarController(bundle: Bundle) : BasicFullComposeController(bundle) {
-
-    constructor(manga: Manga, source: CatalogueSource) : this(
-        bundleOf(
-            MANGA_ID to manga.id,
-            SOURCE_ID_KEY to source.id,
-        ),
-    )
-
-    val mangaId = args.getLong(MANGA_ID)
-    val sourceId = args.getLong(SOURCE_ID_KEY)
-
-    @Composable
-    override fun ComposeContent() {
-        Navigator(screen = MangaDexSimilarScreen(mangaId, sourceId))
-    }
-}
-
-private const val MANGA_ID = "manga_id"
-private const val SOURCE_ID_KEY = "source_id"
@@ -17,10 +17,8 @@ import eu.kanade.domain.manga.model.Manga
 import eu.kanade.presentation.browse.BrowseSourceContent
 import eu.kanade.presentation.browse.components.BrowseSourceSimpleToolbar
 import eu.kanade.presentation.components.Scaffold
-import eu.kanade.presentation.util.LocalRouter
 import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.ui.base.controller.pushController
-import eu.kanade.tachiyomi.ui.manga.MangaController
+import eu.kanade.tachiyomi.ui.manga.MangaScreen

 class MangaDexSimilarScreen(val mangaId: Long, val sourceId: Long) : Screen {

@@ -28,26 +26,18 @@ class MangaDexSimilarScreen(val mangaId: Long, val sourceId: Long) : Screen {
    override fun Content() {
        val screenModel = rememberScreenModel { MangaDexSimilarScreenModel(mangaId, sourceId) }
        val state by screenModel.state.collectAsState()
-        val router = LocalRouter.currentOrThrow
        val navigator = LocalNavigator.currentOrThrow

        val onMangaClick: (Manga) -> Unit = {
-            router.pushController(MangaController(it.id, true))
+            navigator.push(MangaScreen(it.id, true))
        }

        val snackbarHostState = remember { SnackbarHostState() }

-        val navigateUp: () -> Unit = {
-            when {
-                navigator.canPop -> navigator.pop()
-                router.backstackSize > 1 -> router.popCurrentController()
-            }
-        }
-
        Scaffold(
            topBar = { scrollBehavior ->
                BrowseSourceSimpleToolbar(
-                    navigateUp = navigateUp,
+                    navigateUp = navigator::pop,
                    title = stringResource(R.string.similar, screenModel.manga.title),
                    displayMode = screenModel.displayMode,
                    onDisplayModeChange = { screenModel.displayMode = it },
@@ -1,7 +1,7 @@
 package exh.md.similar

 import android.content.Context
-import com.bluelinelabs.conductor.Router
+import cafe.adriel.voyager.navigator.Navigator
 import eu.kanade.domain.manga.interactor.GetManga
 import eu.kanade.domain.manga.model.Manga
 import eu.kanade.domain.source.model.SourcePagingSourceType
@@ -16,9 +16,6 @@ import kotlinx.coroutines.runBlocking
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get

-/**
- * Presenter of [MangaDexSimilarController]. Inherit BrowseCataloguePresenter.
- */
 class MangaDexSimilarScreenModel(
    val mangaId: Long,
    sourceId: Long,
@@ -35,7 +32,7 @@ class MangaDexSimilarScreenModel(
        return map { it to metadata }
    }

-    override fun initFilterSheet(context: Context, router: Router) {
+    override fun initFilterSheet(context: Context, navigator: Navigator) {
        // No-op: we don't allow filtering in recs
    }
 }