Trains full screen, bus routes on the Live map, Fleet photos, tidier Directions

- Trains: the map fills the screen, with the header and line filters over
  it as on the Live map, and the network, a train or a station in a sheet
  you pull up
- Live: tap a bus and its whole route shows, with the stops still to come
  (the last one named); the card lists the next stops with times, and
  can follow the bus or zoom to it. The floating "tap a bus" pill is gone;
  the header says how many are shown
- Fleet: each model is a card with a real photo from Wikimedia Commons
  (credited on it, tap for the source), the count over it, and its
  operators below. The model page leads with the photo too
- Directions: Now / Leave at / Arrive by as one segmented control, the
  chosen time as a chip to change it; Home set from your location shows
  its address

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

Author: claude

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

@@ -238,9 +238,11 @@ class AppViewModel(app: Application) : AndroidViewModel(app) {
         }
     }
 
-    fun selectBus(tripId: String?) {
-        if (_busTrip.value?.tripId == tripId && tripId != null) return
-        _busTrip.value = tripId?.let { BusTrip(it) }
+    /** A tapped bus's trip; [refresh] fetches its delay and position again (keeping what's shown meanwhile). */
+    fun selectBus(tripId: String?, refresh: Boolean = false) {
+        val same = _busTrip.value?.tripId == tripId && tripId != null
+        if (same && !refresh) return
+        if (!same) _busTrip.value = tripId?.let { BusTrip(it) }
         if (tripId == null) return
         viewModelScope.launch {
             val t = try { liveRepo.trip(tripId) } catch (_: Exception) { return@launch }

app/src/main/java/nz/aryan/akllive/data/Models.kt

@@ -30,7 +30,7 @@ data class FleetState(
 )
 
 /** Where a tapped bus is going and how late it's running, fetched on demand. */
-data class BusTrip(val tripId: String, val headsign: String? = null, val delay: Int? = null)
+data class BusTrip(val tripId: String, val headsign: String? = null, val delay: Int? = null, val seq: Int? = null)
 
 /** One bus due at our stop. */
 data class BusDeparture(

app/src/main/java/nz/aryan/akllive/data/Photos.kt

@@ -0,0 +1,102 @@
+package nz.aryan.akllive.data
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.util.LruCache
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import org.json.JSONObject
+import java.io.File
+import java.net.HttpURLConnection
+import java.net.URL
+import java.net.URLEncoder
+
+/** A real photo of a bus model: the image, its page on Wikimedia Commons, and who to credit. */
+class Photo(val url: String, val page: String, val credit: String)
+
+/**
+ * Photos of each bus model from Wikimedia Commons (freely licensed, credited
+ * under the photo), found by searching for the model in Auckland. Looked up
+ * once a fortnight per model and kept on the phone.
+ */
+object Photos {
+    private const val KEEP_MS = 14L * 24 * 3600 * 1000
+    private val mem = HashMap<String, Photo?>()
+    private val lock = Mutex()
+
+    suspend fun forModel(ctx: Context, m: BusModel): Photo? = lock.withLock {
+        if (mem.containsKey(m.id)) return@withLock mem[m.id]
+        val prefs = ctx.getSharedPreferences("photos", Context.MODE_PRIVATE)
+        prefs.getString(m.id, null)?.let { raw ->
+            val o = runCatching { JSONObject(raw) }.getOrNull()
+            if (o != null && System.currentTimeMillis() - o.optLong("t") < KEEP_MS) {
+                val p = o.optString("url").takeIf { it.isNotEmpty() }?.let { Photo(it, o.optString("page"), o.optString("credit")) }
+                mem[m.id] = p
+                return@withLock p
+            }
+        }
+        val found = try {
+            search("${m.name} Auckland") ?: search("${m.short} Auckland bus") ?: search("${m.name} bus")
+        } catch (e: Exception) {
+            return@withLock null                     // offline: try again next time
+        }
+        mem[m.id] = found
+        prefs.edit().putString(m.id, JSONObject().put("t", System.currentTimeMillis()).put("url", found?.url ?: "")
+            .put("page", found?.page ?: "").put("credit", found?.credit ?: "").toString()).apply()
+        found
+    }
+
+    private suspend fun search(q: String): Photo? {
+        val url = "https://commons.wikimedia.org/w/api.php?action=query&format=json&generator=search&gsrnamespace=6&gsrlimit=8" +
+            "&gsrsearch=" + URLEncoder.encode("$q filetype:bitmap", "UTF-8") +
+            "&prop=imageinfo&iiprop=url%7Cextmetadata%7Cmime&iiurlwidth=800"
+        val j = httpJson(url) as? JSONObject ?: throw java.io.IOException("Commons didn't answer")
+        val pages = j.optJSONObject("query")?.optJSONObject("pages") ?: return null
+        val best = pages.keys().asSequence().mapNotNull { pages.optJSONObject(it) }
+            .filter { p -> p.optJSONArray("imageinfo")?.optJSONObject(0)?.optString("mime")?.let { it == "image/jpeg" || it == "image/png" } == true }
+            .minByOrNull { it.optInt("index", 99) } ?: return null
+        val info = best.getJSONArray("imageinfo").getJSONObject(0)
+        val meta = info.optJSONObject("extmetadata")
+        fun field(k: String) = meta?.optJSONObject(k)?.optString("value")?.replace(Regex("<[^>]+>"), "")?.trim()?.takeIf { it.isNotEmpty() }
+        val credit = listOfNotNull(field("Artist")?.take(60), field("LicenseShortName")).joinToString(", ")
+        return Photo(info.optString("thumburl").ifEmpty { info.optString("url") }, info.optString("descriptionurl"),
+                     "Photo: " + credit.ifEmpty { "Wikimedia Commons" } + if (credit.isNotEmpty()) ", Wikimedia Commons" else "")
+    }
+}
+
+/** Downloaded images, kept in memory and on disk. */
+object Images {
+    private val mem = LruCache<String, Bitmap>(24)
+
+    suspend fun load(ctx: Context, url: String): Bitmap? = withContext(Dispatchers.IO) {
+        mem.get(url)?.let { return@withContext it }
+        val dir = File(ctx.cacheDir, "img").also { it.mkdirs() }
+        val file = File(dir, Integer.toHexString(url.hashCode()) + ".img")
+        try {
+            if (!file.exists()) {
+                val c = URL(url).openConnection() as HttpURLConnection
+                c.connectTimeout = 15_000
+                c.readTimeout = 30_000
+                c.setRequestProperty("User-Agent", "AKL-Live-Android/1.0 (github.com/intelarc/akl-live-android)")
+                try {
+                    if (c.responseCode != 200) return@withContext null
+                    val part = File(dir, file.name + ".part")
+                    c.inputStream.use { i -> part.outputStream().use { o -> i.copyTo(o) } }
+                    part.renameTo(file)
+                } finally {
+                    c.disconnect()
+                }
+            }
+            val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+            BitmapFactory.decodeFile(file.path, bounds)
+            var sample = 1
+            while (bounds.outWidth / (sample * 2) >= 900) sample *= 2
+            BitmapFactory.decodeFile(file.path, BitmapFactory.Options().apply { inSampleSize = sample })?.also { mem.put(url, it) }
+        } catch (e: Exception) {
+            null
+        }
+    }
+}

app/src/main/java/nz/aryan/akllive/data/Repos.kt

@@ -174,8 +174,8 @@ class LiveRepo(private val api: AtApi) {
         val head = headsigns[tripId] ?: api.get("/gtfs/v3/trips/$tripId")?.obj("data")?.obj("attributes")
             ?.optString("trip_headsign")?.let(::cleanHeadsign)?.takeIf { it.isNotEmpty() }
             ?.also { headsigns[tripId] = it }
-        val delay = try { tripUpdates(api, listOf(tripId))[tripId]?.delay } catch (_: Exception) { null }
-        return BusTrip(tripId, head, delay)
+        val u = try { tripUpdates(api, listOf(tripId))[tripId] } catch (_: Exception) { null }
+        return BusTrip(tripId, head, u?.delay, u?.seq)
     }
 }
 

app/src/main/java/nz/aryan/akllive/ui/AppShell.kt

@@ -160,7 +160,7 @@ private fun Screens(vm: AppViewModel, nav: NavHostController) {
         composable("live") { LiveScreen(vm, Modifier) }
         composable("trains") {
             DisposableEffect(Unit) { vm.watchTrains(true); onDispose { vm.watchTrains(false) } }
-            TrainScreen(vm, Modifier.statusBarsPadding())
+            TrainScreen(vm, Modifier)
         }
         composable("more") { MoreScreen(vm) }
         composable("search", enterTransition = { fadeIn(tween(180)) }) { SearchScreen(vm) }

app/src/main/java/nz/aryan/akllive/ui/FleetScreen.kt

@@ -58,6 +58,19 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import android.content.Intent
+import android.net.Uri
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.Image
+import androidx.compose.runtime.produceState
+import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import nz.aryan.akllive.data.Images
+import nz.aryan.akllive.data.Photo
+import nz.aryan.akllive.data.Photos
 import nz.aryan.akllive.AppViewModel
 import nz.aryan.akllive.data.BusModel
 import nz.aryan.akllive.data.Fleet
@@ -158,35 +171,55 @@ private fun BusPortrait(model: BusModel?, modifier: Modifier, frameT: State<Floa
     }
 }
 
+/**
+ * A real photo of the model (from Wikimedia Commons, credited on it) over the
+ * drawn bus, which shows until the photo's in, or if there isn't one.
+ */
+@Composable
+private fun ModelPhoto(m: BusModel?, modifier: Modifier, frameT: State<Float>? = null) {
+    val ctx = LocalContext.current
+    val photo by produceState<Photo?>(null, m?.id) { value = m?.let { Photos.forModel(ctx, it) } }
+    val bmp by produceState<ImageBitmap?>(null, photo?.url) { value = photo?.url?.let { Images.load(ctx, it)?.asImageBitmap() } }
+    Box(modifier) {
+        BusPortrait(m, Modifier.fillMaxSize(), frameT)
+        androidx.compose.animation.AnimatedVisibility(bmp != null, Modifier.fillMaxSize(), enter = fadeIn(), exit = fadeOut()) {
+            bmp?.let { Image(it, m?.name, Modifier.fillMaxSize(), contentScale = ContentScale.Crop) }
+        }
+        val p = photo
+        if (bmp != null && p != null) {
+            Text(p.credit, color = Color.White, fontSize = 9.sp, maxLines = 1, overflow = TextOverflow.Ellipsis,
+                 modifier = Modifier.align(Alignment.BottomStart).fillMaxWidth()
+                     .background(Brush.verticalGradient(listOf(Color.Transparent, Color.Black.copy(alpha = 0.55f))))
+                     .clickable { try { ctx.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(p.page))) } catch (_: Exception) { } }
+                     .padding(start = 10.dp, end = 10.dp, top = 10.dp, bottom = 4.dp))
+        }
+    }
+}
+
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun ModelCard(m: BusModel, live: List<LiveBus>, click: () -> Unit) {
-    Card(Modifier.fillMaxWidth().clickable(onClick = click), shape = RoundedCornerShape(22.dp),
-         elevation = CardDefaults.cardElevation(2.dp),
-         colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface)) {
-        Row(Modifier.padding(12.dp), verticalAlignment = Alignment.CenterVertically) {
-            BusPortrait(m, Modifier.size(width = 118.dp, height = 74.dp).clip(RoundedCornerShape(14.dp)))
-            Spacer(Modifier.width(12.dp))
-            Column(Modifier.weight(1f)) {
-                Text(m.name, fontWeight = FontWeight.Bold, style = MaterialTheme.typography.titleMedium,
-                     maxLines = 2, overflow = TextOverflow.Ellipsis)
-                Text(m.kind, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
-                Spacer(Modifier.height(6.dp))
-                FlowRow(horizontalArrangement = Arrangement.spacedBy(4.dp), verticalArrangement = Arrangement.spacedBy(4.dp)) {
-                    for ((op, _) in Fleet.numbers(m)) OperatorTag(op)
+    Card(onClick = click, modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(24.dp),
+         colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainerLow)) {
+        Box(Modifier.fillMaxWidth().height(150.dp)) {
+            ModelPhoto(m, Modifier.fillMaxSize())
+            Row(Modifier.align(Alignment.TopEnd).padding(10.dp).background(Color.Black.copy(alpha = 0.55f), RoundedCornerShape(50))
+                    .padding(horizontal = 10.dp, vertical = 4.dp), verticalAlignment = Alignment.CenterVertically) {
+                if (live.isNotEmpty()) {
+                    Box(Modifier.size(7.dp).background(Pal.Live, CircleShape))
+                    Spacer(Modifier.width(5.dp))
                 }
+                Text(if (live.isEmpty()) "None out" else "${live.size} out now", color = Color.White, fontSize = 12.sp,
+                     fontWeight = FontWeight.Bold)
             }
-            Spacer(Modifier.width(8.dp))
-            Column(horizontalAlignment = Alignment.End) {
-                Text("${live.size}", fontWeight = FontWeight.Black, fontSize = 26.sp,
-                     color = if (live.isEmpty()) MaterialTheme.colorScheme.onSurfaceVariant else MaterialTheme.colorScheme.onSurface)
-                Row(verticalAlignment = Alignment.CenterVertically) {
-                    if (live.isNotEmpty()) {
-                        Box(Modifier.size(7.dp).background(Pal.Live, CircleShape))
-                        Spacer(Modifier.width(4.dp))
-                    }
-                    Text("out now", style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
-                }
+        }
+        Column(Modifier.padding(horizontal = 16.dp, vertical = 12.dp)) {
+            Text(m.name, fontWeight = FontWeight.Bold, style = MaterialTheme.typography.titleMedium, maxLines = 1,
+                 overflow = TextOverflow.Ellipsis)
+            Text(m.kind, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
+            Spacer(Modifier.height(8.dp))
+            FlowRow(horizontalArrangement = Arrangement.spacedBy(6.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
+                for ((op, _) in Fleet.numbers(m)) OperatorTag(op)
             }
         }
     }
@@ -196,11 +229,12 @@ private fun ModelCard(m: BusModel, live: List<LiveBus>, click: () -> Unit) {
 private fun OperatorTag(name: String) {
     val code = Fleet.OPERATORS.entries.firstOrNull { it.value == name }?.key ?: ""
     val c = operatorColor(code)
-    Row(Modifier.background(c.copy(alpha = 0.14f), RoundedCornerShape(50)).padding(horizontal = 8.dp, vertical = 2.dp),
+    Row(Modifier.background(MaterialTheme.colorScheme.surfaceContainerHighest, RoundedCornerShape(50))
+            .padding(horizontal = 10.dp, vertical = 4.dp),
         verticalAlignment = Alignment.CenterVertically) {
-        Box(Modifier.size(7.dp).background(c, CircleShape))
-        Spacer(Modifier.width(4.dp))
-        Text(name, fontSize = 11.sp, fontWeight = FontWeight.Bold, color = MaterialTheme.colorScheme.onSurface)
+        Box(Modifier.size(8.dp).background(c, CircleShape))
+        Spacer(Modifier.width(6.dp))
+        Text(name, style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSurface, maxLines = 1)
     }
 }
 
@@ -249,8 +283,8 @@ private fun ModelScreen(vm: AppViewModel, id: String, all: List<LiveBus>, update
     val scroll = rememberScrollState()
 
     Column(modifier.fillMaxSize().verticalScroll(scroll)) {
-        Box(Modifier.fillMaxWidth().height(200.dp)) {
-            BusPortrait(model, Modifier.fillMaxSize(), frameT)
+        Box(Modifier.fillMaxWidth().height(230.dp)) {
+            ModelPhoto(model, Modifier.fillMaxSize(), frameT)
             IconButton(onClick = close, modifier = Modifier.padding(8.dp)
                 .background(Color.Black.copy(alpha = 0.35f), CircleShape)) {
                 Icon(Icons.AutoMirrored.Filled.ArrowBack, "Back", tint = Color.White)