diff options
| author | Iván Ávalos <avalos@disroot.org> | 2022-01-31 22:49:12 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2022-01-31 22:49:12 -0600 |
| commit | 90a9f7028053b3c4a56b88fcc52de675db5b9ab9 (patch) | |
| tree | 2c57fd6b04527f71cd9d25e79714c262c23bc91e | |
| parent | 4c27908871393358aca92b333bc1785b468e4645 (diff) | |
| parent | 9d753c9fa9e93171206e6036c1889ea17cac9db6 (diff) | |
| download | etbsa-trackermap-mobile-90a9f7028053b3c4a56b88fcc52de675db5b9ab9.tar.gz etbsa-trackermap-mobile-90a9f7028053b3c4a56b88fcc52de675db5b9ab9.tar.bz2 etbsa-trackermap-mobile-90a9f7028053b3c4a56b88fcc52de675db5b9ab9.zip | |
Merge branch 'main' into ios_app
3 files changed, 5 insertions, 5 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" diff --git a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/UnitsController.kt b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/UnitsController.kt index fd1e950..8c36d50 100644 --- a/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/UnitsController.kt +++ b/shared/src/commonMain/kotlin/mx/trackermap/TrackerMap/controllers/UnitsController.kt @@ -33,6 +33,7 @@ import mx.trackermap.TrackerMap.client.models.UnitInformation import mx.trackermap.TrackerMap.utils.Coroutines import kotlin.time.Duration.Companion.seconds import kotlin.time.ExperimentalTime +import kotlinx.coroutines.Job @DelicateCoroutinesApi @ExperimentalTime @@ -50,14 +51,11 @@ class UnitsController( init { GlobalScope.launch { - fetchUnits(this) - } - GlobalScope.launch { setupFlows() } } - private suspend fun fetchUnits(scope: CoroutineScope) { + fun fetchUnits(scope: CoroutineScope) { Coroutines.tickerFlow(UPDATE_TIME.seconds) .map { print("Fetching new positions...\n") |