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

Use narrower color range (#75)

Browse Source
This commit is contained in:
timklge 2025-03-24 17:33:17 +01:00 committed by GitHub
parent 31610773cb
commit 836fb5d05f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/kotlin/de/timklge/karooheadwind/datatypes/TailwindAndRideSpeedDataType.kt
View File

@ -44,8 +44,9 @@ import kotlin.math.absoluteValue
import kotlin.math.cos import kotlin.math.cos
import kotlin.math.roundToInt import kotlin.math.roundToInt
fun interpolateColor(color1: Color, color2: Color, factor: Float): Color { fun interpolateColor(color1: Color, color2: Color, lowerBound: Double, upperBound: Double, actualValue: Double): Color {
return Color(ColorUtils.blendARGB(color1.toArgb(), color2.toArgb(), factor)) val factor = if (upperBound == lowerBound) 0.0 else ((actualValue - lowerBound) / (upperBound - lowerBound)).coerceIn(0.0, 1.0)
return Color(ColorUtils.blendARGB(color1.toArgb(), color2.toArgb(), factor.toFloat()))
} }
fun interpolateWindColor(windSpeedInKmh: Double, night: Boolean, context: Context): Color { fun interpolateWindColor(windSpeedInKmh: Double, night: Boolean, context: Context): Color {
@ -55,11 +56,11 @@ fun interpolateWindColor(windSpeedInKmh: Double, night: Boolean, context: Contex
val orange = Color(ContextCompat.getColor(context, if(night) R.color.orange else R.color.hOrange)) val orange = Color(ContextCompat.getColor(context, if(night) R.color.orange else R.color.hOrange))
return when { return when {
windSpeedInKmh <= -15 -> green windSpeedInKmh <= -10 -> green
windSpeedInKmh >= 30 -> red windSpeedInKmh >= 15 -> red
windSpeedInKmh in -15.0..0.0 -> interpolateColor(green, default, (windSpeedInKmh + 15).toFloat() / 15) windSpeedInKmh in -10.0..0.0 -> interpolateColor(green, default, -10.0, 0.0, windSpeedInKmh)
windSpeedInKmh in 0.0..15.0 -> interpolateColor(default, orange, windSpeedInKmh.toFloat() / 15) windSpeedInKmh in 0.0..10.0 -> interpolateColor(default, orange, 0.0, 10.0, windSpeedInKmh)
else -> interpolateColor(orange, red, (windSpeedInKmh - 15).toFloat() / 15) else -> interpolateColor(orange, red, 10.0, 15.0, windSpeedInKmh)
} }
} }

2
app/src/main/kotlin/de/timklge/karooheadwind/screens/WeatherScreen.kt
View File

@ -118,7 +118,7 @@ fun WeatherScreen(onFinish: () -> Unit) {
if (!serviceStatus){ if (!serviceStatus){
Text( Text(
modifier = Modifier.padding(5.dp), modifier = Modifier.padding(5.dp),
text = "Attempting to connect to weather background service..." text = "Attempting to connect to weather background service... Please reboot your Karoo if this takes too long."
) )
} else if (stats.failedWeatherRequest != null && (stats.lastSuccessfulWeatherRequest == null || stats.failedWeatherRequest!! > stats.lastSuccessfulWeatherRequest!!)) { } else if (stats.failedWeatherRequest != null && (stats.lastSuccessfulWeatherRequest == null || stats.failedWeatherRequest!! > stats.lastSuccessfulWeatherRequest!!)) {
val successfulTime = LocalDateTime.ofInstant( val successfulTime = LocalDateTime.ofInstant(