1 files changed, 8 insertions, 6 deletions
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
index ea40d91..8a6f699 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
@@ -45,12 +45,7 @@ class UnitsActivity : AppCompatActivity() {
         }
         binding.searchInput.doAfterTextChanged {
             Log.d("UnitsActivity", "Search changed to ${it.toString()}")
-            unitsViewModel.searchQuery.value = it.toString()
-        }
-        binding.searchInput.setOnEditorActionListener { _, _, _ ->
-            Log.d("UnitsActivity", "Search key tapped")
-            unitsViewModel.search()
-            true
+            unitsViewModel.search(it.toString())
         }
     }
 
@@ -63,6 +58,13 @@ class UnitsActivity : AppCompatActivity() {
                     else -> R.drawable.ic_baseline_map_24
                 }
             )
+            binding.displayModeToggle.contentDescription = getString(
+                when (displayMode) {
+                    UnitsViewModel.UnitsDisplayMode.LIST -> R.string.toggle_map
+                    UnitsViewModel.UnitsDisplayMode.MAP -> R.string.toggle_list
+                    else -> R.string.toggle_map
+                }
+            )
 
             val newFragment =
                 when (displayMode) {