diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationMangaDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationMangaDialog.kt index 53c07701f..9ade55106 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationMangaDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/MigrationMangaDialog.kt @@ -27,10 +27,7 @@ class MigrationMangaDialog(bundle: Bundle? = null) : DialogController(bundle) confirmRes, mangaSet, mangaSet, - ( - if (mangaSkipped > 0) " " + applicationContext?.getString(R.string.skipping_, mangaSkipped) - else "" - ), + (if (mangaSkipped > 0) " " + applicationContext?.getString(R.string.skipping_, mangaSkipped) else ""), ).orEmpty() return MaterialAlertDialogBuilder(activity!!) .setMessage(confirmString) 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 4532fc033..a9c2a2889 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 @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.ui.browse.migration.advanced.process -import android.content.pm.ActivityInfo import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater @@ -97,12 +96,6 @@ class MigrationListController(bundle: Bundle? = null) : } } - override fun onDestroy() { - super.onDestroy() - - activity?.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED - } - private fun enableButtons() { activity?.invalidateOptionsMenu() } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesController.kt index 941988276..aba56dad6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourcesController.kt @@ -6,7 +6,6 @@ import android.os.Parcelable import android.view.View import androidx.compose.runtime.Composable import eu.kanade.presentation.browse.BrowseTabWrapper -import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.base.controller.FullComposeController import eu.kanade.tachiyomi.ui.base.controller.requestPermissionsSafe import eu.kanade.tachiyomi.util.system.getParcelableCompat @@ -16,15 +15,6 @@ class SourcesController(bundle: Bundle? = null) : FullComposeController(SMART_SEARCH_CONFIG) private val mode = if (smartSearchConfig == null) Mode.CATALOGUE else Mode.SMART_SEARCH - override fun getTitle(): String? { - // SY --> - return when (mode) { - Mode.CATALOGUE -> applicationContext?.getString(R.string.label_sources) - Mode.SMART_SEARCH -> applicationContext?.getString(R.string.find_in_another_source) - } - // SY <-- - } - override fun createPresenter() = SourcesPresenterWrapper(controllerMode = mode, smartSearchConfig = smartSearchConfig) @Composable 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 fd9599a33..eebc6ed14 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 @@ -113,11 +113,16 @@ class LibraryController( // SY --> onClickCleanTitles = ::cleanTitles, onClickMigrate = { - val skipPre = Injekt.get().skipPreMigration().get() - val selectedMangaIds = presenter.selection.filterNot { it.source == MERGED_SOURCE_ID }.mapNotNull { it.id } + val selectedMangaIds = presenter.selection + .filterNot { it.source == MERGED_SOURCE_ID } + .mapNotNull { it.id } presenter.clearSelection() if (selectedMangaIds.isNotEmpty()) { - PreMigrationController.navigateToMigration(skipPre, router, selectedMangaIds) + PreMigrationController.navigateToMigration( + Injekt.get().skipPreMigration().get(), + router, + selectedMangaIds, + ) } else { activity?.toast(R.string.no_valid_manga) } diff --git a/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt b/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt index d87cf7862..85b60ad73 100644 --- a/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt +++ b/app/src/main/java/exh/ui/smartsearch/SmartSearchController.kt @@ -45,8 +45,6 @@ class SmartSearchController(bundle: Bundle) : FullComposeController