aboutsummaryrefslogtreecommitdiff
path: root/androidApp
diff options
context:
space:
mode:
authorIván Ávalos <avalos@disroot.org>2022-01-31 22:49:12 -0600
committerIván Ávalos <avalos@disroot.org>2022-01-31 22:49:12 -0600
commit90a9f7028053b3c4a56b88fcc52de675db5b9ab9 (patch)
tree2c57fd6b04527f71cd9d25e79714c262c23bc91e /androidApp
parent4c27908871393358aca92b333bc1785b468e4645 (diff)
parent9d753c9fa9e93171206e6036c1889ea17cac9db6 (diff)
downloadetbsa-trackermap-mobile-90a9f7028053b3c4a56b88fcc52de675db5b9ab9.tar.gz
etbsa-trackermap-mobile-90a9f7028053b3c4a56b88fcc52de675db5b9ab9.tar.bz2
etbsa-trackermap-mobile-90a9f7028053b3c4a56b88fcc52de675db5b9ab9.zip
Merge branch 'main' into ios_app
Diffstat (limited to 'androidApp')
-rw-r--r--androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt1
-rw-r--r--androidApp/src/main/res/layout/devices_fragment.xml3
2 files changed, 3 insertions, 1 deletions
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt
index d7b6db1..ba29090 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt
@@ -69,6 +69,7 @@ class UnitsViewModel(
init {
Log.d("UnitsViewModel", "Initializing Units View Model")
+ unitsController.fetchUnits(viewModelScope)
viewModelScope.launch {
setupObservers()
}
diff --git a/androidApp/src/main/res/layout/devices_fragment.xml b/androidApp/src/main/res/layout/devices_fragment.xml
index 1dd1690..6e4db3f 100644
--- a/androidApp/src/main/res/layout/devices_fragment.xml
+++ b/androidApp/src/main/res/layout/devices_fragment.xml
@@ -2,7 +2,8 @@
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:background="@color/background">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/devicesList"