From 1c4c5128fac5b1b6c8d9de29bd1ccf6262c7894b Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Thu, 30 Dec 2021 22:05:55 -0600 Subject: - ViewModel LiveData no longer externally mutable. - Observers in fragments now owned by viewLifecycleOwner. - Disabled center animation on MapFragment startup - Search filter now triggered automatically. - Case insensitive filter logic. --- .../trackermap/TrackerMap/android/units/UnitsActivity.kt | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt') 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 ff8929e..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 @@ -20,9 +20,6 @@ class UnitsActivity : AppCompatActivity() { private val unitsViewModel: UnitsViewModel by viewModel() - private val mapFragment = MapFragment() - private val devicesFragment = DevicesFragment() - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -48,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()) } } @@ -76,9 +68,9 @@ class UnitsActivity : AppCompatActivity() { val newFragment = when (displayMode) { - UnitsViewModel.UnitsDisplayMode.LIST -> devicesFragment - UnitsViewModel.UnitsDisplayMode.MAP -> mapFragment - else -> devicesFragment + UnitsViewModel.UnitsDisplayMode.LIST -> DevicesFragment() + UnitsViewModel.UnitsDisplayMode.MAP -> MapFragment() + else -> DevicesFragment() } supportFragmentManager.commit { replace(R.id.displayContainer, newFragment) -- cgit v1.2.3