fix #8: Use new location change event

timklge · Jan 28, 2025 · f2b652e · f2b652e
1 parent 0503202
commit f2b652e
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 24 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,8 +15,8 @@ android {
         applicationId = "de.timklge.karooheadwind"
         minSdk = 26
         targetSdk = 35
-        versionCode = 9
-        versionName = "1.2.1"
+        versionCode = 10
+        versionName = "1.2.2"
     }
 
     signingConfigs {

diff --git a/app/manifest.json b/app/manifest.json
@@ -3,9 +3,9 @@
   "packageName": "de.timklge.karooheadwind",
   "iconUrl": "https://github.com/timklge/karoo-headwind/releases/latest/download/karoo-headwind.png",
   "latestApkUrl": "https://github.com/timklge/karoo-headwind/releases/latest/download/app-release.apk",
-  "latestVersion": "1.2.1",
-  "latestVersionCode": 9,
+  "latestVersion": "1.2.2",
+  "latestVersionCode": 10,
   "developer": "timklge",
   "description": "Provides headwind direction, wind speed and other weather data fields",
-  "releaseNotes": "Add tailwind and ride speed data field, reduce font size in tailwind indicators"
+  "releaseNotes": "Reduce font size in tailwind indicators, update gps bearing retrieval"
 }
diff --git a/app/src/main/kotlin/de/timklge/karooheadwind/Extensions.kt b/app/src/main/kotlin/de/timklge/karooheadwind/Extensions.kt
@@ -32,6 +32,7 @@ import io.hammerhead.karooext.KarooSystemService
 import io.hammerhead.karooext.models.DataType
 import io.hammerhead.karooext.models.HttpResponseState
 import io.hammerhead.karooext.models.OnHttpResponse
+import io.hammerhead.karooext.models.OnLocationChanged
 import io.hammerhead.karooext.models.OnStreamState
 import io.hammerhead.karooext.models.StreamState
 import io.hammerhead.karooext.models.UserProfile
@@ -72,6 +73,17 @@ fun KarooSystemService.streamDataFlow(dataTypeId: String): Flow<StreamState> {
     }
 }
 
+fun KarooSystemService.streamLocation(): Flow<OnLocationChanged> {
+    return callbackFlow {
+        val listenerId = addConsumer { event: OnLocationChanged ->
+            trySendBlocking(event)
+        }
+        awaitClose {
+            removeConsumer(listenerId)
+        }
+    }
+}
+
 fun<T> Flow<T>.throttle(timeout: Long): Flow<T> = flow {
     var lastEmissionTime = 0L
 

diff --git a/app/src/main/kotlin/de/timklge/karooheadwind/HeadingFlow.kt b/app/src/main/kotlin/de/timklge/karooheadwind/HeadingFlow.kt
@@ -115,25 +115,11 @@ fun KarooSystemService.getGpsCoordinateFlow(context: Context): Flow<GpsCoordinat
 
     val initialFlow = flow {
         val lastKnownPosition = context.getLastKnownPosition()
-        if (lastKnownPosition != null) emit(lastKnownPosition)
-    }
 
-    val gpsFlow = streamDataFlow(DataType.Type.LOCATION)
-        .map { (it as? StreamState.Streaming)?.dataPoint?.values }
-        .map { values ->
-            val lat = values?.get(DataType.Field.LOC_LATITUDE)
-            val lon = values?.get(DataType.Field.LOC_LONGITUDE)
-            val bearing = values?.get(DataType.Field.LOC_BEARING)
-
-            if (lat != null && lon != null){
-                // Log.d(KarooHeadwindExtension.TAG, "Updated gps coordinates: $lat $lon")
-                GpsCoordinates(lat, lon, bearing)
-            } else {
-                // Log.w(KarooHeadwindExtension.TAG, "Gps unavailable: $values")
-                null
-            }
-        }
+        emit(lastKnownPosition)
+    }
 
+    val gpsFlow = streamLocation().map { GpsCoordinates(it.lat, it.lng, it.orientation) }
     val concatenatedFlow = concatenate(initialFlow, gpsFlow)
 
     return concatenatedFlow

diff --git a/app/src/main/kotlin/de/timklge/karooheadwind/KarooHeadwindExtension.kt b/app/src/main/kotlin/de/timklge/karooheadwind/KarooHeadwindExtension.kt
@@ -41,7 +41,7 @@ import kotlin.math.absoluteValue
 import kotlin.time.Duration.Companion.hours
 import kotlin.time.Duration.Companion.minutes
 
-class KarooHeadwindExtension : KarooExtension("karoo-headwind", "1.2.1") {
+class KarooHeadwindExtension : KarooExtension("karoo-headwind", "1.2.2") {
     companion object {
         const val TAG = "karoo-headwind"
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "
 
 [libraries]
 androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" }
-hammerhead-karoo-ext = { group = "io.hammerhead", name = "karoo-ext", version = "1.1.2" }
+hammerhead-karoo-ext = { group = "io.hammerhead", name = "karoo-ext", version = "1.1.3" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidxCore" }
 
 # compose