aboutsummaryrefslogtreecommitdiff
path: root/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2021-12-30 22:05:55 -0600
committerIván Ávalos <avalos@disroot.org>2021-12-30 22:43:25 -0600
commit1c4c5128fac5b1b6c8d9de29bd1ccf6262c7894b (patch)
tree1468e72b8b6afdb1527c7092751f85605efc7e4e /androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt
parentc11d9d0aaa0428e93df978642a54ba466ccf4e93 (diff)
downloadetbsa-trackermap-mobile-1c4c5128fac5b1b6c8d9de29bd1ccf6262c7894b.tar.gz
etbsa-trackermap-mobile-1c4c5128fac5b1b6c8d9de29bd1ccf6262c7894b.tar.bz2
etbsa-trackermap-mobile-1c4c5128fac5b1b6c8d9de29bd1ccf6262c7894b.zip
- 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.
Diffstat (limited to 'androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt')
-rw-r--r--androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt16
1 files changed, 4 insertions, 12 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 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)