Upcoming instructions android

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

@@ -1,15 +1,27 @@
 package com.stadiamaps.ferrostar.composeui.views
 
 import android.icu.util.ULocale
+import androidx.compose.animation.core.animateDpAsState
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.stadiamaps.ferrostar.composeui.formatting.DistanceFormatter
@@ -20,6 +32,7 @@ import com.stadiamaps.ferrostar.composeui.views.maneuver.ManeuverImage
 import com.stadiamaps.ferrostar.composeui.views.maneuver.ManeuverInstructionView
 import uniffi.ferrostar.ManeuverModifier
 import uniffi.ferrostar.ManeuverType
+import uniffi.ferrostar.RouteStep
 import uniffi.ferrostar.VisualInstruction
 import uniffi.ferrostar.VisualInstructionContent
 
@@ -36,23 +49,59 @@ fun InstructionsView(
     distanceToNextManeuver: Double?,
     distanceFormatter: DistanceFormatter = LocalizedDistanceFormatter(),
     theme: InstructionRowTheme = DefaultInstructionRowTheme,
-    content: @Composable () -> Unit = {
-      ManeuverImage(instructions.primaryContent, tint = MaterialTheme.colorScheme.primary)
+    remainingSteps: List<RouteStep>? = null,
+    contentBuilder: @Composable (VisualInstruction) -> Unit = {
+      ManeuverImage(it.primaryContent, tint = MaterialTheme.colorScheme.primary)
     }
 ) {
-  Column(
+  var isExpanded by remember { mutableStateOf(false) }
+  val screenHeight = LocalConfiguration.current.screenHeightDp
+  val collapsedHeight = 100.dp
+
+  val targetHeight = if (isExpanded) screenHeight.dp else collapsedHeight
+  val animatedHeight by animateDpAsState(targetValue = targetHeight)
+
+  val scrollState = rememberScrollState()
+
+  Box(
       modifier =
           Modifier.fillMaxWidth()
-              .shadow(elevation = 5.dp, RoundedCornerShape(10.dp))
+              .height(animatedHeight)
               .background(theme.backgroundColor, RoundedCornerShape(10.dp))
-              .padding(8.dp)) {
-        ManeuverInstructionView(
-            text = instructions.primaryContent.text,
-            distanceFormatter = distanceFormatter,
-            distanceToNextManeuver = distanceToNextManeuver,
-            theme = theme,
-            content = content)
-        // TODO: Secondary instructions
+              .clickable { isExpanded = !isExpanded }
+              .padding(16.dp)) {
+        Column(modifier = if (isExpanded) Modifier.verticalScroll(scrollState) else Modifier) {
+          // Primary content
+          ManeuverInstructionView(
+              text = instructions.primaryContent.text,
+              distanceFormatter = distanceFormatter,
+              distanceToNextManeuver = distanceToNextManeuver,
+              theme = theme) {
+                contentBuilder(instructions)
+              }
+
+          // TODO: Secondary content
+
+          // Expanded content
+          if (isExpanded && remainingSteps != null && remainingSteps.count() > 1) {
+            Spacer(modifier = Modifier.height(8.dp))
+            HorizontalDivider(thickness = 1.dp)
+            remainingSteps.drop(1).forEach { step ->
+              step.visualInstructions.firstOrNull()?.let { upcomingInstruction ->
+                Spacer(modifier = Modifier.height(8.dp))
+                ManeuverInstructionView(
+                    text = upcomingInstruction.primaryContent.text,
+                    distanceFormatter = distanceFormatter,
+                    distanceToNextManeuver = step.distance,
+                    theme = theme) {
+                      contentBuilder(upcomingInstruction)
+                    }
+                Spacer(modifier = Modifier.height(8.dp))
+                HorizontalDivider(thickness = 1.dp)
+              }
+            }
+          }
+        }
       }
 }
 

android/core/src/main/java/com/stadiamaps/ferrostar/core/NavigationViewModel.kt

@@ -6,13 +6,15 @@ import androidx.lifecycle.viewModelScope
 import com.stadiamaps.ferrostar.core.extensions.currentRoadName
 import com.stadiamaps.ferrostar.core.extensions.deviation
 import com.stadiamaps.ferrostar.core.extensions.progress
+import com.stadiamaps.ferrostar.core.extensions.remainingSteps
 import com.stadiamaps.ferrostar.core.extensions.visualInstruction
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import uniffi.ferrostar.GeographicCoordinate
 import uniffi.ferrostar.RouteDeviation
+import uniffi.ferrostar.RouteStep
 import uniffi.ferrostar.SpokenInstruction
 import uniffi.ferrostar.TripProgress
 import uniffi.ferrostar.TripState
@@ -49,7 +51,9 @@ data class NavigationUiState(
     /** If true, spoken instructions will not be synthesized. */
     val isMuted: Boolean?,
     /** The name of the road which the current route step is traversing. */
-    val currentStepRoadName: String?
+    val currentStepRoadName: String?,
+    /** The remaining steps in the trip (including the current step). */
+    val remainingSteps: List<RouteStep>?
 ) {
   companion object {
     fun fromFerrostar(
@@ -70,7 +74,8 @@ data class NavigationUiState(
             isCalculatingNewRoute = coreState.isCalculatingNewRoute,
             routeDeviation = coreState.tripState.deviation(),
             isMuted = isMuted,
-            currentStepRoadName = coreState.tripState.currentRoadName())
+            currentStepRoadName = coreState.tripState.currentRoadName(),
+            remainingSteps = coreState.tripState.remainingSteps())
   }
 }
 

android/core/src/main/java/com/stadiamaps/ferrostar/core/extensions/TripStateExtensions.kt

@@ -60,3 +60,15 @@ fun TripState.currentRoadName() =
       is TripState.Complete,
       TripState.Idle -> null
     }
+
+/**
+ * Get the remaining steps (including the current) in the current trip.
+ *
+ * @return The list of remaining steps (if any).
+ */
+fun TripState.remainingSteps() =
+    when (this) {
+      is TripState.Navigating -> this.remainingSteps
+      is TripState.Complete,
+      TripState.Idle -> null
+    }

android/demo-app/src/main/java/com/stadiamaps/ferrostar/DemoNavigationViewModel.kt

@@ -42,15 +42,15 @@ class DemoNavigationViewModel : ViewModel(), NavigationViewModel {
           .map { userLocation ->
             // TODO: Heading
             NavigationUiState(
-                userLocation, null, null, null, null, null, null, false, null, null, null)
+                userLocation, null, null, null, null, null, null, false, null, null, null, null)
           }
           .stateIn(
               scope = viewModelScope,
               started = SharingStarted.WhileSubscribed(),
               // TODO: Heading
               initialValue =
                   NavigationUiState(
-                      null, null, null, null, null, null, null, false, null, null, null))
+                      null, null, null, null, null, null, null, false, null, null, null, null))
 
   override fun toggleMute() {
     // Do nothing

android/maplibreui/src/main/java/com/stadiamaps/ferrostar/maplibreui/views/overlays/LandscapeNavigationOverlayView.kt

@@ -54,7 +54,9 @@ fun LandscapeNavigationOverlayView(
     Column(modifier = Modifier.fillMaxHeight().fillMaxWidth(0.5f)) {
       uiState.visualInstruction?.let { instructions ->
         InstructionsView(
-            instructions, distanceToNextManeuver = uiState.progress?.distanceToNextManeuver)
+            instructions,
+            remainingSteps = uiState.remainingSteps,
+            distanceToNextManeuver = uiState.progress?.distanceToNextManeuver)
       }
 
       Spacer(modifier = Modifier.weight(1f))

android/maplibreui/src/main/java/com/stadiamaps/ferrostar/maplibreui/views/overlays/PortraitNavigationOverlayView.kt

@@ -57,7 +57,9 @@ fun PortraitNavigationOverlayView(
   Column(modifier) {
     uiState.visualInstruction?.let { instructions ->
       InstructionsView(
-          instructions, distanceToNextManeuver = uiState.progress?.distanceToNextManeuver)
+          instructions,
+          remainingSteps = uiState.remainingSteps,
+          distanceToNextManeuver = uiState.progress?.distanceToNextManeuver)
     }
 
     val cameraIsTrackingLocation = camera.value.state is CameraState.TrackingUserLocationWithBearing