github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2025-02-07 08:34:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[UX] Fix app quiting in home when back button opens drawer function active.

Browse Source
This commit is contained in:
Kacper Ziubryniewicz 2020-03-20 21:39:38 +01:00
parent 20f16c25a3
commit 87ae5787ee
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/pl/szczodrzynski/edziennik/MainActivity.kt
View File

@ -1151,7 +1151,8 @@ class MainActivity : AppCompatActivity(), CoroutineScope {
private var targetHomeId: Int = -1 private var targetHomeId: Int = -1
override fun onBackPressed() { override fun onBackPressed() {
if (!b.navView.onBackPressed()) { if (!b.navView.onBackPressed()) {
if (App.config.ui.openDrawerOnBackPressed && navTarget.popTo == null && navTarget.popToHome) { if (App.config.ui.openDrawerOnBackPressed && ((navTarget.popTo == null && navTarget.popToHome)
|| navTarget.id == DRAWER_ITEM_HOME)) {
b.navView.drawer.toggle() b.navView.drawer.toggle()
} else { } else {
navigateUp() navigateUp()