Trip widget in place of favourite stops; plain search bar; train widget works in the background

- Your trip: where you're up to on a trip you've started, the rides
  ahead, when you'll get there, and End; a way to plan one otherwise.
  It takes the favourite stops widget's receiver, so a placed one turns
  into it.
- Search: just a search bar, app icon and all, straight into search.
- Train map: the phone may keep an app offline in the background, which
  left the widget without its map or trains. The map is now drawn once
  (when the app's open if need be) and kept, with the trains put on it
  each time; the trains are fetched in jobs that wait for the internet.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011C2fAvFFcMRkaF7qSvRA1v

Author: claude

README.md

@@ -140,7 +140,14 @@ journeys with 1, 2, 3 or more rides, walking between nearby stops for changes.
   many stops away it is, its model and how full it is, updated every 20 s. It
   buzzes when it's time to leave (your walk plus a lead time you choose), and
   stops itself once the bus has been.
-- **Home screen widget**: your next bus each way, refreshed in the background.
+- **Home screen widgets**:
+  - **Next bus**: your next bus each way, refreshed in the background.
+  - **Your trip**: once you start a trip, where you're up to (walk to the
+    stop, the bus is 2 stops away, 4 stops to go), the rides ahead, when you'll
+    get there, and End.
+  - **Train map**: the Trains tab's map at the widget's size, with every train
+    on it.
+  - **Search**: a search bar that opens straight into search.
 - **Quick settings tile**: "27H · 6 min" in the notification shade.
 - **App shortcuts**: long-press the icon for Directions, Live, Trains, Search
   and your favourite stops.

app/src/main/java/nz/aryan/akllive/MainActivity.kt

@@ -19,6 +19,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import nz.aryan.akllive.system.Glance
 import nz.aryan.akllive.system.Shortcuts
+import nz.aryan.akllive.system.TrainsNow
 import nz.aryan.akllive.ui.AklApp
 import kotlin.math.sqrt
 
