From 104f513621c24dd4a42113ed22b38dfed8002b4b Mon Sep 17 00:00:00 2001 From: Karan Sharma <55722391+ksharma-xyz@users.noreply.github.com> Date: Mon, 18 Nov 2024 10:54:26 +1100 Subject: [PATCH] update copy text --- .../xyz/ksharma/krail/core/datetime/DateTimeHelper.kt | 6 +++--- .../krail/trip/planner/ui/usualride/UsualRideScreen.kt | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/core/date-time/src/main/kotlin/xyz/ksharma/krail/core/datetime/DateTimeHelper.kt b/core/date-time/src/main/kotlin/xyz/ksharma/krail/core/datetime/DateTimeHelper.kt index ba8080d5..b917be9a 100644 --- a/core/date-time/src/main/kotlin/xyz/ksharma/krail/core/datetime/DateTimeHelper.kt +++ b/core/date-time/src/main/kotlin/xyz/ksharma/krail/core/datetime/DateTimeHelper.kt @@ -77,9 +77,9 @@ object DateTimeHelper { "${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" - else -> "In ${totalMinutes.absoluteValue} ${if (totalMinutes.absoluteValue == 1L) "min" else "mins"}" + hours == 1L -> "in ${hours.absoluteValue}h ${partialMinutes.absoluteValue}m" + hours >= 2 -> "in ${hours.absoluteValue}h" + else -> "in ${totalMinutes.absoluteValue} ${if (totalMinutes.absoluteValue == 1L) "min" else "mins"}" } Timber.d("\t minutes: $partialMinutes, hours: $hours, formattedDifference: $formattedDifference -> originTime") return formattedDifference diff --git a/feature/trip-planner/ui/src/main/kotlin/xyz/ksharma/krail/trip/planner/ui/usualride/UsualRideScreen.kt b/feature/trip-planner/ui/src/main/kotlin/xyz/ksharma/krail/trip/planner/ui/usualride/UsualRideScreen.kt index a17a7844..351b91e9 100644 --- a/feature/trip-planner/ui/src/main/kotlin/xyz/ksharma/krail/trip/planner/ui/usualride/UsualRideScreen.kt +++ b/feature/trip-planner/ui/src/main/kotlin/xyz/ksharma/krail/trip/planner/ui/usualride/UsualRideScreen.kt @@ -84,7 +84,7 @@ fun UsualRideScreen( item { Text( - text = "What's your favourite color, mate?", + text = "What's your favourite colour, mate?", style = KrailTheme.typography.bodyMedium, modifier = Modifier .padding(horizontal = 24.dp) @@ -104,7 +104,7 @@ fun UsualRideScreen( } Text( - text = if (selectedProductClass != null) "Let's Go, Yeah!" else "Pick one.", + text = if (selectedProductClass != null) "Let's Go, Yeah!" else "Pick a colour.", modifier = Modifier .fillMaxWidth() .clip(RoundedCornerShape(topStart = 24.dp, topEnd = 24.dp)) @@ -131,7 +131,11 @@ fun UsualRideScreen( } .padding(vertical = 12.dp), textAlign = TextAlign.Center, - style = KrailTheme.typography.titleMedium, + style = if (selectedProductClass != null) { + KrailTheme.typography.titleMedium + } else { + KrailTheme.typography.bodyLarge + }, ) } }