From 8d30e62015a42feeb0b639ee0ec61664d28db15a Mon Sep 17 00:00:00 2001
From: Tim Kluge <timklge@gmail.com>
Date: Fri, 13 Dec 2024 17:31:01 +0100
Subject: [PATCH] Revert "ref #8,9: Replace headwind widget contents with speed
 next to direction"

This reverts commit 61317a5b3839202c081f3255beceb6038e80b6ae.
---
 .../datatypes/HeadwindDirectionDataType.kt    |  2 +-
 .../datatypes/HeadwindDirectionView.kt        | 48 +++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

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 03de7e2..0ffdcb2 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_0
+            de.timklge.karooheadwind.R.drawable.arrow
         )
 
         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 a470fab..44fa684 100644
--- a/app/src/main/kotlin/de/timklge/karooheadwind/datatypes/HeadwindDirectionView.kt
+++ b/app/src/main/kotlin/de/timklge/karooheadwind/datatypes/HeadwindDirectionView.kt
@@ -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),
-                provider = ImageProvider(getArrowBitmapByBearing(baseBitmap, bearing)),
-                contentDescription = "Relative wind direction indicator",
-                contentScale = ContentScale.Fit,
-                colorFilter = ColorFilter.tint(ColorProvider(Color.Black, Color.White))
-            )
-        }
+        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) {
-            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)
-            )
-        }
+        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.4f), Color(0f, 0f, 0f, 0.4f)).padding(1.dp)
+        )
     }
 }
\ No newline at end of file