aboutsummaryrefslogtreecommitdiff
path: root/androidApp/src
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2021-12-16 03:21:32 -0600
committerIván Ávalos <avalos@disroot.org>2021-12-16 03:21:32 -0600
commit323e94c3a3852c63ebe00e8448f3611b59b39b97 (patch)
tree734309bb1e131b4aaea46013c81addcf44715872 /androidApp/src
parentf05e413fc925be4ac225c05b49bc0b8930af9e10 (diff)
downloadetbsa-trackermap-mobile-323e94c3a3852c63ebe00e8448f3611b59b39b97.tar.gz
etbsa-trackermap-mobile-323e94c3a3852c63ebe00e8448f3611b59b39b97.tar.bz2
etbsa-trackermap-mobile-323e94c3a3852c63ebe00e8448f3611b59b39b97.zip
Added icon for displayModeToggle according to displayMode
Diffstat (limited to 'androidApp/src')
-rw-r--r--androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsActivity.kt11
-rw-r--r--androidApp/src/main/res/drawable/ic_baseline_list_24.xml10
-rw-r--r--androidApp/src/main/res/drawable/ic_baseline_map_24.xml10
3 files changed, 31 insertions, 0 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 2be6da3..ea40d91 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
@@ -5,12 +5,14 @@ import android.util.Log
import androidx.appcompat.app.AppCompatActivity
import androidx.core.widget.doAfterTextChanged
import androidx.fragment.app.commit
+import kotlinx.coroutines.DelicateCoroutinesApi
import mx.trackermap.TrackerMap.android.R
import mx.trackermap.TrackerMap.android.databinding.UnitsActivityBinding
import mx.trackermap.TrackerMap.android.devices.DevicesFragment
import mx.trackermap.TrackerMap.android.map.MapFragment
import org.koin.androidx.viewmodel.ext.android.viewModel
+@DelicateCoroutinesApi
class UnitsActivity : AppCompatActivity() {
private var _binding: UnitsActivityBinding? = null
@@ -54,10 +56,19 @@ class UnitsActivity : AppCompatActivity() {
private fun setupObservers() {
unitsViewModel.unitsDisplayMode.observe(this) { displayMode ->
+ binding.displayModeToggle.setImageResource(
+ when (displayMode) {
+ UnitsViewModel.UnitsDisplayMode.LIST -> R.drawable.ic_baseline_map_24
+ UnitsViewModel.UnitsDisplayMode.MAP -> R.drawable.ic_baseline_list_24
+ else -> R.drawable.ic_baseline_map_24
+ }
+ )
+
val newFragment =
when (displayMode) {
UnitsViewModel.UnitsDisplayMode.LIST -> DevicesFragment()
UnitsViewModel.UnitsDisplayMode.MAP -> MapFragment()
+ else -> DevicesFragment()
}
supportFragmentManager.commit {
replace(R.id.displayContainer, newFragment)
diff --git a/androidApp/src/main/res/drawable/ic_baseline_list_24.xml b/androidApp/src/main/res/drawable/ic_baseline_list_24.xml
new file mode 100644
index 0000000..b0e68e0
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_baseline_list_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_baseline_map_24.xml b/androidApp/src/main/res/drawable/ic_baseline_map_24.xml
new file mode 100644
index 0000000..d1274d8
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_baseline_map_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
+</vector>