summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt14
1 files changed, 9 insertions, 5 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt
index 6db5d64735..babd89271c 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt
@@ -314,11 +314,15 @@ fun MullvadTopBarWithDeviceName(
text =
stringResource(
id = R.string.top_bar_time_left,
- pluralStringResource(
- id = R.plurals.days,
- daysLeftUntilExpiry,
- daysLeftUntilExpiry
- )
+ if (daysLeftUntilExpiry >= 0) {
+ pluralStringResource(
+ id = R.plurals.days,
+ daysLeftUntilExpiry,
+ daysLeftUntilExpiry
+ )
+ } else {
+ stringResource(id = R.string.out_of_time)
+ }
),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onBackground.copy(alpha = AlphaTopBar)