Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI: Improve journey card layout and time formatting #324

Merged
merged 1 commit into from
Nov 9, 2024
Merged

UI: Improve journey card layout and time formatting #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion core/date-time/src/main/kotlin/xyz/ksharma/krail/core/datetime/DateTimeHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ object DateTimeHelper {
val partialMinutes = totalMinutes - (hours * 60.minutes.inWholeMinutes)

val formattedDifference = when {
totalMinutes < 0 -> "${totalMinutes.absoluteValue} mins ago"
totalMinutes < 0 ->
"${totalMinutes.absoluteValue} " +
"${if (totalMinutes.absoluteValue == 1L) "min" else "mins"} ago"

totalMinutes == 0L -> "Now"
hours == 1L -> "In ${hours.absoluteValue}h ${partialMinutes.absoluteValue}m"
hours >= 2 -> "In ${hours.absoluteValue}h"
Expand Down
182 changes: 93 additions & 89 deletions ...ip-planner/ui/src/main/kotlin/xyz/ksharma/krail/trip/planner/ui/components/JourneyCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewLightDark
Expand Down Expand Up @@ -147,12 +149,14 @@ fun JourneyCard(
transportModeList = transportModeList,
platformNumber = platformNumber,
totalWalkTime = totalWalkTime,
modifier = Modifier.clickable(
role = Role.Button,
onClick = onClick,
interactionSource = remember { MutableInteractionSource() },
indication = null,
),
modifier = Modifier
.semantics(mergeDescendants = true) { }
.clickable(
role = Role.Button,
onClick = onClick,
interactionSource = remember { MutableInteractionSource() },
indication = null,
),
)

JourneyCardState.EXPANDED -> ExpandedJourneyCardContent(
Expand Down Expand Up @@ -195,7 +199,6 @@ fun ExpandedJourneyCardContent(
legList.filterIsInstance<TimeTableState.JourneyCardInfo.Leg.TransportLeg>().firstOrNull()
}
val context = LocalContext.current
val contentAlpha = LocalContentAlpha.current

Column(modifier = modifier) {
FlowRow(
Expand Down Expand Up @@ -223,7 +226,8 @@ fun ExpandedJourneyCardContent(
}
FlowRow(
modifier = Modifier
.fillMaxWidth(),
.fillMaxWidth()
.padding(vertical = 8.dp),
horizontalArrangement = if (totalUniqueServiceAlerts > 0) {
Arrangement.SpaceBetween
} else {
Expand All @@ -232,73 +236,33 @@ fun ExpandedJourneyCardContent(
verticalArrangement = Arrangement.spacedBy(4.dp),
) {
if (totalUniqueServiceAlerts > 0) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.align(Alignment.CenterVertically)
.background(
shape = RoundedCornerShape(50),
color = KrailTheme.colors.alert.copy(alpha = contentAlpha),
)
.clickable(
role = Role.Button,
indication = null,
interactionSource = remember { MutableInteractionSource() },
onClick = { onAlertClick() },
)
.padding(horizontal = 8.dp, vertical = 2.dp),
) {
Image(
painter = painterResource(id = R.drawable.ic_alert),
contentDescription = null,
colorFilter = ColorFilter.tint(
getForegroundColor(
KrailTheme.colors.alert.copy(
alpha = contentAlpha,
),
),
),
modifier = Modifier
.size(iconSize),
)
Text(
text = context.resources.getQuantityString(
R.plurals.alerts,
totalUniqueServiceAlerts,
totalUniqueServiceAlerts,
),
style = KrailTheme.typography.bodyMedium,
modifier = Modifier.padding(start = 6.dp),
color = getForegroundColor(KrailTheme.colors.alert),
)
}
}
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier
.align(Alignment.CenterVertically)
.padding(top = 8.dp),
) {
Image(
painter = painterResource(R.drawable.ic_clock),
contentDescription = null,
colorFilter = ColorFilter.tint(color = KrailTheme.colors.onSurface.copy(alpha = contentAlpha)),
modifier = Modifier
.padding(horizontal = 4.dp)
.align(Alignment.CenterVertically)
.size(iconSize),
)
Text(
text = totalTravelTime,
style = KrailTheme.typography.bodyLarge,
SmallButton(
icon = R.drawable.ic_alert,
text = context.resources.getQuantityString(
R.plurals.alerts,
totalUniqueServiceAlerts,
totalUniqueServiceAlerts,
),
color = getForegroundColor(KrailTheme.colors.alert),
iconSize = iconSize,
onClick = onAlertClick,
modifier = Modifier.align(Alignment.CenterVertically),
)
}

TextWithIcon(
icon = R.drawable.ic_clock,
text = totalTravelTime,
textStyle = KrailTheme.typography.bodyLarge,
iconSize = iconSize,
modifier = Modifier.align(Alignment.CenterVertically),
)
}

Spacer(
modifier = Modifier
.fillMaxWidth()
.height(8.dp),
.height(4.dp),
)

legList.forEachIndexed { _, leg ->
Expand All @@ -307,7 +271,7 @@ fun ExpandedJourneyCardContent(
WalkingLeg(
duration = leg.duration,
modifier = Modifier
.padding(vertical = 2.dp),
.padding(vertical = 8.dp, horizontal = 2.dp),
)
}

Expand All @@ -316,22 +280,16 @@ fun ExpandedJourneyCardContent(
leg.walkInterchange?.duration?.let { duration ->
WalkingLeg(
duration = duration,
modifier = Modifier.padding(vertical = 2.dp),
modifier = Modifier.padding(vertical = 8.dp, horizontal = 2.dp),
)
}
}

Spacer(
modifier = Modifier
.fillMaxWidth()
.height(8.dp),
)

if (leg.walkInterchange?.position == TimeTableState.JourneyCardInfo.WalkPosition.IDEST) {
leg.walkInterchange?.duration?.let { duration ->
WalkingLeg(
duration = duration,
modifier = Modifier.padding(vertical = 2.dp),
modifier = Modifier.padding(vertical = 8.dp, horizontal = 2.dp),
)
}
} else {
Expand All @@ -348,17 +306,11 @@ fun ExpandedJourneyCardContent(
)
}

Spacer(
modifier = Modifier
.fillMaxWidth()
.height(8.dp),
)

if (leg.walkInterchange?.position == TimeTableState.JourneyCardInfo.WalkPosition.AFTER) {
leg.walkInterchange?.duration?.let { duration ->
WalkingLeg(
duration = duration,
modifier = Modifier.padding(vertical = 2.dp),
modifier = Modifier.padding(vertical = 8.dp, horizontal = 2.dp),
)
}
}
Expand Down Expand Up @@ -497,24 +449,76 @@ private fun TextWithIcon(
icon: Int,
text: String,
modifier: Modifier = Modifier,
textStyle: TextStyle = KrailTheme.typography.bodyMedium,
color: Color = KrailTheme.colors.onSurface,
iconSize: Dp = 14.dp,
) {
val contentAlpha = LocalContentAlpha.current
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = modifier,
modifier = modifier
.semantics(mergeDescendants = true) { },
horizontalArrangement = Arrangement.spacedBy(4.dp),
) {
Image(
painter = painterResource(icon),
contentDescription = null,
colorFilter = ColorFilter.tint(color = color.copy(alpha = contentAlpha)),
modifier = Modifier
.align(Alignment.CenterVertically)
.size(iconSize.toAdaptiveSize()),
)
Text(
text = text,
style = textStyle,
color = color,
)
}
}

@Composable
private fun SmallButton(
icon: Int,
text: String,
modifier: Modifier = Modifier,
textStyle: TextStyle = KrailTheme.typography.bodyMedium,
color: Color = KrailTheme.colors.onSurface,
iconSize: Dp = 14.dp,
onClick: () -> Unit = {},
) {
val contentAlpha = LocalContentAlpha.current
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = modifier
.background(
shape = RoundedCornerShape(50),
color = KrailTheme.colors.alert.copy(alpha = contentAlpha),
)
.padding(
horizontal = 8.dp,
vertical = 2.dp,
)
.clickable(
role = Role.Button,
indication = null,
interactionSource = remember { MutableInteractionSource() },
onClick = { onClick() },
)
.semantics(mergeDescendants = true) { },
horizontalArrangement = Arrangement.spacedBy(4.dp),
) {
Image(
painter = painterResource(icon),
contentDescription = null,
colorFilter = ColorFilter.tint(color = KrailTheme.colors.onSurface.copy(alpha = contentAlpha)),
colorFilter = ColorFilter.tint(color = color.copy(alpha = contentAlpha)),
modifier = Modifier
.padding(end = 4.dp)
.align(Alignment.CenterVertically)
.size(14.dp.toAdaptiveSize()),
.size(iconSize.toAdaptiveSize()),
)
Text(
text = text,
style = KrailTheme.typography.bodyMedium,
style = textStyle,
color = color,
)
}
}
Expand Down