tim/karoo-headwind
1
0
Fork 0
Code Issues Actions Releases 12 Activity

Update circle indicator

Browse Source
This commit is contained in:
Tim Kluge 2024-12-14 14:33:45 +01:00
parent 95006652b3
commit 86d6c0cc18
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/kotlin/de/timklge/karooheadwind/Extensions.kt
View File

@ -28,7 +28,6 @@ import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.filterNotNull
import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.mapNotNull
import kotlinx.coroutines.flow.scan import kotlinx.coroutines.flow.scan
@ -40,7 +39,6 @@ import kotlinx.serialization.json.Json
import java.time.Duration import java.time.Duration
import kotlin.math.abs import kotlin.math.abs
import kotlin.math.absoluteValue import kotlin.math.absoluteValue
import kotlin.math.roundToInt
import kotlin.time.Duration.Companion.seconds import kotlin.time.Duration.Companion.seconds
val jsonWithUnknownKeys = Json { ignoreUnknownKeys = true } val jsonWithUnknownKeys = Json { ignoreUnknownKeys = true }
@ -203,14 +201,10 @@ fun KarooSystemService.getRelativeHeadingFlow(context: Context): Flow<Double> {
} }
} }
fun Double.lerp(target: Double, alpha: Double): Double {
return this + (target - this) * alpha
}
fun KarooSystemService.getHeadingFlow(): Flow<Double> { fun KarooSystemService.getHeadingFlow(): Flow<Double> {
//return flowOf(20.0) //return flowOf(20.0)
return streamDataFlow("TYPE_LOCATION_ID") return streamDataFlow(DataType.Type.LOCATION)
.mapNotNull { (it as? StreamState.Streaming)?.dataPoint?.values } .mapNotNull { (it as? StreamState.Streaming)?.dataPoint?.values }
.map { values -> .map { values ->
val heading = values[DataType.Field.LOC_BEARING] val heading = values[DataType.Field.LOC_BEARING]
@ -218,7 +212,7 @@ fun KarooSystemService.getHeadingFlow(): Flow<Double> {
heading ?: 0.0 heading ?: 0.0
} }
.distinctUntilChanged() .distinctUntilChanged()
.scan(emptyList<Double>()) { acc, value -> .scan(emptyList<Double>()) { acc, value -> /* Average over 3 values */
val newAcc = acc + value val newAcc = acc + value
if (newAcc.size > 3) newAcc.drop(1) else newAcc if (newAcc.size > 3) newAcc.drop(1) else newAcc
} }
@ -229,7 +223,7 @@ fun KarooSystemService.getHeadingFlow(): Flow<Double> {
fun KarooSystemService.getGpsCoordinateFlow(): Flow<GpsCoordinates> { fun KarooSystemService.getGpsCoordinateFlow(): Flow<GpsCoordinates> {
// return flowOf(GpsCoordinates(52.5164069,13.3784)) // return flowOf(GpsCoordinates(52.5164069,13.3784))
return streamDataFlow("TYPE_LOCATION_ID") return streamDataFlow(DataType.Type.LOCATION)
.mapNotNull { (it as? StreamState.Streaming)?.dataPoint?.values } .mapNotNull { (it as? StreamState.Streaming)?.dataPoint?.values }
.mapNotNull { values -> .mapNotNull { values ->
val lat = values[DataType.Field.LOC_LATITUDE] val lat = values[DataType.Field.LOC_LATITUDE]

2
app/src/main/kotlin/de/timklge/karooheadwind/datatypes/HeadwindDirectionDataType.kt
View File

@ -77,7 +77,7 @@ class HeadwindDirectionDataType(
val baseBitmap = BitmapFactory.decodeResource( val baseBitmap = BitmapFactory.decodeResource(
context.resources, context.resources,
de.timklge.karooheadwind.R.drawable.arrow de.timklge.karooheadwind.R.drawable.circle
) )
val configJob = CoroutineScope(Dispatchers.IO).launch { val configJob = CoroutineScope(Dispatchers.IO).launch {

BIN
app/src/main/res/drawable/circle.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB