Clean up repetitive controller transactions
This commit is contained in:
@@ -21,7 +21,7 @@ import eu.kanade.tachiyomi.network.PREF_DOH_CLOUDFLARE
|
||||
import eu.kanade.tachiyomi.network.PREF_DOH_GOOGLE
|
||||
import eu.kanade.tachiyomi.network.PREF_DOH_QUAD9
|
||||
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
|
||||
@@ -149,7 +149,7 @@ class SettingsAdvancedController : SettingsController() {
|
||||
summaryRes = R.string.pref_clear_database_summary
|
||||
|
||||
onClick {
|
||||
router.pushController(ClearDatabaseController().withFadeTransaction())
|
||||
router.pushController(ClearDatabaseController())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,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.util.preference.bindTo
|
||||
import eu.kanade.tachiyomi.util.preference.defaultValue
|
||||
@@ -103,7 +103,7 @@ class SettingsLibraryController : SettingsController() {
|
||||
summary = context.resources.getQuantityString(R.plurals.num_categories, catCount, catCount)
|
||||
|
||||
onClick {
|
||||
router.pushController(CategoryController().withFadeTransaction())
|
||||
router.pushController(CategoryController())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -26,68 +26,64 @@ 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()) }
|
||||
}
|
||||
preference {
|
||||
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)
|
||||
@@ -104,7 +100,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
|
||||
}
|
||||
|
||||
|
||||
@@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user