diff options
| author | Albin <albin@mullvad.net> | 2023-11-27 15:39:00 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-11-27 15:39:00 +0100 |
| commit | f2add33d76a3863b4170fd105b1fe895cbc09b73 (patch) | |
| tree | 71b94de882f0463949c07e21cf58371fa989e14f /android/app | |
| parent | 3281f0d47a9efb20e9fe6585a0cb26dd89a383a0 (diff) | |
| parent | 1d0895a8f7daced87d5dd1fddff653984ab9f8b8 (diff) | |
| download | mullvadvpn-f2add33d76a3863b4170fd105b1fe895cbc09b73.tar.xz mullvadvpn-f2add33d76a3863b4170fd105b1fe895cbc09b73.zip | |
Merge branch 'replace-negative-days-with-out-of-time-droid-540'
Diffstat (limited to 'android/app')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/TopBar.kt | 14 |
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) |