Resolve unresponsiveness and state loss on Place type screen rotation

app/build.gradle.kts

@@ -240,6 +240,8 @@ dependencies {
     // Jetpack Compose
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
+    implementation(libs.androidx.fragment.ktx)
     implementation(libs.androidx.activity.compose)
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.runtime)

app/src/main/java/fr/free/nrw/commons/activity/SingleWebViewActivity.kt

@@ -75,8 +75,7 @@ class SingleWebViewActivity : ComponentActivity() {
                             ) {
                                 Icon(
                                     imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                                    // TODO("Add contentDescription)
-                                    contentDescription = ""
+                                    contentDescription = getString(R.string.back)
                                 )
                             }
                         }

app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterSearchRecyclerViewAdapter.java

@@ -91,7 +91,6 @@ public void onBindViewHolder(@NonNull RecyclerViewHolder holder, int position) {
             label.setSelected(!label.isSelected());
             holder.placeTypeLayout.setSelected(label.isSelected());
 
-            NearbyFilterState.setSelectedLabels(new ArrayList<>(selectedLabels));
             callback.filterByMarkerType(selectedLabels, 0, false, false);
         });
     }
@@ -153,7 +152,6 @@ public void setRecyclerViewAdapterItemsGreyedOut() {
             label.setSelected(false);
             selectedLabels.remove(label);
         }
-        NearbyFilterState.setSelectedLabels(new ArrayList<>(selectedLabels));
         notifyDataSetChanged();
     }
 
@@ -165,7 +163,6 @@ public void setRecyclerViewAdapterAllSelected() {
                 selectedLabels.add(label);
             }
         }
-        NearbyFilterState.setSelectedLabels(new ArrayList<>(selectedLabels));
         notifyDataSetChanged();
     }
 

app/src/main/java/fr/free/nrw/commons/nearby/NearbyFilterViewModel.kt

@@ -0,0 +1,44 @@
+package fr.free.nrw.commons.nearby
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+
+/**
+ * ViewModel to manage the state of nearby place type filters.
+ */
+class NearbyFilterViewModel : ViewModel() {
+
+    private val _selectedLabels = MutableLiveData<ArrayList<Label>>(ArrayList())
+    val selectedLabels: LiveData<ArrayList<Label>> = _selectedLabels
+
+    /**
+     * Updates the selected labels list.
+     * @param labels The new list of selected labels
+     */
+    fun setSelectedLabels(labels: ArrayList<Label>) {
+        _selectedLabels.value = labels
+    }
+
+    /**
+     * Clears all selected labels.
+     */
+    fun clearSelectedLabels() {
+        _selectedLabels.value = ArrayList()
+    }
+
+    /**
+     * Selects all available labels.
+     */
+    fun selectAllLabels(allLabels: List<Label>) {
+        _selectedLabels.value = ArrayList(allLabels)
+    }
+
+    /**
+     * Gets the current selected labels as an ArrayList.
+     * @return The current selected labels
+     */
+    fun getSelectedLabels(): ArrayList<Label> {
+        return ArrayList(_selectedLabels.value ?: ArrayList())
+    }
+}

app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt

@@ -41,6 +41,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.LifecycleCoroutineScope
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.GridLayoutManager
@@ -84,6 +85,7 @@ import fr.free.nrw.commons.nearby.MarkerPlaceGroup
 import fr.free.nrw.commons.nearby.NearbyController
 import fr.free.nrw.commons.nearby.NearbyFilterSearchRecyclerViewAdapter
 import fr.free.nrw.commons.nearby.NearbyFilterState
+import fr.free.nrw.commons.nearby.NearbyFilterViewModel
 import fr.free.nrw.commons.nearby.NearbyUtil
 import fr.free.nrw.commons.nearby.Place
 import fr.free.nrw.commons.nearby.PlacesRepository
@@ -264,6 +266,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
     private var searchable = false
 
     private val nearbyLegend: ConstraintLayout? = null
+    private lateinit var filterViewModel: NearbyFilterViewModel
 
     private var gridLayoutManager: GridLayoutManager? = null
     private var dataList: MutableList<BottomSheetItem>? = null
