diff --git a/gearslip/src/main/java/app/seb3thehacker/gearslip/car/CarToastOverlay.kt b/gearslip/src/main/java/app/seb3thehacker/gearslip/car/CarToastOverlay.kt index c2dab2a..7416e01 100644 --- a/gearslip/src/main/java/app/seb3thehacker/gearslip/car/CarToastOverlay.kt +++ b/gearslip/src/main/java/app/seb3thehacker/gearslip/car/CarToastOverlay.kt @@ -4,6 +4,7 @@ import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.widthIn +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -39,15 +40,15 @@ internal fun CarToastOverlay(modifier: Modifier = Modifier) { modifier .padding(horizontal = 24.dp, vertical = 16.dp) .widthIn(max = 560.dp) - .clip(MaterialTheme.shapes.medium) - .background(MaterialTheme.colorScheme.inverseSurface) + .clip(RoundedCornerShape(20.dp)) + .background(MaterialTheme.colorScheme.surfaceContainerHigh) .semantics { liveRegion = LiveRegionMode.Polite }, ) { Text( message.text, modifier = Modifier.padding(horizontal = 20.dp, vertical = 12.dp), - color = MaterialTheme.colorScheme.inverseOnSurface, - style = MaterialTheme.typography.bodyLarge, + color = MaterialTheme.colorScheme.onSurface, + style = MaterialTheme.typography.titleMedium, maxLines = 3, overflow = TextOverflow.Ellipsis, ) diff --git a/gearslip/src/main/java/app/seb3thehacker/gearslip/car/CarToasts.kt b/gearslip/src/main/java/app/seb3thehacker/gearslip/car/CarToasts.kt index fc8d569..84b162d 100644 --- a/gearslip/src/main/java/app/seb3thehacker/gearslip/car/CarToasts.kt +++ b/gearslip/src/main/java/app/seb3thehacker/gearslip/car/CarToasts.kt @@ -17,7 +17,8 @@ internal object CarToasts { fun show(owner: Any, text: String, duration: Int) { if (text.isBlank()) return - val durationMs = if (duration == CarToast.LENGTH_LONG) 3_500L else 2_000L + // Longer than a phone toast: the driver only glances at the screen now and then. + val durationMs = if (duration == CarToast.LENGTH_LONG) 7_000L else 4_000L current.value = Message(owner, text, durationMs) } diff --git a/gearslip/src/test/java/app/seb3thehacker/gearslip/car/CarToastsTest.kt b/gearslip/src/test/java/app/seb3thehacker/gearslip/car/CarToastsTest.kt index a25fef1..f523929 100644 --- a/gearslip/src/test/java/app/seb3thehacker/gearslip/car/CarToastsTest.kt +++ b/gearslip/src/test/java/app/seb3thehacker/gearslip/car/CarToastsTest.kt @@ -71,10 +71,10 @@ class CarToastsTest { fun unknownDurationsFallBackToShortRatherThanStayingVisible() { val owner = Any() CarToasts.show(owner, "Short", CarToast.LENGTH_SHORT) - assertEquals(2_000L, CarToasts.message.value?.durationMs) + assertEquals(4_000L, CarToasts.message.value?.durationMs) CarToasts.show(owner, "Long", CarToast.LENGTH_LONG) - assertEquals(3_500L, CarToasts.message.value?.durationMs) + assertEquals(7_000L, CarToasts.message.value?.durationMs) CarToasts.show(owner, "Unknown", Int.MAX_VALUE) - assertEquals(2_000L, CarToasts.message.value?.durationMs) + assertEquals(4_000L, CarToasts.message.value?.durationMs) } }