More interesting data

yschimke · yschimke · commit 0378d9618d31 · 2025-11-08T12:40:45.000Z
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -89,6 +89,7 @@ dependencies {
     implementation(libs.androidx.remote.player.view)
     implementation(libs.androidx.remote.player.core)
     implementation(libs.androidx.remote.player.compose)
+    implementation(libs.androidx.wear.remote.material3)
 
     implementation(libs.koin.core)
     implementation(libs.koin.android)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.INTERNET" />
 
-    <uses-sdk tools:overrideLibrary="androidx.compose.remote.creation,androidx.compose.remote.player.compose,androidx.compose.remote.player.core,androidx.compose.remote.player.view,androidx.compose.remote.creation.compose"/>
+    <uses-sdk tools:overrideLibrary="androidx.compose.remote.creation,androidx.compose.remote.player.compose,androidx.compose.remote.player.core,androidx.compose.remote.player.view,androidx.compose.remote.creation.compose,androidx.wear.compose.remote.material3,androidx.wear.compose.material.core,androidx.wear.compose.foundation,androidx.wear.compose.material3"/>
 
     <application
             android:name=".PeopleInSpaceApplication"
diff --git a/app/src/main/java/com/surrus/peopleinspace/glance/Fetch.kt b/app/src/main/java/com/surrus/peopleinspace/glance/Fetch.kt
@@ -0,0 +1,69 @@
+package com.surrus.peopleinspace.glance
+
+import android.content.Context
+import android.graphics.Bitmap
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asImageBitmap
+import dev.johnoreilly.common.remote.IssPosition
+import dev.johnoreilly.common.repository.PeopleInSpaceRepositoryInterface
+import dev.johnoreilly.peopleinspace.R
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.osmdroid.tileprovider.MapTileProviderBasic
+import org.osmdroid.tileprovider.tilesource.TileSourceFactory
+import org.osmdroid.util.GeoPoint
+import org.osmdroid.views.Projection
+import org.osmdroid.views.drawing.MapSnapshot
+import org.osmdroid.views.overlay.IconOverlay
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+
+suspend fun fetchIssPosition(repository: PeopleInSpaceRepositoryInterface): GeoPoint {
+    val issPosition: IssPosition = repository.pollISSPosition().first()
+
+    val issPositionPoint = GeoPoint(issPosition.latitude, issPosition.longitude)
+    println("ISS Position: $issPositionPoint")
+    return issPositionPoint
+}
+
+suspend fun fetchMapBitmap(
+    issPositionPoint: GeoPoint,
+    context: Context,
+    includeStationMarker: Boolean = true,
+    zoomLevel: Double = 1.0,
+    pWidth: Int = 480,
+    pHeight: Int = 240,
+): ImageBitmap {
+    val stationMarker = IconOverlay(
+        issPositionPoint,
+        context.resources.getDrawable(R.drawable.ic_iss, context.theme)
+    )
+
+    val source = TileSourceFactory.DEFAULT_TILE_SOURCE
+    val projection = Projection(zoomLevel, pWidth, pHeight, issPositionPoint, 0f, true, false, 0, 0)
+
+    val bitmap = withContext(Dispatchers.Main) {
+        suspendCoroutine<Bitmap> { cont ->
+            val mapSnapshot = MapSnapshot(
+                {
+                    if (it.status == MapSnapshot.Status.CANVAS_OK) {
+                        val bitmap = Bitmap.createBitmap(it.bitmap)
+                        cont.resume(bitmap)
+                    }
+                },
+                MapSnapshot.INCLUDE_FLAG_UPTODATE or MapSnapshot.INCLUDE_FLAG_SCALED,
+                MapTileProviderBasic(context, source, null),
+                if (includeStationMarker) listOf(stationMarker) else listOf(),
+                projection
+            )
+
+            launch(Dispatchers.IO) {
+                mapSnapshot.run()
+            }
+        }
+    }
+    return bitmap.asImageBitmap()
+}
diff --git a/app/src/main/java/com/surrus/peopleinspace/glance/ISSMapWidget.kt b/app/src/main/java/com/surrus/peopleinspace/glance/ISSMapWidget.kt
@@ -1,8 +1,8 @@
 package dev.johnoreilly.peopleinspace.glance
 
 import android.content.Context
-import android.graphics.Bitmap
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asAndroidBitmap
 import androidx.glance.GlanceId
 import androidx.glance.GlanceModifier
 import androidx.glance.Image
@@ -14,64 +14,20 @@ import androidx.glance.appwidget.provideContent
 import androidx.glance.background
 import androidx.glance.layout.Box
 import androidx.glance.layout.fillMaxSize
-import dev.johnoreilly.common.remote.IssPosition
+import com.surrus.peopleinspace.glance.fetchIssPosition
+import com.surrus.peopleinspace.glance.fetchMapBitmap
 import dev.johnoreilly.common.repository.PeopleInSpaceRepositoryInterface
 import dev.johnoreilly.peopleinspace.MainActivity
-import dev.johnoreilly.peopleinspace.R
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
-import org.osmdroid.tileprovider.MapTileProviderBasic
-import org.osmdroid.tileprovider.tilesource.TileSourceFactory
-import org.osmdroid.util.GeoPoint
-import org.osmdroid.views.Projection
-import org.osmdroid.views.drawing.MapSnapshot
-import org.osmdroid.views.overlay.IconOverlay
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
 
 class ISSMapWidget: GlanceAppWidget(), KoinComponent {
     private val repository: PeopleInSpaceRepositoryInterface by inject()
 
     override suspend fun provideGlance(context: Context, id: GlanceId) {
-        val issPosition: IssPosition = withContext(Dispatchers.Main) {
-            repository.pollISSPosition().first()
-        }
-
-        val issPositionPoint = GeoPoint(issPosition.latitude, issPosition.longitude)
-        println("ISS Position: $issPositionPoint")
-
-        val stationMarker = IconOverlay(
-            issPositionPoint,
-            context.resources.getDrawable(R.drawable.ic_iss, context.theme)
-        )
-
-        val source = TileSourceFactory.DEFAULT_TILE_SOURCE
-        val projection = Projection(1.0, 480, 240, issPositionPoint, 0f, true, false, 0, 0)
+        val issPositionPoint = fetchIssPosition(repository)
 
-        val bitmap = withContext(Dispatchers.Main) {
-            suspendCoroutine<Bitmap> { cont ->
-                val mapSnapshot = MapSnapshot(
-                    {
-                        if (it.status == MapSnapshot.Status.CANVAS_OK) {
-                            val bitmap = Bitmap.createBitmap(it.bitmap)
-                            cont.resume(bitmap)
-                        }
-                    },
-                    MapSnapshot.INCLUDE_FLAG_UPTODATE or MapSnapshot.INCLUDE_FLAG_SCALED,
-                    MapTileProviderBasic(context, source, null),
-                    listOf(stationMarker),
-                    projection
-                )
-
-                launch(Dispatchers.IO) {
-                    mapSnapshot.run()
-                }
-            }
-        }
+        val bitmap = fetchMapBitmap(issPositionPoint, context)
 
         provideContent {
             Box(
@@ -81,7 +37,7 @@ class ISSMapWidget: GlanceAppWidget(), KoinComponent {
             ) {
                 Image(
                     modifier = GlanceModifier.fillMaxSize(),
-                    provider = ImageProvider(bitmap),
+                    provider = ImageProvider(bitmap.asAndroidBitmap()),
                     contentDescription = "ISS Location"
                 )
             }
diff --git a/app/src/main/java/com/surrus/peopleinspace/remotecompose/PeopleInSpaceCard.kt b/app/src/main/java/com/surrus/peopleinspace/remotecompose/PeopleInSpaceCard.kt
@@ -1,47 +1,93 @@
+@file:SuppressLint("RestrictedApi")
+
 package com.surrus.peopleinspace.remotecompose
 
 import android.annotation.SuppressLint
-import androidx.compose.remote.creation.compose.capture.LocalRemoteComposeCreationState
-import androidx.compose.remote.creation.compose.layout.RemoteColumn
+import android.graphics.BitmapFactory
+import androidx.compose.remote.creation.compose.layout.RemoteBox
+import androidx.compose.remote.creation.compose.layout.RemoteCanvas
 import androidx.compose.remote.creation.compose.layout.RemoteComposable
-import androidx.compose.remote.creation.compose.layout.RemoteText
-import androidx.compose.remote.creation.compose.layout.remoteComponentHeight
-import androidx.compose.remote.creation.compose.layout.remoteComponentWidth
+import androidx.compose.remote.creation.compose.layout.RemoteOffset
+import androidx.compose.remote.creation.compose.layout.rotate
 import androidx.compose.remote.creation.compose.modifier.RemoteModifier
 import androidx.compose.remote.creation.compose.modifier.background
 import androidx.compose.remote.creation.compose.modifier.fillMaxSize
-import androidx.compose.remote.creation.compose.state.RemoteColor
-import androidx.compose.remote.creation.compose.state.RemoteString
-import androidx.compose.remote.creation.compose.state.rememberRemoteIntValue
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asAndroidBitmap
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalResources
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.core.graphics.drawable.toBitmap
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat
 import com.surrus.peopleinspace.remotecompose.util.RemotePreview
+import dev.johnoreilly.peopleinspace.R
+import org.osmdroid.util.GeoPoint
 
-@SuppressLint("RestrictedApi")
 @RemoteComposable
 @Composable
-fun PeopleInSpaceCard() {
-    RemoteColumn(
+fun PeopleInSpaceCard(map: ImageBitmap, issPosition: GeoPoint) {
+    val issVectorDrawable = issVectorDrawable()
+    RemoteBox(
         modifier = RemoteModifier.fillMaxSize().background(Color.DarkGray)
     ) {
-        val state = LocalRemoteComposeCreationState.current
-        // TODO real content
-        val count = rememberRemoteIntValue { 5 }
-        val width = remoteComponentWidth(state)
-        val height = remoteComponentHeight(state)
-        val text = RemoteString("People in Space: ") + count.toRemoteString(1, 0)
-        RemoteText(text, color = RemoteColor(Color.White))
-
-        val sizeText = RemoteString("Size: ") + width.toRemoteString(3, 0) + RemoteString("x") + height.toRemoteString(1, 0)
-        RemoteText(sizeText, color = RemoteColor(Color.White))
+        val bitmap = issVectorDrawable
+            .apply {
+                setTint(Color.Black.toArgb())
+            }
+            .toBitmap(256, 256)
+
+        RemoteCanvas(modifier = RemoteModifier.fillMaxSize()) {
+            val mapBitmapId = canvas.document.addBitmap(map.asAndroidBitmap())
+            canvas.document.drawBitmap(
+                mapBitmapId,
+                0f,
+                0f,
+                remote.component.width.id,
+                remote.component.height.id,
+                null
+            )
+
+            val centerX = remote.component.centerX
+            val centerY = remote.component.centerY
+            drawCircle(Color.White.copy(alpha = 0.3f), radius = 48f, RemoteOffset(centerX, centerY))
+            drawCircle(Color.Black, radius = 48f, RemoteOffset(centerX, centerY), 1f, Stroke(1f))
+
+            val issBitmapId = canvas.document.addBitmap(bitmap)
+            val angle = remote.time.ContinuousSec() * 10f % 360f
+            rotate(angle, centerX, centerY) {
+                canvas.document.drawBitmap(
+                    issBitmapId,
+                    (centerX - 32f).id,
+                    (centerY - 32f).id,
+                    (centerX + 32f).id,
+                    (centerY + 32f).id,
+                    null
+                )
+            }
+        }
     }
 }
 
+@Composable
+private fun issVectorDrawable(): VectorDrawableCompat {
+    val drawable = VectorDrawableCompat.create(
+        LocalResources.current, R.drawable.ic_iss,
+        LocalContext.current.theme
+    )!!
+    return drawable
+}
+
 @Composable
 @Preview(widthDp = 200, heightDp = 100)
 fun PeopleInSpaceCardPreview() {
     RemotePreview {
-        PeopleInSpaceCard()
+        val previewMap =
+            BitmapFactory.decodeResource(LocalResources.current, R.drawable.anfield).asImageBitmap()
+        PeopleInSpaceCard(previewMap, GeoPoint(0.0, 0.0))
     }
 }
diff --git a/app/src/main/java/com/surrus/peopleinspace/remotecompose/PeopleInSpaceWidgetReceiver.kt b/app/src/main/java/com/surrus/peopleinspace/remotecompose/PeopleInSpaceWidgetReceiver.kt
@@ -8,32 +8,69 @@ import android.widget.RemoteViews
 import androidx.annotation.RequiresApi
 import androidx.compose.remote.creation.profile.Profile
 import androidx.compose.remote.creation.profile.RcPlatformProfiles
+import androidx.compose.ui.graphics.ImageBitmap
+import com.surrus.peopleinspace.glance.fetchIssPosition
+import com.surrus.peopleinspace.glance.fetchMapBitmap
 import com.surrus.peopleinspace.remotecompose.util.AsyncAppWidgetReceiver
 import com.surrus.peopleinspace.remotecompose.util.RemoteComposeRecorder
+import dev.johnoreilly.common.repository.PeopleInSpaceRepositoryInterface
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
 import okio.ByteString
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import org.osmdroid.util.GeoPoint
 
 @RequiresApi(Build.VERSION_CODES.BAKLAVA)
 @SuppressLint("RestrictedApi")
-class PeopleInSpaceWidgetReceiver : AsyncAppWidgetReceiver() {
+class PeopleInSpaceWidgetReceiver : AsyncAppWidgetReceiver(), KoinComponent {
+    private val repository: PeopleInSpaceRepositoryInterface by inject()
+
     /** Called when widgets must provide remote views. */
 
     override suspend fun update(context: Context, wm: AppWidgetManager, widgetIds: IntArray) {
+        // receiver context is restricted
+        val appContext = context.applicationContext
+
+        val issPosition = fetchIssPosition(repository)
+
+        coroutineScope {
+            widgetIds.forEach { widgetId ->
+                launch {
+                    val bitmap = fetchMapBitmap(
+                        issPosition,
+                        appContext,
+                        includeStationMarker = false,
+                        zoomLevel = 3.0,
+                        pWidth = 400,
+                        pHeight = 400
+                    )
 
-        val bytes = recordPeopleInSpaceCard(
-            profile = RcPlatformProfiles.WIDGETS_V6,
-            recorder = RemoteComposeRecorder(context)
-        )
+                    val bytes = recordPeopleInSpaceCard(
+                        profile = RcPlatformProfiles.WIDGETS_V6,
+                        recorder = RemoteComposeRecorder(appContext),
+                        issPosition = issPosition,
+                        map = bitmap
+                    )
 
-        val widget =
-            RemoteViews(RemoteViews.DrawInstructions.Builder(listOf(bytes.toByteArray())).build())
+                    val widget = RemoteViews(DrawInstructions(bytes))
+
+                    wm.updateAppWidget(widgetId, widget)
+                }
+            }
+        }
+    }
 
-        widgetIds.forEach { widgetId -> wm.updateAppWidget(widgetId, widget) }
+    private fun DrawInstructions(bytes: ByteString): RemoteViews.DrawInstructions {
+        return RemoteViews.DrawInstructions.Builder(listOf(bytes.toByteArray())).build()
     }
 
     suspend fun recordPeopleInSpaceCard(
         recorder: RemoteComposeRecorder,
-        profile: Profile
+        profile: Profile,
+        issPosition: GeoPoint,
+        map: ImageBitmap,
     ): ByteString {
-        return recorder.record(profile) { PeopleInSpaceCard() }
+        return recorder.record(profile) { PeopleInSpaceCard(map, issPosition) }
     }
 }
diff --git a/app/src/main/res/drawable/anfield.png b/app/src/main/res/drawable/anfield.png
diff --git a/common/src/commonMain/kotlin/dev/johnoreilly/common/repository/PeopleInSpaceRepository.kt b/common/src/commonMain/kotlin/dev/johnoreilly/common/repository/PeopleInSpaceRepository.kt
@@ -72,6 +72,8 @@ class PeopleInSpaceRepository(
                     )
                 }
             }
+        } catch (e: CancellationException) {
+            throw e
         } catch (e: Exception) {
             // TODO report error up to UI
             logger.w(e) { "Exception during fetchAndStorePeople: $e" }
@@ -83,8 +85,12 @@ class PeopleInSpaceRepository(
             while (true) {
                 try {
                     val position = peopleInSpaceApi.fetchISSPosition().iss_position
-                    emit(position)
+                    if (currentCoroutineContext().isActive) {
+                        emit(position)
+                    }
                     logger.d { position.toString() }
+                } catch (e: CancellationException) {
+                    throw e
                 } catch (e: Exception) {
                     // TODO report error up to UI
                     logger.w(e) { "Exception during pollISSPosition: $e" }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/settings.gradle.kts b/settings.gradle.kts
