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

Fix shortcuts popping up library sheet or duplicating controllers in backstack

Browse Source
This commit is contained in:
arkon 2020-04-02 19:46:44 -04:00
parent f115fe47fe
commit 92c5497eab
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View File

@ -56,6 +56,8 @@ class MainActivity : BaseActivity() {
lateinit var tabAnimator: ViewHeightAnimator lateinit var tabAnimator: ViewHeightAnimator
private lateinit var bottomNavAnimator: ViewHeightAnimator private lateinit var bottomNavAnimator: ViewHeightAnimator
private var isHandlingShortcut: Boolean = false
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@ -85,7 +87,7 @@ class MainActivity : BaseActivity() {
R.id.nav_sources -> setRoot(CatalogueController(), id) R.id.nav_sources -> setRoot(CatalogueController(), id)
R.id.nav_more -> setRoot(MoreController(), id) R.id.nav_more -> setRoot(MoreController(), id)
} }
} else { } else if (!isHandlingShortcut) {
when (id) { when (id) {
R.id.nav_library -> { R.id.nav_library -> {
val controller = router.getControllerWithTag(id.toString()) as? LibraryController val controller = router.getControllerWithTag(id.toString()) as? LibraryController
@ -192,21 +194,32 @@ class MainActivity : BaseActivity() {
NotificationReceiver.dismissNotification(applicationContext, notificationId, intent.getIntExtra("groupId", 0)) NotificationReceiver.dismissNotification(applicationContext, notificationId, intent.getIntExtra("groupId", 0))
} }
isHandlingShortcut = true
when (intent.action) { when (intent.action) {
SHORTCUT_LIBRARY -> setSelectedDrawerItem(R.id.nav_library) SHORTCUT_LIBRARY -> setSelectedDrawerItem(R.id.nav_library)
SHORTCUT_RECENTLY_UPDATED -> setSelectedDrawerItem(R.id.nav_updates) SHORTCUT_RECENTLY_UPDATED -> setSelectedDrawerItem(R.id.nav_updates)
SHORTCUT_RECENTLY_READ -> setSelectedDrawerItem(R.id.nav_history) SHORTCUT_RECENTLY_READ -> setSelectedDrawerItem(R.id.nav_history)
SHORTCUT_CATALOGUES -> setSelectedDrawerItem(R.id.nav_sources) SHORTCUT_CATALOGUES -> setSelectedDrawerItem(R.id.nav_sources)
SHORTCUT_EXTENSIONS -> { SHORTCUT_EXTENSIONS -> {
if (router.backstackSize > 1) {
router.popToRoot()
}
setSelectedDrawerItem(R.id.nav_more) setSelectedDrawerItem(R.id.nav_more)
router.pushController(ExtensionController().withFadeTransaction()) router.pushController(ExtensionController().withFadeTransaction())
} }
SHORTCUT_MANGA -> { SHORTCUT_MANGA -> {
val extras = intent.extras ?: return false val extras = intent.extras ?: return false
if (router.backstackSize > 1) {
router.popToRoot()
}
setSelectedDrawerItem(R.id.nav_library) setSelectedDrawerItem(R.id.nav_library)
router.pushController(RouterTransaction.with(MangaController(extras))) router.pushController(RouterTransaction.with(MangaController(extras)))
} }
SHORTCUT_DOWNLOADS -> { SHORTCUT_DOWNLOADS -> {
if (router.backstackSize > 1) {
router.popToRoot()
}
setSelectedDrawerItem(R.id.nav_more) setSelectedDrawerItem(R.id.nav_more)
router.pushController(RouterTransaction.with(DownloadController())) router.pushController(RouterTransaction.with(DownloadController()))
} }
@ -233,8 +246,13 @@ class MainActivity : BaseActivity() {
router.pushController(CatalogueSearchController(query, filter).withFadeTransaction()) router.pushController(CatalogueSearchController(query, filter).withFadeTransaction())
} }
} }
else -> return false else -> {
isHandlingShortcut = false
return false
}
} }
isHandlingShortcut = false
return true return true
} }