Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-20 07:39:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Manga app shortcuts now return back main activity on up button press

Browse Source
This commit is contained in:
Jays2Kings 2021-04-28 16:38:13 -04:00
parent a30e4ebcbc
commit f5aafebc91
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -895,6 +895,7 @@ open class MainActivity : BaseActivity<MainActivityBinding>(), DownloadServiceLi
const val SHORTCUT_BROWSE = "eu.kanade.tachiyomi.SHOW_BROWSE" const val SHORTCUT_BROWSE = "eu.kanade.tachiyomi.SHOW_BROWSE"
const val SHORTCUT_DOWNLOADS = "eu.kanade.tachiyomi.SHOW_DOWNLOADS" const val SHORTCUT_DOWNLOADS = "eu.kanade.tachiyomi.SHOW_DOWNLOADS"
const val SHORTCUT_MANGA = "eu.kanade.tachiyomi.SHOW_MANGA" const val SHORTCUT_MANGA = "eu.kanade.tachiyomi.SHOW_MANGA"
const val SHORTCUT_MANGA_BACK = "eu.kanade.tachiyomi.SHOW_MANGA_BACK"
const val SHORTCUT_UPDATE_NOTES = "eu.kanade.tachiyomi.SHOW_UPDATE_NOTES" const val SHORTCUT_UPDATE_NOTES = "eu.kanade.tachiyomi.SHOW_UPDATE_NOTES"
const val SHORTCUT_SOURCE = "eu.kanade.tachiyomi.SHOW_SOURCE" const val SHORTCUT_SOURCE = "eu.kanade.tachiyomi.SHOW_SOURCE"
const val SHORTCUT_READER_SETTINGS = "eu.kanade.tachiyomi.READER_SETTINGS" const val SHORTCUT_READER_SETTINGS = "eu.kanade.tachiyomi.READER_SETTINGS"

6
app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt
View File

@ -107,7 +107,7 @@ class SearchActivity : MainActivity() {
router.replaceTopController(GlobalSearchController(query, filter).withFadeTransaction()) router.replaceTopController(GlobalSearchController(query, filter).withFadeTransaction())
} }
} }
SHORTCUT_MANGA -> { SHORTCUT_MANGA, SHORTCUT_MANGA_BACK -> {
val extras = intent.extras ?: return false val extras = intent.extras ?: return false
router.replaceTopController( router.replaceTopController(
RouterTransaction.with(MangaDetailsController(extras)) RouterTransaction.with(MangaDetailsController(extras))
@ -136,13 +136,13 @@ class SearchActivity : MainActivity() {
} }
companion object { companion object {
fun openMangaIntent(context: Context, id: Long) = Intent( fun openMangaIntent(context: Context, id: Long?, canReturnToMain: Boolean = false) = Intent(
context, context,
SearchActivity::class SearchActivity::class
.java .java
) )
.apply { .apply {
action = SHORTCUT_MANGA action = if (canReturnToMain) SHORTCUT_MANGA_BACK else SHORTCUT_MANGA
putExtra(MangaDetailsController.MANGA_EXTRA, id) putExtra(MangaDetailsController.MANGA_EXTRA, id)
} }

7
app/src/main/java/eu/kanade/tachiyomi/util/manga/MangaShortcutManager.kt
View File

@ -19,7 +19,6 @@ import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.icon import eu.kanade.tachiyomi.source.icon
import eu.kanade.tachiyomi.ui.main.MainActivity import eu.kanade.tachiyomi.ui.main.MainActivity
import eu.kanade.tachiyomi.ui.main.SearchActivity import eu.kanade.tachiyomi.ui.main.SearchActivity
import eu.kanade.tachiyomi.ui.manga.MangaDetailsController
import eu.kanade.tachiyomi.ui.recents.RecentsPresenter import eu.kanade.tachiyomi.ui.recents.RecentsPresenter
import eu.kanade.tachiyomi.ui.source.browse.BrowseSourceController import eu.kanade.tachiyomi.ui.source.browse.BrowseSourceController
import eu.kanade.tachiyomi.util.system.launchIO import eu.kanade.tachiyomi.util.system.launchIO
@ -79,12 +78,8 @@ class MangaShortcutManager(
else Icon.createWithResource(context, R.drawable.ic_book_24dp) else Icon.createWithResource(context, R.drawable.ic_book_24dp)
) )
.setIntent( .setIntent(
Intent( SearchActivity.openMangaIntent(context, item.id, true)
context,
SearchActivity::class.java
).setAction(MainActivity.SHORTCUT_MANGA)
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP) .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
.putExtra(MangaDetailsController.MANGA_EXTRA, item.id)
) )
.build() .build()
} }