@@ -56,6 +57,7 @@ class MainActivity : ComponentActivity(), SensorEventListener {
     override fun onStart() {
         super.onStart()
         vm.setVisible(true)
+        TrainsNow.appOpened(this)
     }
 
     override fun onResume() {

app/src/main/java/nz/aryan/akllive/system/Glance.kt

@@ -1,7 +1,10 @@
 package nz.aryan.akllive.system
 
 import android.content.Context
+import androidx.glance.appwidget.GlanceAppWidgetManager
+import androidx.work.Constraints
 import androidx.work.CoroutineWorker
+import androidx.work.NetworkType
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
@@ -91,17 +94,25 @@ object Glance {
 
     /** Refresh the widget every 15 minutes in the background (Android's shortest interval). */
     fun schedule(ctx: Context) {
-        val req = PeriodicWorkRequestBuilder<WidgetWorker>(15, TimeUnit.MINUTES).build()
-        WorkManager.getInstance(ctx).enqueueUniquePeriodicWork("next-bus-widget", ExistingPeriodicWorkPolicy.KEEP, req)
+        // run with the internet up: a job that needs it is let online even while the app's in the background
+        val req = PeriodicWorkRequestBuilder<WidgetWorker>(15, TimeUnit.MINUTES)
+            .setConstraints(Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build())
+            .build()
+        WorkManager.getInstance(ctx).enqueueUniquePeriodicWork("next-bus-widget", ExistingPeriodicWorkPolicy.UPDATE, req)
     }
 }
 
 class WidgetWorker(ctx: Context, params: WorkerParameters) : CoroutineWorker(ctx, params) {
     override suspend fun doWork(): Result {
         Glance.fetch(applicationContext)
         NextBusWidget().updateAll(applicationContext)
-        try { FavouritesWidget().updateAll(applicationContext) } catch (_: Exception) { }
-        try { TrainWidget().updateAll(applicationContext) } catch (_: Exception) { }
+        try {
+            // the trains only when there's a train widget to show them
+            if (GlanceAppWidgetManager(applicationContext).getGlanceIds(TrainWidget::class.java).isNotEmpty()) {
+                TrainsNow.get(applicationContext, fresh = true)
+                TrainWidget().updateAll(applicationContext)
+            }
+        } catch (_: Exception) { }
         return Result.success()
     }
 }

app/src/main/java/nz/aryan/akllive/system/MoreWidgets.kt

@@ -48,6 +48,13 @@ import androidx.glance.text.FontWeight
 import androidx.glance.text.Text
 import androidx.glance.text.TextStyle
 import androidx.glance.unit.ColorProvider
+import androidx.work.Constraints
+import androidx.work.CoroutineWorker
+import androidx.work.ExistingWorkPolicy
+import androidx.work.NetworkType
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkManager
+import androidx.work.WorkerParameters
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -57,8 +64,6 @@ import nz.aryan.akllive.R
 import nz.aryan.akllive.data.AtApi
 import nz.aryan.akllive.data.MapData
 import nz.aryan.akllive.data.Nz
-import nz.aryan.akllive.data.StopDeparture
-import nz.aryan.akllive.data.StopRepo
 import nz.aryan.akllive.data.Train
 import nz.aryan.akllive.data.TrainRepo
 import nz.aryan.akllive.ui.TrainArt
@@ -68,7 +73,7 @@ private fun open(ctx: Context, link: String) =
 
 // ======================= search =======================
 
-/** A search bar on the home screen: straight into search, or plan a trip. */
+/** A search bar on the home screen, like Google's: tap it and you're typing in the app's search. */
 class SearchWidget : GlanceAppWidget() {
     override val sizeMode = SizeMode.Exact
 
@@ -78,21 +83,18 @@ class SearchWidget : GlanceAppWidget() {
 
     @Composable
     private fun Body(ctx: Context) {
-        val wide = LocalSize.current.width > 250.dp
-        Row(GlanceModifier.fillMaxSize().cornerRadius(28.dp).background(GlanceTheme.colors.widgetBackground).padding(6.dp),
-            verticalAlignment = Alignment.CenterVertically) {
-            Row(GlanceModifier.defaultWeight().height(44.dp).cornerRadius(22.dp).background(GlanceTheme.colors.secondaryContainer)
-                    .padding(horizontal = 14.dp).clickable(open(ctx, "akllive://search")),
+        val size = LocalSize.current
+        val wide = size.width > 220.dp
+        val h = minOf(size.height - 8.dp, 56.dp)
+        Box(GlanceModifier.fillMaxSize(), contentAlignment = Alignment.Center) {
+            Row(GlanceModifier.fillMaxWidth().height(h).cornerRadius(28.dp).background(GlanceTheme.colors.surface)
+                    .padding(start = 10.dp, end = 16.dp).clickable(open(ctx, "akllive://search")),
                 verticalAlignment = Alignment.CenterVertically) {
-                Image(ImageProvider(R.drawable.ic_sc_search), null, GlanceModifier.size(22.dp))
-                Spacer(GlanceModifier.width(10.dp))
-                Text(if (wide) "Stops, places, routes, buses…" else "Search", maxLines = 1,
-                     style = TextStyle(color = GlanceTheme.colors.onSecondaryContainer, fontSize = 14.sp))
-            }
-            Spacer(GlanceModifier.width(6.dp))
-            Box(GlanceModifier.size(44.dp).cornerRadius(22.dp).background(GlanceTheme.colors.primary).clickable(open(ctx, "akllive://plan")),
-                contentAlignment = Alignment.Center) {
-                Image(ImageProvider(R.drawable.ic_sc_plan), "Plan a trip", GlanceModifier.size(26.dp))
+                Image(ImageProvider(R.drawable.ic_widget_logo), "AKL Live", GlanceModifier.size(30.dp))
+                Spacer(GlanceModifier.width(12.dp))
+                Text(if (wide) "Search stops, places, routes" else "Search", GlanceModifier.defaultWeight(), maxLines = 1,
+                     style = TextStyle(color = GlanceTheme.colors.onSurfaceVariant, fontSize = 16.sp))
+                Image(ImageProvider(R.drawable.ic_widget_glass), null, GlanceModifier.size(22.dp))
             }
         }
     }
@@ -102,67 +104,6 @@ class SearchWidgetReceiver : GlanceAppWidgetReceiver() {
     override val glanceAppWidget: GlanceAppWidget = SearchWidget()
 }
 
-// ======================= favourite stops =======================
-
-/** Your favourite stops, each with its next departures. */
-class FavouritesWidget : GlanceAppWidget() {
-    override val sizeMode = SizeMode.Exact
-
-    override suspend fun provideGlance(context: Context, id: GlanceId) {
-        val s = Prefs(context).load()
-        val favs = s.favs.take(3)
-        val repo = StopRepo(AtApi { s.apiKey })
-        val deps = if (s.apiKey.isBlank()) emptyMap() else favs.associate { f ->
-            f.id to (try { repo.departures(mapOf(f.id to "")) } catch (_: Exception) { null })
-        }
-        provideContent { GlanceTheme { Body(context, favs.map { it.id to it.title }, deps, s.apiKey.isBlank()) } }
-    }
-
-    @Composable
-    private fun Body(ctx: Context, favs: List<Pair<String, String>>, deps: Map<String, List<StopDeparture>?>, noKey: Boolean) {
-        val now = Nz.nowSec()
-        val rows = if (LocalSize.current.height < 170.dp) 1 else 2
-        Column(GlanceModifier.fillMaxSize().cornerRadius(24.dp).background(GlanceTheme.colors.widgetBackground).padding(14.dp)
-                   .clickable(open(ctx, "akllive://home"))) {
-            Row(GlanceModifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically) {
-                Text("★  Favourite stops", GlanceModifier.defaultWeight(),
-                     style = TextStyle(color = GlanceTheme.colors.onSurface, fontWeight = FontWeight.Bold, fontSize = 14.sp))
-                Text("↻", GlanceModifier.clickable(actionRunCallback<RefreshMore>()),
-                     style = TextStyle(color = GlanceTheme.colors.primary, fontWeight = FontWeight.Bold, fontSize = 18.sp))
-            }
-            when {
-                noKey -> Text("Open AKL Live and add your AT key", style = TextStyle(color = GlanceTheme.colors.onSurfaceVariant, fontSize = 13.sp))
-                favs.isEmpty() -> Text("Star a stop in the app and it shows up here", style = TextStyle(color = GlanceTheme.colors.onSurfaceVariant, fontSize = 13.sp))
-                else -> for ((id, title) in favs) {
-                    Spacer(GlanceModifier.height(8.dp))
-                    Column(GlanceModifier.fillMaxWidth().clickable(open(ctx, "akllive://stop/" + Uri.encode(id)))) {
-                        Text(title, maxLines = 1, style = TextStyle(color = GlanceTheme.colors.onSurfaceVariant, fontSize = 11.sp, fontWeight = FontWeight.Medium))
-                        val list = deps[id]
-                        if (list.isNullOrEmpty()) Text(if (list == null) "Couldn't load" else "Nothing for a while",
-                                                       style = TextStyle(color = GlanceTheme.colors.onSurfaceVariant, fontSize = 12.sp))
-                        else list.filter { !it.cancelled }.take(rows).forEach { d ->
-                            Row(GlanceModifier.fillMaxWidth().padding(top = 2.dp), verticalAlignment = Alignment.CenterVertically) {
-                                Box(GlanceModifier.cornerRadius(8.dp).background(GlanceTheme.colors.primary).padding(horizontal = 6.dp, vertical = 1.dp)) {
-                                    Text(d.route, style = TextStyle(color = GlanceTheme.colors.onPrimary, fontWeight = FontWeight.Bold, fontSize = 12.sp))
-                                }
-                                Spacer(GlanceModifier.width(6.dp))
-                                Text(d.headsign, GlanceModifier.defaultWeight(), maxLines = 1,
-                                     style = TextStyle(color = GlanceTheme.colors.onSurface, fontSize = 12.sp))
-                                Text(mins(d.expected - now), style = TextStyle(color = GlanceTheme.colors.primary, fontWeight = FontWeight.Bold, fontSize = 13.sp))
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-class FavouritesWidgetReceiver : GlanceAppWidgetReceiver() {
-    override val glanceAppWidget: GlanceAppWidget = FavouritesWidget()
-    override fun onEnabled(context: Context) { super.onEnabled(context); Glance.schedule(context) }
-}
-
 // ======================= the train map =======================
 
 /** The train map, as the app draws it, with every train on it, live. */
@@ -200,7 +141,7 @@ class TrainWidget : GlanceAppWidget() {
                 Text("Ngā Tereina", GlanceModifier.defaultWeight(),
                      style = TextStyle(color = ColorProvider(Color.White), fontWeight = FontWeight.Bold, fontSize = 15.sp))
                 Text(when {
-                    trains == null -> "Open the app first"
+                    trains == null -> "Tap ↻ for trains"
                     else -> "${trains.size} running · ${Nz.time(TrainsNow.at)}"
                 }, style = TextStyle(color = ColorProvider(Color(0xFFE6ECF5)), fontSize = 11.sp))
                 Spacer(GlanceModifier.width(8.dp))
@@ -242,8 +183,26 @@ object TrainsNow {
         }
     }
 
-    suspend fun get(ctx: Context): List<Train>? {
-        if (list != null && Nz.nowSec() - at < 60) return list
+    /** The app's been opened: a good time to draw the widget's map, with the internet sure to be there. */
+    fun appOpened(ctx: Context) {
+        val now = System.currentTimeMillis()
+        if (now - lastOpen < 10 * 60_000) return
+        lastOpen = now
+        val app = ctx.applicationContext
+        CoroutineScope(Dispatchers.Default).launch { try { TrainWidget().updateAll(app) } catch (_: Exception) { } }
+    }
+    private var lastOpen = 0L
+
+    /** Fetch and redraw in a job that waits for the internet. */
+    fun refresh(ctx: Context) {
+        val req = OneTimeWorkRequestBuilder<TrainWidgetWorker>()
+            .setConstraints(Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build())
+            .build()
+        WorkManager.getInstance(ctx).enqueueUniqueWork("train-widget-refresh", ExistingWorkPolicy.REPLACE, req)
+    }
+
+    suspend fun get(ctx: Context, fresh: Boolean = false): List<Train>? {
+        if (!fresh && list != null && Nz.nowSec() - at < 60) return list
         val s = Prefs(ctx).load()
         if (s.apiKey.isBlank()) return list
         val r = repo ?: TrainRepo(AtApi { Prefs(ctx).load().apiKey }).also { repo = it }
@@ -300,16 +259,18 @@ private fun drawTrains(trains: List<Train>): Bitmap {
     return bmp
 }
 
-private fun mins(secs: Long) = when {
-    secs < 45 -> "Due"
-    secs < 3600 -> "${secs / 60} min"
-    else -> "${secs / 3600} h"
-}
-
-/** ↻ on the favourites or train widget. */
+/** ↻ on the train widget: fetched in a job, which gets the internet even when the app's in the background. */
 class RefreshMore : ActionCallback {
     override suspend fun onAction(context: Context, glanceId: GlanceId, parameters: ActionParameters) {
-        FavouritesWidget().updateAll(context)
-        TrainWidget().updateAll(context)
+        TrainsNow.refresh(context)
+    }
+}
+
+/** Fetches the trains and redraws the train widget. */
+class TrainWidgetWorker(ctx: Context, params: WorkerParameters) : CoroutineWorker(ctx, params) {
+    override suspend fun doWork(): Result {
+        TrainsNow.get(applicationContext, fresh = true)
+        TrainWidget().updateAll(applicationContext)
+        return Result.success()
     }
 }

app/src/main/java/nz/aryan/akllive/system/TripService.kt

@@ -68,6 +68,7 @@ class TripService : Service(), LocationListener {
         } catch (e: Exception) {
             // location isn't allowed: nothing to follow you with
             TripTracker.clear()
+            TripWidget.nudge(this, force = true)
             stopSelf()
             return START_NOT_STICKY
         }
@@ -104,6 +105,7 @@ class TripService : Service(), LocationListener {
         if (gps) lastGps = t else if (t - lastGps < 15_000) return
         val events = TripTracker.onFix(loc.latitude, loc.longitude, if (loc.hasSpeed()) loc.speed else null, loc.accuracy)
         post(build(), NID)
+        TripWidget.nudge(this, force = events.isNotEmpty())
         events.forEach { alert(it) }
         if (events.any { it is TripEvent.Arrived }) scope.launch { delay(90_000); TripTracker.clear(); finish() }
     }
@@ -124,6 +126,7 @@ class TripService : Service(), LocationListener {
             val ids = TripTracker.watching()
             if (ids.isNotEmpty()) try { TripTracker.setLive(liveFor(api, ids)) } catch (_: Exception) { }
             post(build(), NID)
+            TripWidget.nudge(this)
             delay(15_000)
         }
     }
@@ -192,6 +195,7 @@ class TripService : Service(), LocationListener {
 
     private fun finish() {
         poll?.cancel()
+        TripWidget.nudge(this, force = true)
         try { getSystemService(LocationManager::class.java)?.removeUpdates(this) } catch (_: Exception) { }
         ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
         stopSelf()

app/src/main/java/nz/aryan/akllive/system/TripTracker.kt

@@ -69,11 +69,14 @@ object TripTracker {
         _state.value = TripProgress(it, from, to, 0, if (it.legs.firstOrNull() is RideLeg) Phase.Waiting else Phase.Walking,
                                     headline = "Finding you…", detail = "Waiting for a GPS fix", updated = Nz.nowSec())
         ContextCompat.startForegroundService(ctx, Intent(ctx, TripService::class.java))
+        TripWidget.nudge(ctx, force = true)
     }
 
     fun stop(ctx: Context) {
-        ctx.startService(Intent(ctx, TripService::class.java).setAction(TripService.ACTION_STOP))
+        // the service may already be gone (the trip finished on its own)
+        try { ctx.startService(Intent(ctx, TripService::class.java).setAction(TripService.ACTION_STOP)) } catch (_: Exception) { }
         _state.value = TripProgress()
+        TripWidget.nudge(ctx, force = true)
     }
 
     internal fun clear() { _state.value = TripProgress() }