Show expired instead of negative days left

mullvad · Nov 21, 2023 · 543aa7a · 543aa7a
1 parent af8439a
commit 543aa7a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 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
@@ -302,8 +302,7 @@ fun MullvadTopBarWithDeviceName(
                 text =
                     deviceName?.let {
                         stringResource(id = R.string.top_bar_device_name, deviceName)
-                    }
-                        ?: "",
+                    } ?: "",
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
                 style = MaterialTheme.typography.bodySmall,
@@ -312,14 +311,18 @@ fun MullvadTopBarWithDeviceName(
             if (daysLeftUntilExpiry != null) {
                 Text(
                     text =
-                        stringResource(
-                            id = R.string.top_bar_time_left,
-                            pluralStringResource(
-                                id = R.plurals.days,
-                                daysLeftUntilExpiry,
-                                daysLeftUntilExpiry
+                        if (daysLeftUntilExpiry >= 0) {
+                            stringResource(
+                                id = R.string.top_bar_time_left,
+                                pluralStringResource(
+                                    id = R.plurals.days,
+                                    daysLeftUntilExpiry,
+                                    daysLeftUntilExpiry
+                                )
                             )
-                        ),
+                        } else {
+                            stringResource(id = R.string.top_bar_time_left_expired)
+                        },
                     style = MaterialTheme.typography.bodySmall,
                     color = MaterialTheme.colorScheme.onBackground.copy(alpha = AlphaTopBar)
                 )

diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml
@@ -243,4 +243,5 @@
     <string name="payment_pending_dialog_message">We are currently verifying your purchase, this might take some time. Your time will be added if the verification is successful.</string>
     <string name="loading_connecting">Connecting...</string>
     <string name="loading_verifying">Verifying purchase...</string>
+    <string name="top_bar_time_left_expired">Expired</string>
 </resources>