Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant helper function

Browse Source 
(cherry picked from commit 620be2617a61d4390f3969d0019545048a887744)
This commit is contained in:
arkon 2020-05-16 12:28:11 -04:00 committed by Jobobby04
parent eea5f0ba6a
commit f63323feab
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()
}
fun pushController(transaction: RouterTransaction) {
router.pushController(transaction)
}
fun setExtensionUpdateBadge() {
activity?.tabs?.apply {
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) {
R.id.action_search -> expandActionViewFromInteraction = true
R.id.action_settings -> {
(parentController as BrowseController).pushController(
parentController!!.router.pushController(
ExtensionFilterController().withFadeTransaction()
)
}
@ -167,7 +167,7 @@ open class ExtensionController :
private fun openDetails(extension: Extension.Installed) {
val controller = ExtensionDetailsController(extension.pkgName)
(parentController as BrowseController).pushController(controller.withFadeTransaction())
parentController!!.router.pushController(controller.withFadeTransaction())
}
private fun openTrustDialog(extension: Extension.Untrusted) {

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

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