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

Use single task activity

Browse Source
This commit is contained in:
inorichi 2019-04-13 13:09:01 +02:00
parent 0a988d1c69
commit 3533359fae
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -23,7 +23,7 @@
android:theme="@style/Theme.Tachiyomi"> android:theme="@style/Theme.Tachiyomi">
<activity <activity
android:name=".ui.main.MainActivity" android:name=".ui.main.MainActivity"
android:launchMode="singleTop"> android:launchMode="singleTask">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />

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

@ -167,7 +167,9 @@ class MainActivity : BaseActivity() {
//Get the search query provided in extras, and if not null, perform a global search with it. //Get the search query provided in extras, and if not null, perform a global search with it.
val query = intent.getStringExtra(SearchManager.QUERY) val query = intent.getStringExtra(SearchManager.QUERY)
if (query != null && !query.isEmpty()) { if (query != null && !query.isEmpty()) {
setSelectedDrawerItem(R.id.nav_drawer_catalogues) if (router.backstackSize > 1) {
router.popToRoot()
}
router.pushController(CatalogueSearchController(query).withFadeTransaction()) router.pushController(CatalogueSearchController(query).withFadeTransaction())
} }
} }
@ -175,7 +177,9 @@ class MainActivity : BaseActivity() {
val query = intent.getStringExtra(INTENT_SEARCH_QUERY) val query = intent.getStringExtra(INTENT_SEARCH_QUERY)
val filter = intent.getStringExtra(INTENT_SEARCH_FILTER) val filter = intent.getStringExtra(INTENT_SEARCH_FILTER)
if (query != null && !query.isEmpty()) { if (query != null && !query.isEmpty()) {
setSelectedDrawerItem(R.id.nav_drawer_catalogues) if (router.backstackSize > 1) {
router.popToRoot()
}
router.pushController(CatalogueSearchController(query, filter).withFadeTransaction()) router.pushController(CatalogueSearchController(query, filter).withFadeTransaction())
} }
} }