@@ -446,6 +449,28 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+
+        // Initialize the ViewModel for filter state using ViewModelProvider
+        filterViewModel = ViewModelProvider(this)[NearbyFilterViewModel::class.java]
+
+        // Observe selected labels changes from ViewModel
+        filterViewModel.selectedLabels.observe(viewLifecycleOwner) { labels ->
+            nearbyFilterSearchRecyclerViewAdapter?.let { adapter ->
+                adapter.selectedLabels.clear()
+                adapter.selectedLabels.addAll(labels)
+                adapter.notifyDataSetChanged()
+                // Apply the filter when labels change
+                if (NearbyController.currentLocation != null) {
+                    presenter?.filterByMarkerType(
+                        labels,
+                        binding?.nearbyFilterList?.checkboxTriStates?.state ?: CheckBoxTriStates.UNKNOWN,
+                        true,
+                        false
+                    )
+                }
+            }
+        }
+
         // Initialize the launcher in the appropriate lifecycle method (e.g., onViewCreated)
         inAppCameraLocationPermissionLauncher =
             registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
@@ -923,6 +948,8 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
                     selectedLabels: ArrayList<Label>, i: Int,
                     b: Boolean, b1: Boolean
                 ) {
+                    // Save to ViewModel to survive configuration changes
+                    filterViewModel.setSelectedLabels(selectedLabels)
                     presenter!!.filterByMarkerType(selectedLabels, i, b, b1)
                 }
 
@@ -951,17 +978,15 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
 
     private fun restoreStoredFilterSelection() {
         val adapter = nearbyFilterSearchRecyclerViewAdapter ?: return
-        val savedLabels = ArrayList(NearbyFilterState.getInstance().selectedLabels)
+        // Restore from ViewModel instead of singleton to survive configuration changes
+        val savedLabels = filterViewModel.getSelectedLabels()
         adapter.selectedLabels.clear()
+        adapter.selectedLabels.addAll(savedLabels)
         val savedSet = savedLabels.toSet()
         Label.valuesAsList().forEach { label ->
             val isSelected = savedSet.contains(label)
             label.setSelected(isSelected)
-            if (isSelected) {
-                adapter.selectedLabels.add(label)
-            }
         }
-        NearbyFilterState.setSelectedLabels(ArrayList(adapter.selectedLabels))
         adapter.notifyDataSetChanged()
     }
 
@@ -1754,6 +1779,8 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
             && NearbyController.currentLocation != null
         ) {
             nearbyFilterSearchRecyclerViewAdapter!!.setRecyclerViewAdapterAllSelected()
+            // Update ViewModel to survive configuration changes
+            filterViewModel.selectAllLabels(Label.valuesAsList())
         }
     }
 
@@ -1762,6 +1789,8 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
             && NearbyController.currentLocation != null
         ) {
             nearbyFilterSearchRecyclerViewAdapter!!.setRecyclerViewAdapterItemsGreyedOut()
+            // Update ViewModel to survive configuration changes
+            filterViewModel.clearSelectedLabels()
         }
     }
 

gradle/libs.versions.toml

@@ -27,6 +27,7 @@ dexterVersion = "5.0.0"
 espresso = "3.6.1"
 exifinterface = "1.3.7"
 fragmentTesting = "1.6.2"
+fragmentKtx = "1.6.2"
 frescoVersion = "3.6.0"
 commonsLang3Version = "3.8.1"
 glide = "4.12.0"
@@ -85,6 +86,7 @@ androidx-exifinterface = { module = "androidx.exifinterface:exifinterface", vers
 androidx-foundation = { module = "androidx.compose.foundation:foundation" }
 androidx-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" }
 androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
+androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleRuntimeKtx" }
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-runner = { module = "androidx.test:runner", version.ref = "runner" }
 androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidxJunitVersion" }
@@ -144,6 +146,7 @@ androidx-espresso-contrib = { module = "androidx.test.espresso:espresso-contrib"
 androidx-espresso-intents = { module = "androidx.test.espresso:espresso-intents", version.ref = "espresso" }
 androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" }
 androidx-fragment-testing = { module = "androidx.fragment:fragment-testing", version.ref = "fragmentTesting" }
+androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtx" }
 androidx-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiautomator" }
 commons-io = { module = "commons-io:commons-io", version.ref = "commonsIo" }
 junit = { module = "junit:junit", version.ref = "junit" }