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

Revert "ref #8,9: Replace headwind widget contents with speed next to direction"

Browse Source 
This reverts commit 61317a5b3839202c081f3255beceb6038e80b6ae.
This commit is contained in:
Tim Kluge 2024-12-13 17:31:01 +01:00
parent c7fa7cd419
commit 8d30e62015
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,11 +1,14 @@
package de.timklge.karooheadwind.datatypes
import android.content.Context
import android.graphics.Bitmap
import android.graphics.BitmapFactory
import android.graphics.Canvas
import android.graphics.Paint
import android.util.Log
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.glance.ColorFilter
@ -13,14 +16,13 @@ import androidx.glance.GlanceModifier
import androidx.glance.Image
import androidx.glance.ImageProvider
import androidx.glance.appwidget.background
import androidx.glance.background
import androidx.glance.color.ColorProvider
import androidx.glance.layout.Alignment
import androidx.glance.layout.Column
import androidx.glance.layout.Box
import androidx.glance.layout.ContentScale
import androidx.glance.layout.Row
import androidx.glance.layout.fillMaxSize
import androidx.glance.layout.padding
import androidx.glance.layout.width
import androidx.glance.preview.ExperimentalGlancePreviewApi
import androidx.glance.preview.Preview
import androidx.glance.text.FontFamily
@ -69,28 +71,26 @@ fun getArrowBitmapByBearing(baseBitmap: Bitmap, bearing: Int): Bitmap {
@OptIn(ExperimentalGlancePreviewApi::class)
@Preview(widthDp = 200, heightDp = 150)
@Composable
fun HeadwindDirection(baseBitmap: Bitmap, bearing: Int, fontSize: Int, text: String) {
Row(
modifier = GlanceModifier.fillMaxSize().padding(5.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalAlignment = Alignment.CenterHorizontally
fun HeadwindDirection(baseBitmap: Bitmap, bearing: Int, fontSize: Int, overlayText: String) {
Box(
modifier = GlanceModifier.fillMaxSize().padding(3.dp),
contentAlignment = Alignment(
vertical = Alignment.Vertical.CenterVertically,
horizontal = Alignment.Horizontal.CenterHorizontally,
),
) {
Column(verticalAlignment = Alignment.Vertical.CenterVertically) {
Image(
modifier = GlanceModifier.width(60.dp),
modifier = GlanceModifier.fillMaxSize(),
provider = ImageProvider(getArrowBitmapByBearing(baseBitmap, bearing)),
contentDescription = "Relative wind direction indicator",
contentScale = ContentScale.Fit,
colorFilter = ColorFilter.tint(ColorProvider(Color.Black, Color.White))
)
}
Column(verticalAlignment = Alignment.Vertical.CenterVertically) {
Text(
text,
style = TextStyle(ColorProvider(Color.Black, Color.White), fontSize = (0.8 * fontSize).sp, fontFamily = FontFamily.Monospace),
modifier = GlanceModifier.background(Color(1f, 1f, 1f, 0.5f), Color(0f, 0f, 0f, 0.5f)).padding(2.dp)
overlayText,
style = TextStyle(ColorProvider(Color.Black, Color.White), fontSize = (0.5 * fontSize).sp, fontFamily = FontFamily.Monospace),
modifier = GlanceModifier.background(Color(1f, 1f, 1f, 0.4f), Color(0f, 0f, 0f, 0.4f)).padding(1.dp)
)
}
}
}