Progress view current road

Package.resolved

@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-snapshot-testing",
       "state" : {
-        "revision" : "7b0bbbae90c41f848f90ac7b4df6c4f50068256d",
-        "version" : "1.17.5"
+        "revision" : "42a086182681cf661f5c47c9b7dc3931de18c6d7",
+        "version" : "1.17.6"
       }
     },
     {
@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/maplibre/swiftui-dsl",
       "state" : {
-        "revision" : "c39688db3aac50b523ea062b286c584123022093",
-        "version" : "0.3.0"
+        "revision" : "a6e079ce382e7860bc9105a05534f967a2f9ef65",
+        "version" : "0.3.1"
       }
     }
   ],

Package.swift

@@ -16,7 +16,7 @@ if useLocalFramework {
         path: "./common/target/ios/libferrostar-rs.xcframework"
     )
 } else {
-    let releaseTag = "0.19.0"
+    let releaseTag = "0.20.0"
     let releaseChecksum = "b3565c57b70ac72426e10e7d3c3020900c07548d0eede8200ef4d07edb617a22"
     binaryTarget = .binaryTarget(
         name: "FerrostarCoreRS",
@@ -39,7 +39,7 @@ let package = Package(
     name: "FerrostarCore",
     defaultLocalization: "en",
     platforms: [
-        .iOS(.v15),
+        .iOS(.v16),
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.

android/build.gradle

@@ -17,5 +17,5 @@ ext {
 
 allprojects {
     group = "com.stadiamaps.ferrostar"
-    version = "0.19.0"
+    version = "0.20.0"
 }

android/composeui/src/main/java/com/stadiamaps/ferrostar/composeui/theme/RoadNameViewTheme.kt

@@ -0,0 +1,35 @@
+package com.stadiamaps.ferrostar.composeui.theme
+
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+
+/** Themes for progress view components */
+interface RoadNameViewTheme {
+  /** The text style for the measurement/value. */
+  @get:Composable val textStyle: TextStyle
+  /** The background color for the view. */
+  @get:Composable val backgroundColor: Color
+  /** The border color for the view. */
+  @get:Composable val borderColor: Color
+}
+
+/**
+ * A default theme for the road name view.
+ *
+ * The text style comes from your material theme. The background properties are hard-coded based on
+ * the default polyline styling, as this doesn't have any clear analog in the material theme.
+ */
+object DefaultRoadNameViewTheme : RoadNameViewTheme {
+  override val textStyle: TextStyle
+    @Composable
+    get() =
+        MaterialTheme.typography.labelSmall.copy(color = MaterialTheme.colorScheme.inverseOnSurface)
+
+  override val backgroundColor: Color
+    @Composable get() = Color(0x35, 0x83, 0xdd)
+
+  override val borderColor: Color
+    @Composable get() = Color.White
+}

android/composeui/src/main/java/com/stadiamaps/ferrostar/composeui/theme/ArrivalViewTheme.kt → android/composeui/src/main/java/com/stadiamaps/ferrostar/composeui/theme/TripProgressViewTheme.kt

@@ -6,17 +6,17 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 
-enum class ArrivalViewStyle {
-  /** A simple arrival view with only values. */
+enum class TripProgressViewStyle {
+  /** A simple progress view with only values. */
   SIMPLIFIED,
-  /** An arrival view with label captions in addition to values. */
+  /** An progress view with label captions in addition to values. */
   INFORMATIONAL
 }
 
-/** Themes for arrival view components */
-interface ArrivalViewTheme {
+/** Themes for progress view components */
+interface TripProgressViewTheme {
   /** The text style for the step distance (or distance to step). */
-  @get:Composable val style: ArrivalViewStyle
+  @get:Composable val style: TripProgressViewStyle
   /** The text style for the measurement/value. */
   @get:Composable val measurementTextStyle: TextStyle
   /** The text style for the secondary content (label caption). */
@@ -29,9 +29,9 @@ interface ArrivalViewTheme {
   @get:Composable val backgroundColor: Color
 }
 
-object DefaultArrivalViewTheme : ArrivalViewTheme {
-  override val style: ArrivalViewStyle
-    @Composable get() = ArrivalViewStyle.SIMPLIFIED
+object DefaultTripProgressViewTheme : TripProgressViewTheme {
+  override val style: TripProgressViewStyle
+    @Composable get() = TripProgressViewStyle.SIMPLIFIED
 
   override val measurementTextStyle: TextStyle
     @Composable

android/composeui/src/main/java/com/stadiamaps/ferrostar/composeui/views/CurrentRoadView.kt

@@ -0,0 +1,57 @@
+package com.stadiamaps.ferrostar.composeui.views
+
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.stadiamaps.ferrostar.composeui.theme.DefaultRoadNameViewTheme
+import com.stadiamaps.ferrostar.composeui.theme.RoadNameViewTheme
+
+/**
+ * A view that displays the estimated arrival time, the remaining distance, and the remaining
+ * duration of a trip.
+ *
+ * @param currentRoadName The name of the current road.
+ * @param modifier The modifier to apply to this layout.
+ * @param theme The theme to use for this view.
+ * @param borderStroke The stroke to draw for the border (defaults to 1dp using the theme's
+ *   borderColor).
+ * @param shape The shape of the view (defaults to a 50% rounded corner).
+ * @param paddingValues Padding to apply around the name label to increase the shape size (defaults
+ *   to 12dp in all directions).
+ */
+@Composable
+fun CurrentRoadNameView(
+    currentRoadName: String,
+    modifier: Modifier = Modifier,
+    theme: RoadNameViewTheme = DefaultRoadNameViewTheme,
+    borderStroke: BorderStroke = BorderStroke(1.dp, theme.borderColor),
+    shape: Shape = RoundedCornerShape(50),
+    paddingValues: PaddingValues = PaddingValues(12.dp),
+) {
+  Box(
+      modifier =
+          modifier
+              .shadow(12.dp, shape = shape)
+              .background(color = theme.backgroundColor, shape = shape)
+              .border(borderStroke, shape = shape)
+              .padding(paddingValues = paddingValues)) {
+        Text(currentRoadName, style = theme.textStyle)
+      }
+}
+
+@Preview
+@Composable
+fun CurrentRoadNameViewPreview() {
+  CurrentRoadNameView("Sesame Street")
+}