Merge pull request #335 from cbalster/back_nav

Return to map on back navigation
criticalmaps · Jul 2, 2023 · 024a491 · 024a491
2 parents 055a26e + 69ea44b
commit 024a491
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/app/src/main/java/de/stephanlindauer/criticalmaps/Main.java b/app/src/main/java/de/stephanlindauer/criticalmaps/Main.java
@@ -21,6 +21,7 @@
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.widget.Toast;
 
+import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBarDrawerToggle;
@@ -277,6 +278,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
     public void onBackPressed() {
         if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
             binding.drawerLayout.closeDrawers();
+        } else if (currentNavId != R.id.navigation_map) {
+            navigateTo(R.id.navigation_map);
         } else {
             super.onBackPressed();
         }