- fixed dangling foreground service that happened when going back on …

…Trips fragment - notify recyclerview when Map is deleted
lmj0011 · May 1, 2020 · 6d58468 · 6d58468
1 parent 4543b47
commit 6d58468
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 20 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         applicationId "name.lmj0011.courierlocker"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 46
+        versionCode 47
         versionName "1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
@@ -50,7 +50,7 @@ android {
     productFlavors {
         dev { // active development/testing
             applicationIdSuffix ".dev"
-            versionNameSuffix ".1.2-dev"
+            versionNameSuffix ".1.3-dev"
             resValue("string", "app_name", "Courier Locker (dev)")
             manifestPlaceholders = [
                     appIcon: "@mipmap/ic_launcher_dev",
@@ -60,7 +60,7 @@ android {
         }
         beta { // public testing
             applicationIdSuffix ".beta"
-            versionNameSuffix ".1.2-beta"
+            versionNameSuffix ".1.3-beta"
             resValue("string", "app_name", "Courier Locker (beta)")
             manifestPlaceholders = [
                     appIcon: "@mipmap/ic_launcher_beta",
@@ -70,7 +70,7 @@ android {
         }
         prod { // official release
             applicationIdSuffix ".prod"
-            versionNameSuffix ".1.2"
+            versionNameSuffix ".1.3"
             resValue("string", "app_name", "Courier Locker")
             manifestPlaceholders = [
                     appIcon: "@mipmap/ic_launcher",

diff --git a/app/src/main/java/name/lmj0011/courierlocker/MainActivity.kt b/app/src/main/java/name/lmj0011/courierlocker/MainActivity.kt
@@ -142,27 +142,23 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
     }
 
     override fun onSupportNavigateUp(): Boolean {
-        this.onBackPressed()
-        return true
+        when(navController.currentDestination?.id) {
+            // seems to be the only way to get the Maps recyclerview to show updated items when navigated
+            // from EditAptBuildingsMapsFragment
+            R.id.editAptBuildingsMapsFragment -> {
+                navController.navigate(R.id.mapsFragment)
+                return true
+            }
+        }
+
+        return navController.navigateUp(appBarConfiguration) || super.onSupportNavigateUp()
     }
 
     override fun onBackPressed() {
         if (binding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
-            // an open drawer means user is at a top level destination, close app
-            finish()
-        }else if(topLevelDestinations.contains(navController.currentDestination?.id)) {
-            binding.drawerLayout.openDrawer(GravityCompat.START)
+            binding.drawerLayout.closeDrawer(GravityCompat.START)
         }else {
-            when(navController.currentDestination?.id) {
-                // seems to be the only way to get the Maps recyclerview to show updated items when navigated
-                // from EditAptBuildingsMapsFragment
-                R.id.editAptBuildingsMapsFragment -> {
-                    navController.navigate(R.id.mapsFragment)
-                }
-                else -> {
-                    super.onBackPressed()
-                }
-            }
+            super.onBackPressed()
         }
     }
 

diff --git a/app/src/main/java/name/lmj0011/courierlocker/fragments/MapsFragment.kt b/app/src/main/java/name/lmj0011/courierlocker/fragments/MapsFragment.kt
@@ -88,6 +88,7 @@ class MapsFragment : Fragment() {
                     withContext(Dispatchers.IO) {
                         apartmentViewModel.database.deleteByApartmentId(aptId)
                     }
+                    listAdapter.notifyDataSetChanged()
                 }
             }
         ), this)