Show out of time instead of negative days in the top bar

mullvad · Nov 27, 2023 · 1d0895a · 1d0895a
1 parent 3281f0d
commit 1d0895a
Showing 1 changed file with 9 additions and 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
@@ -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)