yutou/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove redundant helper function

Browse Source
This commit is contained in:
arkon 2020-05-16 12:28:11 -04:00
parent 035038a0b6
commit 620be2617a
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt
View File

@ -95,10 +95,6 @@ class BrowseController :
tabs.getTabAt(EXTENSIONS_CONTROLLER)?.removeBadge() tabs.getTabAt(EXTENSIONS_CONTROLLER)?.removeBadge()
} }
fun pushController(transaction: RouterTransaction) {
router.pushController(transaction)
}
fun setExtensionUpdateBadge() { fun setExtensionUpdateBadge() {
activity?.tabs?.apply { activity?.tabs?.apply {
val updates = preferences.extensionUpdatesCount().get() val updates = preferences.extensionUpdatesCount().get()

4
app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/ExtensionController.kt
View File

@ -87,7 +87,7 @@ open class ExtensionController :
when (item.itemId) { when (item.itemId) {
R.id.action_search -> expandActionViewFromInteraction = true R.id.action_search -> expandActionViewFromInteraction = true
R.id.action_settings -> { R.id.action_settings -> {
(parentController as BrowseController).pushController( parentController!!.router.pushController(
ExtensionFilterController().withFadeTransaction() ExtensionFilterController().withFadeTransaction()
) )
} }
@ -167,7 +167,7 @@ open class ExtensionController :
private fun openDetails(extension: Extension.Installed) { private fun openDetails(extension: Extension.Installed) {
val controller = ExtensionDetailsController(extension.pkgName) val controller = ExtensionDetailsController(extension.pkgName)
(parentController as BrowseController).pushController(controller.withFadeTransaction()) parentController!!.router.pushController(controller.withFadeTransaction())
} }
private fun openTrustDialog(extension: Extension.Untrusted) { private fun openTrustDialog(extension: Extension.Untrusted) {

6
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
View File

@ -185,7 +185,7 @@ class SourceController :
*/ */
private fun openCatalogue(source: CatalogueSource, controller: BrowseSourceController) { private fun openCatalogue(source: CatalogueSource, controller: BrowseSourceController) {
preferences.lastUsedCatalogueSource().set(source.id) preferences.lastUsedCatalogueSource().set(source.id)
(parentController as BrowseController).pushController(controller.withFadeTransaction()) parentController!!.router.pushController(controller.withFadeTransaction())
} }
/** /**
@ -214,7 +214,7 @@ class SourceController :
} }
private fun performGlobalSearch(query: String) { private fun performGlobalSearch(query: String) {
(parentController as BrowseController).pushController( parentController!!.router.pushController(
GlobalSearchController(query).withFadeTransaction() GlobalSearchController(query).withFadeTransaction()
) )
} }
@ -229,7 +229,7 @@ class SourceController :
when (item.itemId) { when (item.itemId) {
// Initialize option to open catalogue settings. // Initialize option to open catalogue settings.
R.id.action_settings -> { R.id.action_settings -> {
(parentController as BrowseController).pushController( parentController!!.router.pushController(
SettingsSourcesController().withFadeTransaction() SettingsSourcesController().withFadeTransaction()
) )
} }