diff options
| author | Kalle Lindström <karl.lindstrom@mullvad.net> | 2025-06-04 09:54:58 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2025-06-04 13:12:36 +0200 |
| commit | 6be56b704bd80f5650abac0dddb3441e9d6e4c56 (patch) | |
| tree | 1a383341d375165b581801c074f809e2f6262e35 /android | |
| parent | 68ef43f21975f0f38b8029dc6a9c951630cdfbda (diff) | |
| download | mullvadvpn-6be56b704bd80f5650abac0dddb3441e9d6e4c56.tar.xz mullvadvpn-6be56b704bd80f5650abac0dddb3441e9d6e4c56.zip | |
Fix incorrectly showing time left when data n/a
Diffstat (limited to 'android')
| -rw-r--r-- | android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt b/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt index 56b15f9616..56956af406 100644 --- a/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt +++ b/android/lib/tv/src/main/kotlin/net/mullvad/mullvadvpn/lib/tv/NavigationDrawerTv.kt @@ -216,21 +216,27 @@ private fun NavigationDrawerTvHeader( overflow = TextOverflow.Clip, ) Spacer(Modifier.height(4.dp)) - Text( - text = - stringResource( - id = R.string.top_bar_time_left, - pluralStringResource( - id = R.plurals.days, - daysLeftUntilExpiry?.toInt() ?: 0, - daysLeftUntilExpiry ?: 0, + if (daysLeftUntilExpiry != null) { + Text( + text = + stringResource( + id = R.string.top_bar_time_left, + if (daysLeftUntilExpiry >= 0) { + pluralStringResource( + id = R.plurals.days, + daysLeftUntilExpiry.toInt(), + daysLeftUntilExpiry.toInt(), + ) + } else { + stringResource(id = R.string.out_of_time) + }, ), - ), - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onPrimary, - maxLines = 1, - overflow = TextOverflow.Clip, - ) + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onPrimary, + maxLines = 1, + overflow = TextOverflow.Clip, + ) + } } } } |