From b8b26c35316e873b9880785515a4cd42008faa5c Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 23 Apr 2022 12:10:32 -0400 Subject: [PATCH] Clean up repetitive controller transactions (cherry picked from commit 7e2f1d729f3876515342d6e7d25cf4df1005d711) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt --- .../ui/base/controller/ConductorExtensions.kt | 4 +++ .../browse/extension/ExtensionController.kt | 8 ++--- .../details/ExtensionDetailsController.kt | 6 ++-- .../ui/browse/feed/FeedController.kt | 7 ++-- .../process/MigrationListController.kt | 6 ++-- .../process/MigrationProcessHolder.kt | 5 +-- .../manga/MigrationMangaController.kt | 4 +-- .../migration/search/SearchController.kt | 4 +-- .../sources/MigrationSourcesController.kt | 6 ++-- .../ui/browse/source/SourceController.kt | 15 ++++----- .../source/browse/BrowseSourceController.kt | 8 ++--- .../globalsearch/GlobalSearchController.kt | 6 ++-- .../ui/library/ChangeMangaCategoriesDialog.kt | 4 +-- .../tachiyomi/ui/library/LibraryController.kt | 8 ++--- .../kanade/tachiyomi/ui/main/MainActivity.kt | 14 ++++---- .../tachiyomi/ui/manga/MangaController.kt | 11 ++++--- .../tachiyomi/ui/more/AboutController.kt | 4 +-- .../tachiyomi/ui/more/MoreController.kt | 18 +++++------ .../ui/recent/history/HistoryController.kt | 4 +-- .../ui/recent/updates/UpdatesController.kt | 4 +-- .../ui/setting/SettingsAdvancedController.kt | 6 ++-- .../ui/setting/SettingsBrowseController.kt | 5 +-- .../ui/setting/SettingsLibraryController.kt | 6 ++-- .../ui/setting/SettingsMainController.kt | 32 ++++++++----------- .../ui/setting/SettingsSecurityController.kt | 3 +- .../search/SettingsSearchController.kt | 4 +-- .../java/exh/recs/RecommendsController.kt | 3 +- .../adapters/EHentaiDescriptionAdapter.kt | 3 +- .../adapters/EightMusesDescriptionAdapter.kt | 3 +- .../adapters/HBrowseDescriptionAdapter.kt | 3 +- .../adapters/HitomiDescriptionAdapter.kt | 3 +- .../adapters/MangaDexDescriptionAdapter.kt | 3 +- .../adapters/NHentaiDescriptionAdapter.kt | 3 +- .../adapters/PervEdenDescriptionAdapter.kt | 3 +- .../adapters/PururinDescriptionAdapter.kt | 3 +- .../adapters/TsuminoDescriptionAdapter.kt | 3 +- 36 files changed, 119 insertions(+), 113 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt index 414ab8a85..3662f4548 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/controller/ConductorExtensions.kt @@ -23,6 +23,10 @@ fun Router.popControllerWithTag(tag: String): Boolean { return false } +fun Router.pushController(controller: Controller) { + pushController(controller.withFadeTransaction()) +} + fun Controller.requestPermissionsSafe(permissions: Array, requestCode: Int) { val activity = activity ?: return permissions.forEach { permission -> diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt index 48a15ba99..7b1aa7b3d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt @@ -17,7 +17,7 @@ import eu.kanade.tachiyomi.databinding.ExtensionControllerBinding import eu.kanade.tachiyomi.extension.model.Extension import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.ui.base.controller.NucleusController -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.browse.BrowseController import eu.kanade.tachiyomi.ui.browse.extension.details.ExtensionDetailsController import kotlinx.coroutines.flow.drop @@ -92,9 +92,7 @@ open class ExtensionController : when (item.itemId) { R.id.action_search -> expandActionViewFromInteraction = true R.id.action_settings -> { - parentController!!.router.pushController( - ExtensionFilterController().withFadeTransaction(), - ) + parentController!!.router.pushController(ExtensionFilterController()) } } return super.onOptionsItemSelected(item) @@ -172,7 +170,7 @@ open class ExtensionController : private fun openDetails(extension: Extension.Installed) { val controller = ExtensionDetailsController(extension.pkgName) - parentController!!.router.pushController(controller.withFadeTransaction()) + parentController!!.router.pushController(controller) } private fun openTrustDialog(extension: Extension.Untrusted) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt index 7d76967e1..4afa9122d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsController.kt @@ -31,7 +31,7 @@ import eu.kanade.tachiyomi.source.getPreferenceKey import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.openInBrowser -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.util.preference.DSL import eu.kanade.tachiyomi.util.preference.minusAssign import eu.kanade.tachiyomi.util.preference.onChange @@ -165,9 +165,7 @@ class ExtensionDetailsController(bundle: Bundle? = null) : switchSettingsPreference { block() onSettingsClick = View.OnClickListener { - router.pushController( - SourcePreferencesController(source.id).withFadeTransaction(), - ) + router.pushController(SourcePreferencesController(source.id)) } } } else { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedController.kt index 6a750ede4..5ba412313 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedController.kt @@ -14,6 +14,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.databinding.GlobalSearchControllerBinding import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.ui.base.controller.NucleusController +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController import eu.kanade.tachiyomi.ui.browse.source.latest.LatestUpdatesController @@ -115,7 +116,7 @@ open class FeedController : */ override fun onMangaClick(manga: Manga) { // Open MangaController. - parentController?.router?.pushController(MangaController(manga, true).withFadeTransaction()) + parentController?.router?.pushController(MangaController(manga, true)) } /** @@ -214,12 +215,12 @@ open class FeedController : */ override fun onSourceClick(source: CatalogueSource) { presenter.preferences.lastUsedSource().set(source.id) - parentController?.router?.pushController(LatestUpdatesController(source).withFadeTransaction()) + parentController?.router?.pushController(LatestUpdatesController(source)) } override fun onSavedSearchClick(savedSearch: SavedSearch, source: CatalogueSource) { presenter.preferences.lastUsedSource().set(savedSearch.source) - parentController?.router?.pushController(BrowseSourceController(source, savedSearch = savedSearch.id).withFadeTransaction()) + parentController?.router?.pushController(BrowseSourceController(source, savedSearch = savedSearch.id)) } override fun onRemoveClick(feedSavedSearch: FeedSavedSearch) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt index e8250df0b..99ef5f022 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt @@ -28,7 +28,9 @@ import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.model.toSChapter import eu.kanade.tachiyomi.source.model.toSManga import eu.kanade.tachiyomi.source.online.all.EHentai +import eu.kanade.tachiyomi.ui.base.changehandler.OneWayFadeChangeHandler import eu.kanade.tachiyomi.ui.base.controller.BaseController +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.browse.migration.MigrationMangaDialog import eu.kanade.tachiyomi.ui.browse.migration.advanced.design.PreMigrationController @@ -336,7 +338,7 @@ class MigrationListController(bundle: Bundle? = null) : } val searchController = SearchController(manga, validSources) searchController.targetController = this@MigrationListController - router.pushController(searchController.withFadeTransaction()) + router.pushController(searchController) } } R.id.action_skip -> adapter?.removeManga(position) @@ -420,7 +422,7 @@ class MigrationListController(bundle: Bundle? = null) : it.controller !is MigrationListController && it.controller !is PreMigrationController } + MangaController(manga).withFadeTransaction() - router.setBackstack(newStack, FadeChangeHandler()) + router.setBackstack(newStack, OneWayFadeChangeHandler()) return@launchUI } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt index f680c0f1d..16c12a51b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationProcessHolder.kt @@ -13,6 +13,7 @@ import eu.kanade.tachiyomi.databinding.MigrationMangaCardBinding import eu.kanade.tachiyomi.databinding.MigrationProcessItemBinding import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.source.SourceManager +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.util.lang.launchUI @@ -69,7 +70,7 @@ class MigrationProcessHolder( MangaController( manga, true, - ).withFadeTransaction(), + ), ) } .launchIn(adapter.controller.viewScope) @@ -105,7 +106,7 @@ class MigrationProcessHolder( MangaController( searchResult, true, - ).withFadeTransaction(), + ), ) } .launchIn(adapter.controller.viewScope) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt index 7cd5777cd..fcf2c9c0b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/manga/MigrationMangaController.kt @@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.databinding.MigrationMangaControllerBinding import eu.kanade.tachiyomi.ui.base.controller.NucleusController -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.browse.migration.advanced.design.PreMigrationController import eu.kanade.tachiyomi.ui.manga.MangaController import uy.kohesive.injekt.Injekt @@ -91,7 +91,7 @@ class MigrationMangaController : override fun onCoverClick(position: Int) { val mangaItem = adapter?.getItem(position) as? MigrationMangaItem ?: return - router.pushController(MangaController(mangaItem.manga).withFadeTransaction()) + router.pushController(MangaController(mangaItem.manga)) } // SY --> diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt index 94bd21a1b..ef046eef5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt @@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.source.SourceManager -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigrationListController import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchPresenter @@ -108,7 +108,7 @@ class SearchController( override fun onTitleClick(source: CatalogueSource) { presenter.preferences.lastUsedSource().set(source.id) - router.pushController(SourceSearchController(targetController as? MigrationListController ?: return, manga!!, source, presenter.query).withFadeTransaction()) + router.pushController(SourceSearchController(targetController as? MigrationListController ?: return, manga!!, source, presenter.query)) } companion object { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt index b40169c82..adf44a3e6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesController.kt @@ -13,7 +13,7 @@ import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.databinding.MigrationSourcesControllerBinding import eu.kanade.tachiyomi.ui.base.controller.NucleusController -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.browse.BrowseController import eu.kanade.tachiyomi.ui.browse.migration.advanced.design.PreMigrationController import eu.kanade.tachiyomi.ui.browse.migration.manga.MigrationMangaController @@ -119,9 +119,9 @@ class MigrationSourcesController : val controller = MigrationMangaController(item.source.id, item.source.name) val parentController = parentController if (parentController is BrowseController) { - parentController.router.pushController(controller.withFadeTransaction()) + parentController.router.pushController(controller) } else { - router.pushController(controller.withFadeTransaction()) + router.pushController(controller) } return false diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt index bc439b110..ac20b4927 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt @@ -25,8 +25,8 @@ import eu.kanade.tachiyomi.source.LocalSource import eu.kanade.tachiyomi.source.Source import eu.kanade.tachiyomi.ui.base.controller.DialogController import eu.kanade.tachiyomi.ui.base.controller.SearchableNucleusController +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.requestPermissionsSafe -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.browse.BrowseController import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController import eu.kanade.tachiyomi.ui.browse.source.feed.SourceFeedController @@ -156,7 +156,7 @@ class SourceController(bundle: Bundle? = null) : SmartSearchController.ARG_SOURCE_ID to source.id, SmartSearchController.ARG_SMART_SEARCH_CONFIG to smartSearchConfig, ), - ).withFadeTransaction(), + ), ) } // SY <-- @@ -303,7 +303,7 @@ class SourceController(bundle: Bundle? = null) : if (!preferences.incognitoMode().get()) { preferences.lastUsedSource().set(source.id) } - parentController!!.router.pushController(controller.withFadeTransaction()) + parentController!!.router.pushController(controller) } // SY --> @@ -312,7 +312,7 @@ class SourceController(bundle: Bundle? = null) : */ private fun openSourceFeed(source: CatalogueSource) { preferences.lastUsedSource().set(source.id) - parentController!!.router.pushController(SourceFeedController(source).withFadeTransaction()) + parentController!!.router.pushController(SourceFeedController(source)) } // SY <-- @@ -326,10 +326,7 @@ class SourceController(bundle: Bundle? = null) : when (item.itemId) { // Initialize option to open catalogue settings. R.id.action_settings -> { - parentController!!.router.pushController( - SourceFilterController() - .withFadeTransaction(), - ) + parentController!!.router.pushController(SourceFilterController()) } } return super.onOptionsItemSelected(item) @@ -391,7 +388,7 @@ class SourceController(bundle: Bundle? = null) : // SY --> if (mode == Mode.CATALOGUE) { parentController!!.router.pushController( - GlobalSearchController(query).withFadeTransaction(), + GlobalSearchController(query), ) } // SY <-- diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt index aff2553df..5729c61eb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt @@ -34,7 +34,7 @@ import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.LoginSource import eu.kanade.tachiyomi.ui.base.controller.FabController import eu.kanade.tachiyomi.ui.base.controller.SearchableNucleusController -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.browse.extension.details.SourcePreferencesController import eu.kanade.tachiyomi.ui.browse.source.SourceController import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController @@ -460,9 +460,7 @@ open class BrowseSourceController(bundle: Bundle) : // SY --> private fun openSourceSettings() { - router.pushController( - SourcePreferencesController(presenter.source.id).withFadeTransaction(), - ) + router.pushController(SourcePreferencesController(presenter.source.id)) } // SY <-- @@ -731,7 +729,7 @@ open class BrowseSourceController(bundle: Bundle) : item.manga, true, args.getParcelable(MangaController.SMART_SEARCH_CONFIG_EXTRA), - ).withFadeTransaction(), + ), ) return false } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt index 2d8c46dc2..e2558fbb6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt @@ -16,7 +16,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.databinding.GlobalSearchControllerBinding import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.ui.base.controller.SearchableNucleusController -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController import eu.kanade.tachiyomi.ui.manga.MangaController import uy.kohesive.injekt.injectLazy @@ -71,7 +71,7 @@ open class GlobalSearchController( * @param manga clicked item containing manga information. */ override fun onMangaClick(manga: Manga) { - router.pushController(MangaController(manga, true).withFadeTransaction()) + router.pushController(MangaController(manga, true)) } /** @@ -213,6 +213,6 @@ open class GlobalSearchController( if (!preferences.incognitoMode().get()) { preferences.lastUsedSource().set(source.id) } - router.pushController(BrowseSourceController(source, presenter.query).withFadeTransaction()) + router.pushController(BrowseSourceController(source, presenter.query)) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/ChangeMangaCategoriesDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/ChangeMangaCategoriesDialog.kt index 224a7555b..1aaa06a27 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/ChangeMangaCategoriesDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/ChangeMangaCategoriesDialog.kt @@ -8,7 +8,7 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Category import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.ui.base.controller.DialogController -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.category.CategoryController import eu.kanade.tachiyomi.widget.materialdialogs.QuadStateTextView import eu.kanade.tachiyomi.widget.materialdialogs.setQuadStateMultiChoiceItems @@ -71,7 +71,7 @@ class ChangeMangaCategoriesDialog(bundle: Bundle? = null) : libController.clearSelection() } router.popCurrentController() - router.pushController(CategoryController().withFadeTransaction()) + router.pushController(CategoryController()) } interface Listener { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt index b46c831fb..470ec09af 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt @@ -31,7 +31,7 @@ import eu.kanade.tachiyomi.source.LocalSource import eu.kanade.tachiyomi.ui.base.controller.RootController import eu.kanade.tachiyomi.ui.base.controller.SearchableNucleusController import eu.kanade.tachiyomi.ui.base.controller.TabbedController -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.browse.migration.advanced.design.PreMigrationController import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController import eu.kanade.tachiyomi.ui.main.MainActivity @@ -251,9 +251,7 @@ class LibraryController( binding.btnGlobalSearch.clicks() .onEach { - router.pushController( - GlobalSearchController(presenter.query).withFadeTransaction(), - ) + router.pushController(GlobalSearchController(presenter.query)) } .launchIn(viewScope) } @@ -586,7 +584,7 @@ class LibraryController( // Notify the presenter a manga is being opened. presenter.onOpenManga() - router.pushController(MangaController(manga).withFadeTransaction()) + router.pushController(MangaController(manga)) } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 80208ace2..e39fd6d05 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -47,8 +47,8 @@ import eu.kanade.tachiyomi.ui.base.controller.FabController import eu.kanade.tachiyomi.ui.base.controller.NoAppBarElevationController import eu.kanade.tachiyomi.ui.base.controller.RootController import eu.kanade.tachiyomi.ui.base.controller.TabbedController +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.setRoot -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.browse.BrowseController import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchController @@ -209,12 +209,12 @@ class MainActivity : BaseActivity() { } R.id.nav_updates -> { if (router.backstackSize == 1) { - router.pushController(DownloadController().withFadeTransaction()) + router.pushController(DownloadController()) } } R.id.nav_more -> { if (router.backstackSize == 1) { - router.pushController(SettingsMainController().withFadeTransaction()) + router.pushController(SettingsMainController()) } } } @@ -462,7 +462,7 @@ class MainActivity : BaseActivity() { router.popToRoot() } setSelectedNavItem(R.id.nav_browse) - router.pushController(BrowseController(toExtensions = true).withFadeTransaction()) + router.pushController(BrowseController(toExtensions = true)) } SHORTCUT_MANGA -> { val extras = intent.extras ?: return false @@ -478,7 +478,7 @@ class MainActivity : BaseActivity() { router.popToRoot() } setSelectedNavItem(R.id.nav_more) - router.pushController(DownloadController().withFadeTransaction()) + router.pushController(DownloadController()) } Intent.ACTION_SEARCH, Intent.ACTION_SEND, "com.google.android.gms.actions.SEARCH_ACTION" -> { // If the intent match the "standard" Android search intent @@ -490,7 +490,7 @@ class MainActivity : BaseActivity() { if (router.backstackSize > 1) { router.popToRoot() } - router.pushController(GlobalSearchController(query).withFadeTransaction()) + router.pushController(GlobalSearchController(query)) } } INTENT_SEARCH -> { @@ -500,7 +500,7 @@ class MainActivity : BaseActivity() { if (router.backstackSize > 1) { router.popToRoot() } - router.pushController(GlobalSearchController(query, filter).withFadeTransaction()) + router.pushController(GlobalSearchController(query, filter)) } } else -> { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt index f88bdce56..390c85b34 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt @@ -62,6 +62,7 @@ import eu.kanade.tachiyomi.ui.base.controller.FabController import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.getMainAppBarHeight import eu.kanade.tachiyomi.ui.base.controller.popControllerWithTag +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.browse.migration.advanced.design.PreMigrationController import eu.kanade.tachiyomi.ui.browse.source.SourceController @@ -684,7 +685,7 @@ class MangaController : } setNegativeButton(activity?.getString(R.string.action_cancel)) { _, _ -> } setNeutralButton(activity?.getString(R.string.action_show_manga)) { _, _ -> - router.pushController(MangaController(libraryManga).withFadeTransaction()) + router.pushController(MangaController(libraryManga)) } setCancelable(true) }.create().show() @@ -813,13 +814,13 @@ class MangaController : ) { dialog, index -> dialog.dismiss() when (index) { - 0 -> router.pushController(MangaDexSimilarController(presenter.manga, source as CatalogueSource).withFadeTransaction()) - 1 -> router.pushController(RecommendsController(presenter.manga, source as CatalogueSource).withFadeTransaction()) + 0 -> router.pushController(MangaDexSimilarController(presenter.manga, source as CatalogueSource)) + 1 -> router.pushController(RecommendsController(presenter.manga, source as CatalogueSource)) } } .show() } else if (source is CatalogueSource) { - router.pushController(RecommendsController(presenter.manga, source).withFadeTransaction()) + router.pushController(RecommendsController(presenter.manga, source)) } } // AZ <-- @@ -889,7 +890,7 @@ class MangaController : * @param query the search query to pass to the search controller */ fun performGlobalSearch(query: String) { - router.pushController(GlobalSearchController(query).withFadeTransaction()) + router.pushController(GlobalSearchController(query)) } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt index e61023ece..d27f6f01a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt @@ -10,7 +10,7 @@ import eu.kanade.tachiyomi.data.updater.AppUpdateChecker import eu.kanade.tachiyomi.data.updater.AppUpdateResult import eu.kanade.tachiyomi.ui.base.controller.BasicComposeController import eu.kanade.tachiyomi.ui.base.controller.NoAppBarElevationController -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.main.WhatsNewDialogController import eu.kanade.tachiyomi.util.lang.launchNow import eu.kanade.tachiyomi.util.lang.toDateTimestampString @@ -37,7 +37,7 @@ class AboutController : BasicComposeController(), NoAppBarElevationController { checkVersion = this::checkVersion, getFormattedBuildTime = this::getFormattedBuildTime, onClickLicenses = { - router.pushController(LicensesController().withFadeTransaction()) + router.pushController(LicensesController()) }, onClickWhatsNew = { WhatsNewDialogController().showDialog(router) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt index 21ca2a93e..ccc11359a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreController.kt @@ -11,7 +11,7 @@ import eu.kanade.tachiyomi.data.download.DownloadManager import eu.kanade.tachiyomi.data.download.DownloadService import eu.kanade.tachiyomi.ui.base.controller.NoAppBarElevationController import eu.kanade.tachiyomi.ui.base.controller.RootController -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.category.CategoryController import eu.kanade.tachiyomi.ui.download.DownloadController import eu.kanade.tachiyomi.ui.recent.history.HistoryController @@ -86,7 +86,7 @@ class MoreController : iconRes = R.drawable.ic_updates_outline_24dp iconTint = tintColor onClick { - router.pushController(UpdatesController().withFadeTransaction()) + router.pushController(UpdatesController()) } } } @@ -96,7 +96,7 @@ class MoreController : iconRes = R.drawable.ic_history_24dp iconTint = tintColor onClick { - router.pushController(HistoryController().withFadeTransaction()) + router.pushController(HistoryController()) } } } @@ -110,7 +110,7 @@ class MoreController : iconRes = R.drawable.ic_get_app_24dp iconTint = tintColor onClick { - router.pushController(DownloadController().withFadeTransaction()) + router.pushController(DownloadController()) } } preference { @@ -118,7 +118,7 @@ class MoreController : iconRes = R.drawable.ic_label_24dp iconTint = tintColor onClick { - router.pushController(CategoryController().withFadeTransaction()) + router.pushController(CategoryController()) } } preference { @@ -126,7 +126,7 @@ class MoreController : iconRes = R.drawable.ic_settings_backup_restore_24dp iconTint = tintColor onClick { - router.pushController(SettingsBackupController().withFadeTransaction()) + router.pushController(SettingsBackupController()) } } // SY --> @@ -136,7 +136,7 @@ class MoreController : iconRes = R.drawable.ic_playlist_add_black_24dp iconTint = tintColor onClick { - router.pushController(BatchAddController().withFadeTransaction()) + router.pushController(BatchAddController()) } } } @@ -149,7 +149,7 @@ class MoreController : iconRes = R.drawable.ic_settings_24dp iconTint = tintColor onClick { - router.pushController(SettingsMainController().withFadeTransaction()) + router.pushController(SettingsMainController()) } } preference { @@ -157,7 +157,7 @@ class MoreController : iconTint = tintColor titleRes = R.string.pref_category_about onClick { - router.pushController(AboutController().withFadeTransaction()) + router.pushController(AboutController()) } } preference { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt index bf6cdd61e..c60964d2e 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/history/HistoryController.kt @@ -11,7 +11,7 @@ import eu.kanade.presentation.history.HistoryScreen import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.base.controller.ComposeController import eu.kanade.tachiyomi.ui.base.controller.RootController -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.util.system.toast @@ -34,7 +34,7 @@ class HistoryController : ComposeController(), RootController nestedScrollInterop = nestedScrollInterop, presenter = presenter, onClickCover = { history -> - router.pushController(MangaController(history).withFadeTransaction()) + router.pushController(MangaController(history)) }, onClickResume = { history -> presenter.getNextChapterForManga(history.mangaId, history.chapterId) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt index c2aedebe6..a024023fe 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt @@ -20,7 +20,7 @@ import eu.kanade.tachiyomi.data.notification.Notifications import eu.kanade.tachiyomi.databinding.UpdatesControllerBinding import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.RootController -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.ui.manga.chapter.base.BaseChaptersAdapter @@ -282,7 +282,7 @@ class UpdatesController : } private fun openManga(chapter: UpdatesItem) { - router.pushController(MangaController(chapter.manga).withFadeTransaction()) + router.pushController(MangaController(chapter.manga)) } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt index 1a6fcca03..578a8c8fb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsAdvancedController.kt @@ -30,7 +30,7 @@ import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager.Companion.DELEGATED_SOURCES import eu.kanade.tachiyomi.ui.base.controller.DialogController import eu.kanade.tachiyomi.ui.base.controller.openInBrowser -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.setting.database.ClearDatabaseController import eu.kanade.tachiyomi.util.CrashLogUtil import eu.kanade.tachiyomi.util.lang.launchIO @@ -158,7 +158,7 @@ class SettingsAdvancedController : SettingsController() { summaryRes = R.string.pref_clear_database_summary onClick { - router.pushController(ClearDatabaseController().withFadeTransaction()) + router.pushController(ClearDatabaseController()) } } } @@ -413,7 +413,7 @@ class SettingsAdvancedController : SettingsController() { key = "pref_open_debug_menu" titleRes = R.string.open_debug_menu summary = HtmlCompat.fromHtml(context.getString(R.string.open_debug_menu_summary), HtmlCompat.FROM_HTML_MODE_LEGACY) - onClick { router.pushController(SettingsDebugController().withFadeTransaction()) } + onClick { router.pushController(SettingsDebugController()) } } } // <-- EXH diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt index 09ed5cd82..85f15dd0a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsBrowseController.kt @@ -4,6 +4,7 @@ import androidx.fragment.app.FragmentActivity import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.extension.ExtensionUpdateJob +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.category.repos.RepoController import eu.kanade.tachiyomi.ui.category.sources.SourceCategoryController @@ -38,7 +39,7 @@ class SettingsBrowseController : SettingsController() { summary = context.resources.getQuantityString(R.plurals.num_categories, catCount, catCount) onClick { - router.pushController(SourceCategoryController().withFadeTransaction()) + router.pushController(SourceCategoryController()) } } switchPreference { @@ -91,7 +92,7 @@ class SettingsBrowseController : SettingsController() { summary = context.resources.getQuantityString(R.plurals.num_repos, catCount, catCount) onClick { - router.pushController(RepoController().withFadeTransaction()) + router.pushController(RepoController()) } } // SY <-- diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt index 5fe796b03..d88c686e3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt @@ -21,7 +21,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.data.track.TrackManager import eu.kanade.tachiyomi.databinding.PrefLibraryColumnsBinding import eu.kanade.tachiyomi.ui.base.controller.DialogController -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.category.CategoryController import eu.kanade.tachiyomi.ui.category.genre.SortTagController import eu.kanade.tachiyomi.ui.library.LibrarySettingsSheet @@ -129,7 +129,7 @@ class SettingsLibraryController : SettingsController() { summary = context.resources.getQuantityString(R.plurals.num_categories, catCount, catCount) onClick { - router.pushController(CategoryController().withFadeTransaction()) + router.pushController(CategoryController()) } } @@ -336,7 +336,7 @@ class SettingsLibraryController : SettingsController() { val count = preferences.sortTagsForLibrary().get().size summary = context.resources.getQuantityString(R.plurals.pref_tag_sorting_desc, count, count) onClick { - router.pushController(SortTagController().withFadeTransaction()) + router.pushController(SortTagController()) } } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt index a7663a82e..65b528a24 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt @@ -6,7 +6,7 @@ import android.view.MenuItem import androidx.appcompat.widget.SearchView import androidx.preference.PreferenceScreen import eu.kanade.tachiyomi.R -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.setting.search.SettingsSearchController import eu.kanade.tachiyomi.util.preference.iconRes import eu.kanade.tachiyomi.util.preference.iconTint @@ -27,55 +27,55 @@ class SettingsMainController : SettingsController() { iconRes = R.drawable.ic_tune_24dp iconTint = tintColor titleRes = R.string.pref_category_general - onClick { navigateTo(SettingsGeneralController()) } + onClick { router.pushController(SettingsGeneralController()) } } preference { iconRes = R.drawable.ic_palette_24dp iconTint = tintColor titleRes = R.string.pref_category_appearance - onClick { navigateTo(SettingsAppearanceController()) } + onClick { router.pushController(SettingsAppearanceController()) } } preference { iconRes = R.drawable.ic_library_outline_24dp iconTint = tintColor titleRes = R.string.pref_category_library - onClick { navigateTo(SettingsLibraryController()) } + onClick { router.pushController(SettingsLibraryController()) } } preference { iconRes = R.drawable.ic_chrome_reader_mode_24dp iconTint = tintColor titleRes = R.string.pref_category_reader - onClick { navigateTo(SettingsReaderController()) } + onClick { router.pushController(SettingsReaderController()) } } preference { iconRes = R.drawable.ic_get_app_24dp iconTint = tintColor titleRes = R.string.pref_category_downloads - onClick { navigateTo(SettingsDownloadController()) } + onClick { router.pushController(SettingsDownloadController()) } } preference { iconRes = R.drawable.ic_sync_24dp iconTint = tintColor titleRes = R.string.pref_category_tracking - onClick { navigateTo(SettingsTrackingController()) } + onClick { router.pushController(SettingsTrackingController()) } } preference { iconRes = R.drawable.ic_browse_outline_24dp iconTint = tintColor titleRes = R.string.browse - onClick { navigateTo(SettingsBrowseController()) } + onClick { router.pushController(SettingsBrowseController()) } } preference { iconRes = R.drawable.ic_settings_backup_restore_24dp iconTint = tintColor titleRes = R.string.label_backup - onClick { navigateTo(SettingsBackupController()) } + onClick { router.pushController(SettingsBackupController()) } } preference { iconRes = R.drawable.ic_security_24dp iconTint = tintColor titleRes = R.string.pref_category_security - onClick { navigateTo(SettingsSecurityController()) } + onClick { router.pushController(SettingsSecurityController()) } } // SY --> if (preferences.isHentaiEnabled().get()) { @@ -83,7 +83,7 @@ class SettingsMainController : SettingsController() { iconRes = R.drawable.eh_ic_ehlogo_red_24dp iconTint = tintColor titleRes = R.string.pref_category_eh - onClick { navigateTo(SettingsEhController()) } + onClick { router.pushController(SettingsEhController()) } } } if (MdUtil.getEnabledMangaDexs(preferences).isNotEmpty()) { @@ -91,7 +91,7 @@ class SettingsMainController : SettingsController() { iconRes = R.drawable.ic_tracker_mangadex_logo_24dp iconTint = tintColor titleRes = R.string.pref_category_mangadex - onClick { navigateTo(SettingsMangaDexController()) } + onClick { router.pushController(SettingsMangaDexController()) } } } // SY <-- @@ -99,14 +99,10 @@ class SettingsMainController : SettingsController() { iconRes = R.drawable.ic_code_24dp iconTint = tintColor titleRes = R.string.pref_category_advanced - onClick { navigateTo(SettingsAdvancedController()) } + onClick { router.pushController(SettingsAdvancedController()) } } } - private fun navigateTo(controller: SettingsController) { - router.pushController(controller.withFadeTransaction()) - } - override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { // Inflate menu inflater.inflate(R.menu.settings_main, menu) @@ -123,7 +119,7 @@ class SettingsMainController : SettingsController() { object : MenuItem.OnActionExpandListener { override fun onMenuItemActionExpand(item: MenuItem?): Boolean { preferences.lastSearchQuerySearchSettings().set("") // reset saved search query - router.pushController(SettingsSearchController().withFadeTransaction()) + router.pushController(SettingsSearchController()) return true } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt index a988527d5..64ecaaca1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsSecurityController.kt @@ -11,6 +11,7 @@ import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.preference.PreferenceValues import eu.kanade.tachiyomi.data.preference.PreferencesHelper import eu.kanade.tachiyomi.ui.base.controller.DialogController +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.base.delegate.SecureActivityDelegate import eu.kanade.tachiyomi.ui.category.biometric.BiometricTimesController @@ -120,7 +121,7 @@ class SettingsSecurityController : SettingsController() { visibleIf(preferences.useAuthenticator()) { it } onClick { - router.pushController(BiometricTimesController().withFadeTransaction()) + router.pushController(BiometricTimesController()) } } preference { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchController.kt index 462042abc..94826ef5a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchController.kt @@ -12,7 +12,7 @@ import dev.chrisbanes.insetter.applyInsetter import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.SettingsSearchControllerBinding import eu.kanade.tachiyomi.ui.base.controller.NucleusController -import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.setting.SettingsController /** @@ -158,6 +158,6 @@ class SettingsSearchController : presenter.preferences.lastSearchQuerySearchSettings().set(it.toString()) } - router.pushController(ctrl.withFadeTransaction()) + router.pushController(ctrl) } } diff --git a/app/src/main/java/exh/recs/RecommendsController.kt b/app/src/main/java/exh/recs/RecommendsController.kt index 71f89cc0e..74bd8e00b 100644 --- a/app/src/main/java/exh/recs/RecommendsController.kt +++ b/app/src/main/java/exh/recs/RecommendsController.kt @@ -7,6 +7,7 @@ import androidx.core.os.bundleOf import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.source.CatalogueSource +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.browse.source.SourceController import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceController @@ -56,7 +57,7 @@ class RecommendsController(bundle: Bundle) : BrowseSourceController(bundle) { bundleOf( SourceController.SMART_SEARCH_CONFIG to smartSearchConfig, ), - ).withFadeTransaction(), + ), ) } diff --git a/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt index 6843015b7..030ffae82 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt @@ -7,6 +7,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.DescriptionAdapterEhBinding +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.util.system.copyToClipboard @@ -101,7 +102,7 @@ class EHentaiDescriptionAdapter( controller.router?.pushController( MetadataViewController( controller.manga, - ).withFadeTransaction(), + ), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/EightMusesDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/EightMusesDescriptionAdapter.kt index 9975fbdb3..0f2f7c5ce 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/EightMusesDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/EightMusesDescriptionAdapter.kt @@ -6,6 +6,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.DescriptionAdapter8mBinding +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.util.system.copyToClipboard @@ -52,7 +53,7 @@ class EightMusesDescriptionAdapter( controller.router?.pushController( MetadataViewController( controller.manga, - ).withFadeTransaction(), + ), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt index 08a7cd017..dc841ef8e 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt @@ -6,6 +6,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.DescriptionAdapterHbBinding +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.util.system.copyToClipboard @@ -53,7 +54,7 @@ class HBrowseDescriptionAdapter( controller.router?.pushController( MetadataViewController( controller.manga, - ).withFadeTransaction(), + ), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/HitomiDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/HitomiDescriptionAdapter.kt index d27879cd7..b53e66587 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/HitomiDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/HitomiDescriptionAdapter.kt @@ -6,6 +6,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.DescriptionAdapterHiBinding +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.util.system.copyToClipboard @@ -66,7 +67,7 @@ class HitomiDescriptionAdapter( controller.router?.pushController( MetadataViewController( controller.manga, - ).withFadeTransaction(), + ), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt index 949b705f1..dfaebd34e 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt @@ -8,6 +8,7 @@ import androidx.core.view.isVisible import androidx.recyclerview.widget.RecyclerView import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.DescriptionAdapterMdBinding +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.util.system.copyToClipboard @@ -63,7 +64,7 @@ class MangaDexDescriptionAdapter( controller.router?.pushController( MetadataViewController( controller.manga, - ).withFadeTransaction(), + ), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt index 3d3d6fbf0..d5b59ad70 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt @@ -7,6 +7,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.DescriptionAdapterNhBinding +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.util.system.copyToClipboard @@ -85,7 +86,7 @@ class NHentaiDescriptionAdapter( controller.router?.pushController( MetadataViewController( controller.manga, - ).withFadeTransaction(), + ), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/PervEdenDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/PervEdenDescriptionAdapter.kt index 5aa6807d1..1ce2410be 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/PervEdenDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/PervEdenDescriptionAdapter.kt @@ -7,6 +7,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.DescriptionAdapterPeBinding +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.util.system.copyToClipboard @@ -75,7 +76,7 @@ class PervEdenDescriptionAdapter( controller.router?.pushController( MetadataViewController( controller.manga, - ).withFadeTransaction(), + ), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt index 43cad0e53..827b0df42 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt @@ -7,6 +7,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.DescriptionAdapterPuBinding +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.util.system.copyToClipboard @@ -81,7 +82,7 @@ class PururinDescriptionAdapter( controller.router?.pushController( MetadataViewController( controller.manga, - ).withFadeTransaction(), + ), ) } } diff --git a/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt b/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt index 417c2acb0..f6e3111ef 100644 --- a/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt @@ -7,6 +7,7 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.databinding.DescriptionAdapterTsBinding +import eu.kanade.tachiyomi.ui.base.controller.pushController import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.manga.MangaController import eu.kanade.tachiyomi.util.system.copyToClipboard @@ -82,7 +83,7 @@ class TsuminoDescriptionAdapter( controller.router?.pushController( MetadataViewController( controller.manga, - ).withFadeTransaction(), + ), ) } }