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

Colorize speed and tailwind background instead of text (#74)

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

23
app/src/main/kotlin/de/timklge/karooheadwind/datatypes/HeadwindDirectionView.kt
View File

@ -3,7 +3,6 @@ package de.timklge.karooheadwind.datatypes
import android.graphics.Bitmap import android.graphics.Bitmap
import android.graphics.Canvas import android.graphics.Canvas
import android.graphics.Paint import android.graphics.Paint
import android.util.Log
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
@ -13,6 +12,7 @@ import androidx.glance.GlanceModifier
import androidx.glance.Image import androidx.glance.Image
import androidx.glance.ImageProvider import androidx.glance.ImageProvider
import androidx.glance.appwidget.background import androidx.glance.appwidget.background
import androidx.glance.appwidget.cornerRadius
import androidx.glance.color.ColorProvider import androidx.glance.color.ColorProvider
import androidx.glance.layout.Alignment import androidx.glance.layout.Alignment
import androidx.glance.layout.Box import androidx.glance.layout.Box
@ -26,7 +26,6 @@ import androidx.glance.text.FontFamily
import androidx.glance.text.FontWeight import androidx.glance.text.FontWeight
import androidx.glance.text.Text import androidx.glance.text.Text
import androidx.glance.text.TextStyle import androidx.glance.text.TextStyle
import de.timklge.karooheadwind.KarooHeadwindExtension
import kotlin.math.roundToInt import kotlin.math.roundToInt
fun getArrowBitmapByBearing(baseBitmap: Bitmap, bearing: Int): Bitmap { fun getArrowBitmapByBearing(baseBitmap: Bitmap, bearing: Int): Bitmap {
@ -54,10 +53,10 @@ fun getArrowBitmapByBearing(baseBitmap: Bitmap, bearing: Int): Bitmap {
fun HeadwindDirection( fun HeadwindDirection(
baseBitmap: Bitmap, bearing: Int, fontSize: Int, baseBitmap: Bitmap, bearing: Int, fontSize: Int,
overlayText: String, overlaySubText: String? = null, overlayText: String, overlaySubText: String? = null,
dayColor: Color = Color.Black, nightColor: Color = Color.White nightColor: Color = Color.Black, dayColor: Color = Color.White
) { ) {
Box( Box(
modifier = GlanceModifier.fillMaxSize().padding(5.dp), modifier = GlanceModifier.fillMaxSize().padding(5.dp).background(dayColor, nightColor).cornerRadius(10.dp),
contentAlignment = Alignment( contentAlignment = Alignment(
vertical = Alignment.Vertical.CenterVertically, vertical = Alignment.Vertical.CenterVertically,
horizontal = Alignment.Horizontal.CenterHorizontally, horizontal = Alignment.Horizontal.CenterHorizontally,
@ -70,14 +69,14 @@ fun HeadwindDirection(
provider = ImageProvider(getArrowBitmapByBearing(baseBitmap, bearing)), provider = ImageProvider(getArrowBitmapByBearing(baseBitmap, bearing)),
contentDescription = "Relative wind direction indicator", contentDescription = "Relative wind direction indicator",
contentScale = ContentScale.Fit, contentScale = ContentScale.Fit,
colorFilter = ColorFilter.tint(ColorProvider(dayColor, nightColor)) colorFilter = ColorFilter.tint(ColorProvider(Color.Black, Color.White))
) )
Text( Text(
overlayText, overlayText,
maxLines = 1, maxLines = 1,
style = TextStyle(ColorProvider(dayColor, nightColor), fontSize = (0.6 * fontSize).sp, fontFamily = FontFamily.Monospace), style = TextStyle(color = ColorProvider(Color.Black, Color.White), fontSize = (0.6 * fontSize).sp, fontFamily = FontFamily.Monospace),
modifier = GlanceModifier.background(Color(1f, 1f, 1f, 0.4f), Color(0f, 0f, 0f, 0.4f)).padding(1.dp) modifier = GlanceModifier.padding(1.dp)
) )
} else { } else {
Row(modifier = GlanceModifier.fillMaxSize(), verticalAlignment = Alignment.CenterVertically) { Row(modifier = GlanceModifier.fillMaxSize(), verticalAlignment = Alignment.CenterVertically) {
@ -87,7 +86,7 @@ fun HeadwindDirection(
provider = ImageProvider(getArrowBitmapByBearing(baseBitmap, bearing)), provider = ImageProvider(getArrowBitmapByBearing(baseBitmap, bearing)),
contentDescription = "Relative wind direction indicator", contentDescription = "Relative wind direction indicator",
contentScale = ContentScale.Fit, contentScale = ContentScale.Fit,
colorFilter = ColorFilter.tint(ColorProvider(dayColor, nightColor)) colorFilter = ColorFilter.tint(ColorProvider(Color.Black, Color.White))
) )
} }
} }
@ -96,16 +95,16 @@ fun HeadwindDirection(
Text( Text(
overlayText, overlayText,
maxLines = 1, maxLines = 1,
style = TextStyle(ColorProvider(dayColor, nightColor), fontSize = (0.65 * fontSize).sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Bold), style = TextStyle(color = ColorProvider(Color.Black, Color.White), fontSize = (0.65 * fontSize).sp, fontFamily = FontFamily.Monospace, fontWeight = FontWeight.Bold),
modifier = GlanceModifier.background(Color(1f, 1f, 1f, 0.4f), Color(0f, 0f, 0f, 0.4f)).padding(1.dp) modifier = GlanceModifier.padding(1.dp)
) )
Row(){ Row(){
Text( Text(
overlaySubText, overlaySubText,
maxLines = 1, maxLines = 1,
style = TextStyle(ColorProvider(dayColor, nightColor), fontSize = (0.4 * fontSize).sp, fontFamily = FontFamily.Monospace), style = TextStyle(color = ColorProvider(Color.Black, Color.White), fontSize = (0.4 * fontSize).sp, fontFamily = FontFamily.Monospace),
modifier = GlanceModifier.background(Color(1f, 1f, 1f, 0.4f), Color(0f, 0f, 0f, 0.4f)).padding(1.dp) modifier = GlanceModifier.padding(1.dp)
) )
} }
} }