diff --git a/app/src/main/kotlin/de/timklge/karooheadwind/datatypes/HeadwindDirectionDataType.kt b/app/src/main/kotlin/de/timklge/karooheadwind/datatypes/HeadwindDirectionDataType.kt index 0ffdcb2..03de7e2 100644 --- a/app/src/main/kotlin/de/timklge/karooheadwind/datatypes/HeadwindDirectionDataType.kt +++ b/app/src/main/kotlin/de/timklge/karooheadwind/datatypes/HeadwindDirectionDataType.kt @@ -58,7 +58,7 @@ class HeadwindDirectionDataType( val baseBitmap = BitmapFactory.decodeResource( context.resources, - de.timklge.karooheadwind.R.drawable.arrow + de.timklge.karooheadwind.R.drawable.arrow_0 ) val configJob = CoroutineScope(Dispatchers.IO).launch { diff --git a/app/src/main/kotlin/de/timklge/karooheadwind/datatypes/HeadwindDirectionView.kt b/app/src/main/kotlin/de/timklge/karooheadwind/datatypes/HeadwindDirectionView.kt index 09a1a23..a470fab 100644 --- a/app/src/main/kotlin/de/timklge/karooheadwind/datatypes/HeadwindDirectionView.kt +++ b/app/src/main/kotlin/de/timklge/karooheadwind/datatypes/HeadwindDirectionView.kt @@ -1,14 +1,11 @@ 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 @@ -16,13 +13,14 @@ 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.Box +import androidx.glance.layout.Column 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 @@ -71,26 +69,28 @@ fun getArrowBitmapByBearing(baseBitmap: Bitmap, bearing: Int): Bitmap { @OptIn(ExperimentalGlancePreviewApi::class) @Preview(widthDp = 200, heightDp = 150) @Composable -fun HeadwindDirection(baseBitmap: Bitmap, bearing: Int, fontSize: Int, overlayText: String) { - Box( +fun HeadwindDirection(baseBitmap: Bitmap, bearing: Int, fontSize: Int, text: String) { + Row( modifier = GlanceModifier.fillMaxSize().padding(5.dp), - contentAlignment = Alignment( - vertical = Alignment.Vertical.CenterVertically, - horizontal = Alignment.Horizontal.CenterHorizontally, - ), + verticalAlignment = Alignment.CenterVertically, + horizontalAlignment = Alignment.CenterHorizontally ) { - Image( - 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) { + Image( + modifier = GlanceModifier.width(60.dp), + provider = ImageProvider(getArrowBitmapByBearing(baseBitmap, bearing)), + contentDescription = "Relative wind direction indicator", + contentScale = ContentScale.Fit, + colorFilter = ColorFilter.tint(ColorProvider(Color.Black, Color.White)) + ) + } - Text( - overlayText, - style = TextStyle(ColorProvider(Color.Black, Color.White), fontSize = (0.5 * fontSize).sp, fontFamily = FontFamily.Monospace), - modifier = GlanceModifier.background(Color(1f, 1f, 1f, 0.5f), Color(0f, 0f, 0f, 0.5f)).padding(2.dp) - ) + 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) + ) + } } } \ No newline at end of file