don't close overlay form when tabbing in from another app (fix #5804)

streetcomplete · Aug 18, 2024 · 9a73dc0 · 9a73dc0
1 parent a6c49bc
commit 9a73dc0
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/screens/main/MainFragment.kt b/app/src/main/java/de/westnordost/streetcomplete/screens/main/MainFragment.kt
@@ -187,6 +187,7 @@ class MainFragment :
 
     private var wasFollowingPosition: Boolean? = null
     private var wasNavigationMode: Boolean? = null
+    private var selectedOverlay: Overlay? = null
 
     private var windowInsets: Insets? = null
 
@@ -291,6 +292,13 @@ class MainFragment :
         observe(controlsViewModel.selectedOverlay) { overlay ->
             val iconRes = overlay?.icon ?: R.drawable.ic_overlay_black_24dp
             binding.overlaysButton.setImageResource(iconRes)
+            if (selectedOverlay != overlay) {
+                val f = bottomSheetFragment
+                if (f is IsShowingElement) {
+                    closeBottomSheet()
+                }
+            }
+            selectedOverlay = overlay
         }
         observe(controlsViewModel.isTeamMode) { isTeamMode ->
             if (isTeamMode) {
@@ -309,11 +317,6 @@ class MainFragment :
             val isCreateNodeEnabled = overlay?.isCreateNodeEnabled == true
             binding.createButton.isGone = !isCreateNodeEnabled
             binding.crosshairView.isGone = !isCreateNodeEnabled
-
-            val f = bottomSheetFragment
-            if (f is IsShowingElement) {
-                closeBottomSheet()
-            }
         }
         observe(editHistoryViewModel.editItems) { editItems ->
             if (editItems.isEmpty()) closeEditHistorySidebar()