mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-26 23:18:17 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix shortcuts with new bottom nav setting

Browse source
This commit is contained in:
jmir1 2022-05-09 23:25:58 +02:00
parent 09a446a48c
commit 8d9def65ce
2 changed files with 45 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/shortcuts.xml
View file

@ -33,6 +33,17 @@
android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_UPDATED"
android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
</shortcut>
<shortcut
android:enabled="true"
android:icon="@drawable/sc_history_48dp"
android:shortcutDisabledMessage="@string/app_not_available"
android:shortcutId="show_recently_updated"
android:shortcutLongLabel="@string/label_recent_manga"
android:shortcutShortLabel="@string/label_recent_manga">
<intent
android:action="eu.kanade.tachiyomi.SHOW_RECENTLY_READ"
android:targetClass="eu.kanade.tachiyomi.ui.main.MainActivity" />
</shortcut>
<shortcut
android:enabled="true"
android:icon="@drawable/sc_explore_48dp"

48
app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
View file

@ -92,15 +92,15 @@ class MainActivity : BaseActivity() {
private lateinit var router: Router
private val startScreenId by lazy {
when (preferences.bottomNavStyle()) {
1 -> getStartScreen(startScreenArrayHistory)
2 -> getStartScreen(startScreenArrayNoManga)
else -> getStartScreen(startScreenArrayDefault)
}
getNavId(preferences.startScreen())
}
private fun getStartScreen(array: IntArray): Int {
return array.getOrNull(preferences.startScreen()) ?: R.id.nav_animelib
private fun getNavId(index: Int): Int {
return when (preferences.bottomNavStyle()) {
1 -> startScreenArrayHistory.getOrNull(index)
2 -> startScreenArrayNoManga.getOrNull(index)
else -> startScreenArrayDefault.getOrNull(index)
} ?: R.id.nav_animelib
}
private var isConfirmingExit: Boolean = false
@ -200,11 +200,6 @@ class MainActivity : BaseActivity() {
router.pushController(DownloadTabsController())
}
}
R.id.nav_history -> {
if (router.backstackSize == 1) {
router.pushController(HistoryTabsController())
}
}
R.id.nav_animelib -> {
val controller = router.getControllerWithTag(id.toString()) as? AnimelibController
controller?.showSettingsSheet()
@ -439,7 +434,7 @@ class MainActivity : BaseActivity() {
SHORTCUT_LIBRARY -> setSelectedNavItem(R.id.nav_library)
SHORTCUT_ANIMELIB -> setSelectedNavItem(R.id.nav_animelib)
SHORTCUT_RECENTLY_UPDATED -> setSelectedNavItem(R.id.nav_updates)
// SHORTCUT_RECENTLY_READ -> setSelectedNavItem(R.id.nav_history)
SHORTCUT_RECENTLY_READ -> setSelectedNavItem(R.id.nav_history)
SHORTCUT_CATALOGUES -> setSelectedNavItem(R.id.nav_browse)
SHORTCUT_EXTENSIONS -> {
if (router.backstackSize > 1) {
@ -593,8 +588,33 @@ class MainActivity : BaseActivity() {
}
fun setSelectedNavItem(itemId: Int) {
val newItemId = getNavIdForId(itemId)
if (!isFinishing) {
nav.selectedItemId = itemId
if (newItemId != null) {
nav.selectedItemId = newItemId
} else {
nav.selectedItemId = R.id.nav_more
router.setRoot(getControllerForId(itemId), itemId)
}
}
}
private fun getNavIdForId(id: Int): Int? {
return when (preferences.bottomNavStyle()) {
1 -> startScreenArrayHistory.firstOrNull { it == id }
2 -> startScreenArrayNoManga.firstOrNull { it == id }
else -> startScreenArrayDefault.firstOrNull { it == id }
}
}
private fun getControllerForId(id: Int): Controller {
return when (id) {
R.id.nav_library -> LibraryController()
R.id.nav_updates -> UpdatesTabsController()
R.id.nav_history -> HistoryTabsController()
R.id.nav_browse -> BrowseController()
R.id.nav_more -> MoreController()
else -> AnimelibController()
}
}