From fa2a7a8dd35e6d066022239f4da9cd5ddc54a229 Mon Sep 17 00:00:00 2001 From: Iván Ávalos Date: Mon, 11 Sep 2023 13:38:19 -0600 Subject: [android] Upgrade AGP, Kotlin plugin, JDK + StateFlow fixes --- .../java/mx/trackermap/TrackerMap/android/units/UnitsViewModel.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'androidApp/src/main/java/mx/trackermap/TrackerMap/android/units') 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 b537c0b..b5ed78d 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 @@ -21,7 +21,7 @@ import android.util.Log import androidx.lifecycle.* import com.mousebird.maply.Point2d import kotlinx.coroutines.DelicateCoroutinesApi -import kotlinx.coroutines.flow.collect +import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch import mx.trackermap.TrackerMap.client.models.Geofence import mx.trackermap.TrackerMap.client.models.MapLayer @@ -87,14 +87,14 @@ class UnitsViewModel( } private suspend fun setupUnitsObserver() { - unitsController.displayedUnitsFlow.collect { units -> + (unitsController.displayedUnitsFlow as StateFlow>).collect { units -> Log.d("UnitsViewModel", "Collecting units") this._displayedUnits.value = units } } private suspend fun setupDisplayedUnitsObserver() { - unitsController.unitsFlow.collect { units -> + (unitsController.unitsFlow as StateFlow>).collect { units -> Log.d("UnitsViewModel", "Collecting displayed units") this._units.value = units updateSelectedUnit() @@ -102,7 +102,7 @@ class UnitsViewModel( } private suspend fun setupGeofenceObserver() { - geofenceController.geofencesFlow.collect { + (geofenceController.geofencesFlow as StateFlow>).collect { Log.d("UnitsViewModel", "Collecting geofences") this._geofences.postValue(it) } -- cgit v1.2.3