Skip to content

Commit

Permalink
feat(android.TripDetails): Address some QA feedback from iOS review
Browse files Browse the repository at this point in the history
  • Loading branch information
KaylaBrady committed Feb 3, 2025
1 parent df13b1e commit d722c91
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ fun RoutePill(
RoutePillSpec.Content.Empty -> {}
is RoutePillSpec.Content.Text ->
Text(
pillContent.text.uppercase(),
if (route?.type == RouteType.COMMUTER_RAIL) pillContent.text
else pillContent.text.uppercase(),
modifier = finalModifier,
color = if (isActive) textColor else Color.Unspecified,
fontSize = fontSize,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ fun StopDetailsFilteredHeader(
verticalAlignment = Alignment.CenterVertically
) {
if (onPin != null) {
PinButton(pinned, colorResource(R.color.key), onPin)
PinButton(pinned, colorResource(R.color.text), onPin)
}
if (onClose != null) {
ActionButton(ActionButtonKind.Close) { onClose() }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import com.mbta.tid.mbta_app.android.state.getGlobalData
import com.mbta.tid.mbta_app.android.util.IsLoadingSheetContents
import com.mbta.tid.mbta_app.android.util.modifiers.loadingShimmer
import com.mbta.tid.mbta_app.android.util.rememberSuspend
import com.mbta.tid.mbta_app.model.RouteType
import com.mbta.tid.mbta_app.model.LoadingPlaceholders
import com.mbta.tid.mbta_app.model.ObjectCollectionBuilder
import com.mbta.tid.mbta_app.model.RouteType
import com.mbta.tid.mbta_app.model.Stop
import com.mbta.tid.mbta_app.model.TripDetailsFilter
import com.mbta.tid.mbta_app.model.TripDetailsStopList
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import androidx.compose.ui.res.colorResource
import androidx.compose.ui.semantics.contentDescription
import androidx.compose.ui.semantics.heading
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.mbta.tid.mbta_app.android.R
Expand Down Expand Up @@ -84,7 +85,11 @@ fun TripStopRow(
.weight(1F)
.placeholderIfLoading(),
color = colorResource(R.color.text),
style = MaterialTheme.typography.bodyLarge,
style =
MaterialTheme.typography.bodyLarge.copy(
fontWeight =
if (targeted) FontWeight.Bold else FontWeight.Normal
),
)
CompositionLocalProvider(
LocalContentColor provides colorResource(R.color.text)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ fun TripStops(
Text(
pluralStringResource(R.plurals.stops_away, stopsAway, stopsAway),
style = MaterialTheme.typography.bodyLarge,
modifier = Modifier.weight(1f)
)
}
if (stopsExpanded) {
Expand Down

0 comments on commit d722c91

Please sign in to comment.