fix(Android): use more correct colors

androidApp/src/main/java/com/mbta/tid/mbta_app/android/pages/NearbyTransitPage.kt

@@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.rememberModalBottomSheetState
@@ -32,6 +31,7 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.layout.boundsInWindow
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
@@ -43,6 +43,7 @@ import com.mapbox.maps.MapboxExperimental
 import com.mbta.tid.mbta_app.analytics.Analytics
 import com.mbta.tid.mbta_app.analytics.AnalyticsScreen
 import com.mbta.tid.mbta_app.android.ModalRoutes
+import com.mbta.tid.mbta_app.android.R
 import com.mbta.tid.mbta_app.android.SheetRoutes
 import com.mbta.tid.mbta_app.android.StopFilterParameterType
 import com.mbta.tid.mbta_app.android.TripFilterParameterType
@@ -473,7 +474,12 @@ fun NearbyTransitPage(
                         )
                     }
                 },
-                sheetContainerColor = MaterialTheme.colorScheme.surfaceContainer,
+                sheetContainerColor =
+                    when (currentNavEntry) {
+                        SheetRoutes.NearbyTransit -> colorResource(R.color.fill1)
+                        is SheetRoutes.StopDetails -> colorResource(R.color.fill2)
+                        else -> colorResource(R.color.fill1)
+                    },
                 scaffoldState = nearbyTransit.scaffoldState
             ) { sheetPadding ->
                 SearchBarOverlay(

androidApp/src/main/java/com/mbta/tid/mbta_app/android/stopDetails/StopDetailsFilteredSheetHeader.kt

@@ -1,5 +1,6 @@
 package com.mbta.tid.mbta_app.android.stopDetails
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -93,12 +94,12 @@ private fun StopDetailsFilteredHeaderPreview() {
         objects.route {
             color = "ED8B00"
             type = RouteType.HEAVY_RAIL
-            shortName = "Orange Line"
+            longName = "Orange Line"
         }
     val stop = objects.stop { name = "Back Bay" }
 
     MyApplicationTheme {
-        Column {
+        Column(Modifier.background(colorResource(R.color.fill2))) {
             StopDetailsFilteredHeader(
                 route = route,
                 line = null,

androidApp/src/main/java/com/mbta/tid/mbta_app/android/stopDetails/StopDetailsUnfilteredRoutesView.kt

@@ -9,19 +9,21 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
+import com.mbta.tid.mbta_app.analytics.Analytics
+import com.mbta.tid.mbta_app.analytics.MockAnalytics
 import com.mbta.tid.mbta_app.android.ModalRoutes
 import com.mbta.tid.mbta_app.android.MyApplicationTheme
 import com.mbta.tid.mbta_app.android.R
@@ -42,6 +44,9 @@ import com.mbta.tid.mbta_app.repositories.MockSettingsRepository
 import kotlin.time.Duration.Companion.minutes
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
+import org.koin.compose.KoinContext
+import org.koin.dsl.koinApplication
+import org.koin.dsl.module
 
 @Composable
 fun StopDetailsUnfilteredRoutesView(
@@ -58,15 +63,20 @@ fun StopDetailsUnfilteredRoutesView(
     updateStopFilter: (StopDetailsFilter?) -> Unit,
     openModal: (ModalRoutes) -> Unit
 ) {
-    Column(verticalArrangement = Arrangement.spacedBy(0.dp)) {
-        SheetHeader(onClose = onClose, title = stop.name)
-        if (servedRoutes.size > 1) {
-            Box(Modifier.height(56.dp).fillMaxWidth()) {
-                StopDetailsFilterPills(
-                    servedRoutes = servedRoutes,
-                    onTapRoutePill = onTapRoutePill,
-                    onClearFilter = { updateStopFilter(null) }
-                )
+    Column(
+        Modifier.background(colorResource(R.color.fill2)),
+        verticalArrangement = Arrangement.spacedBy(0.dp)
+    ) {
+        Column(Modifier.heightIn(min = 48.dp)) {
+            SheetHeader(onClose = onClose, title = stop.name)
+            if (servedRoutes.size > 1) {
+                Box(Modifier.height(56.dp).fillMaxWidth()) {
+                    StopDetailsFilterPills(
+                        servedRoutes = servedRoutes,
+                        onTapRoutePill = onTapRoutePill,
+                        onClearFilter = { updateStopFilter(null) }
+                    )
+                }
             }
         }
 
@@ -125,6 +135,7 @@ private fun StopDetailsRoutesViewPreview() {
         objects.route {
             color = "00843D"
             longName = "Green Line B"
+            shortName = "B"
             textColor = "FFFFFF"
             type = RouteType.LIGHT_RAIL
         }
@@ -135,7 +146,7 @@ private fun StopDetailsRoutesViewPreview() {
             textColor = "000000"
             type = RouteType.BUS
         }
-    val stop = objects.stop()
+    val stop = objects.stop { name = "Boylston" }
     val trip1 = objects.trip()
     val prediction1 =
         objects.prediction {
@@ -214,20 +225,28 @@ private fun StopDetailsRoutesViewPreview() {
             )
         )
 
+    val koin = koinApplication { modules(module { single<Analytics> { MockAnalytics() } }) }
+
     MyApplicationTheme {
-        StopDetailsUnfilteredRoutesView(
-            stop,
-            departures,
-            listOf(PillFilter.ByRoute(route1, null), PillFilter.ByRoute(route2, null)),
-            ErrorBannerViewModel(false, MockErrorBannerStateRepository(), MockSettingsRepository()),
-            showElevatorAccessibility = true,
-            now = Clock.System.now(),
-            pinRoute = {},
-            pinnedRoutes = emptySet(),
-            onClose = {},
-            onTapRoutePill = {},
-            updateStopFilter = {},
-            openModal = {}
-        )
+        KoinContext(koin.koin) {
+            StopDetailsUnfilteredRoutesView(
+                stop,
+                departures,
+                listOf(PillFilter.ByRoute(route1, null), PillFilter.ByRoute(route2, null)),
+                ErrorBannerViewModel(
+                    false,
+                    MockErrorBannerStateRepository(),
+                    MockSettingsRepository()
+                ),
+                showElevatorAccessibility = true,
+                now = Clock.System.now(),
+                pinRoute = {},
+                pinnedRoutes = emptySet(),
+                onClose = {},
+                onTapRoutePill = {},
+                updateStopFilter = {},
+                openModal = {}
+            )
+        }
     }
 }

androidApp/src/main/java/com/mbta/tid/mbta_app/android/stopDetails/TripHeaderCard.kt

@@ -18,6 +18,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -30,6 +31,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.LiveRegionMode
@@ -75,58 +77,60 @@ fun TripHeaderCard(
     onTap: (() -> Unit)? = null,
 ) {
     val clickable = onTap != null
-    Box(
-        Modifier.height(IntrinsicSize.Min).fillMaxWidth(),
-        contentAlignment = Alignment.BottomStart
-    ) {
-        Row(modifier.haloContainer(2.dp).clickable(clickable) { onTap?.let { it() } }) {
-            Box(Modifier.height(IntrinsicSize.Min)) {
-                Row(
-                    Modifier.padding(start = 30.dp, end = 16.dp).heightIn(min = 56.dp).semantics(
-                        mergeDescendants = true
+    CompositionLocalProvider(LocalContentColor provides colorResource(R.color.text)) {
+        Box(
+            Modifier.height(IntrinsicSize.Min).fillMaxWidth(),
+            contentAlignment = Alignment.BottomStart
+        ) {
+            Row(modifier.haloContainer(2.dp).clickable(clickable) { onTap?.let { it() } }) {
+                Box(Modifier.height(IntrinsicSize.Min)) {
+                    Row(
+                        Modifier.padding(start = 30.dp, end = 16.dp)
+                            .heightIn(min = 56.dp)
+                            .semantics(mergeDescendants = true) {
+                                heading()
+                                liveRegion = LiveRegionMode.Polite
+                            },
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.spacedBy(8.dp)
                     ) {
-                        heading()
-                        liveRegion = LiveRegionMode.Polite
-                    },
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.spacedBy(8.dp)
-                ) {
-                    if (spec != null) {
-                        TripMarker(spec, targetId, routeAccents)
-                        Description(
-                            spec,
-                            tripId,
-                            targetId,
-                            routeAccents,
-                            clickable,
-                            Modifier.weight(1f)
-                        )
-                        TripIndicator(spec, routeAccents, now, clickable)
-                    }
-                }
-                when (spec) {
-                    is TripHeaderSpec.Scheduled,
-                    is TripHeaderSpec.VehicleOnTrip ->
-                        Column(
-                            Modifier.zIndex(-1f).padding(start = 46.dp).fillMaxHeight(),
-                            verticalArrangement = Arrangement.spacedBy(0.dp)
-                        ) {
-                            ColoredRouteLine(Color.Unspecified, Modifier.weight(1f))
-                            ColoredRouteLine(routeAccents.color, Modifier.weight(1f))
+                        if (spec != null) {
+                            TripMarker(spec, targetId, routeAccents)
+                            Description(
+                                spec,
+                                tripId,
+                                targetId,
+                                routeAccents,
+                                clickable,
+                                Modifier.weight(1f)
+                            )
+                            TripIndicator(spec, routeAccents, now, clickable)
                         }
-                    else -> {}
+                    }
+                    when (spec) {
+                        is TripHeaderSpec.Scheduled,
+                        is TripHeaderSpec.VehicleOnTrip ->
+                            Column(
+                                Modifier.zIndex(-1f).padding(start = 46.dp).fillMaxHeight(),
+                                verticalArrangement = Arrangement.spacedBy(0.dp)
+                            ) {
+                                ColoredRouteLine(Color.Unspecified, Modifier.weight(1f))
+                                ColoredRouteLine(routeAccents.color, Modifier.weight(1f))
+                            }
+                        else -> {}
+                    }
                 }
             }
-        }
-        when (spec) {
-            is TripHeaderSpec.Scheduled,
-            is TripHeaderSpec.VehicleOnTrip ->
-                // Small 2x4 dp portion of route line over the outer card border
-                ColoredRouteLine(
-                    routeAccents.color,
-                    Modifier.zIndex(1f).padding(start = 48.dp).height(2.dp)
-                )
-            else -> {}
+            when (spec) {
+                is TripHeaderSpec.Scheduled,
+                is TripHeaderSpec.VehicleOnTrip ->
+                    // Small 2x4 dp portion of route line over the outer card border
+                    ColoredRouteLine(
+                        routeAccents.color,
+                        Modifier.zIndex(1f).padding(start = 48.dp).height(2.dp)
+                    )
+                else -> {}
+            }
         }
     }
 }
@@ -415,7 +419,8 @@ private fun LiveIndicator() {
         Image(
             painterResource(R.drawable.live_data),
             null,
-            Modifier.placeholderIfLoading().size(16.dp)
+            Modifier.placeholderIfLoading().size(16.dp),
+            colorFilter = ColorFilter.tint(LocalContentColor.current)
         )
         Text(
             stringResource(R.string.live),