diff options
Diffstat (limited to 'android/lib/ui')
2 files changed, 10 insertions, 7 deletions
diff --git a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/AnimatedNotificationBanner.kt b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/AnimatedNotificationBanner.kt index ba0a936109..62c3b5522a 100644 --- a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/AnimatedNotificationBanner.kt +++ b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/AnimatedNotificationBanner.kt @@ -18,6 +18,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.platform.testTag import androidx.compose.ui.semantics.Role @@ -184,6 +185,7 @@ private fun NotificationDot(statusLevel: StatusLevel, modifier: Modifier) { StatusLevel.Error -> MaterialTheme.colorScheme.error StatusLevel.Warning -> MaterialTheme.colorScheme.warning StatusLevel.Info -> MaterialTheme.colorScheme.tertiary + StatusLevel.None -> Color.Transparent }, shape = CircleShape, ) diff --git a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/NotificationData.kt b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/NotificationData.kt index c9bfcd887d..ed3da5b1b1 100644 --- a/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/NotificationData.kt +++ b/android/lib/ui/component/src/main/kotlin/net/mullvad/mullvadvpn/lib/ui/component/NotificationData.kt @@ -90,7 +90,7 @@ fun InAppNotification.toNotificationData( stringResource(id = R.string.new_device_notification_message, deviceName) .formatWithHtml() ), - statusLevel = StatusLevel.Info, + statusLevel = statusLevel, action = NotificationAction( Icons.Default.Clear, @@ -102,7 +102,7 @@ fun InAppNotification.toNotificationData( NotificationData( title = stringResource(id = R.string.account_credit_expires_soon), message = LocalContext.current.resources.getExpiryQuantityString(expiry), - statusLevel = StatusLevel.Error, + statusLevel = statusLevel, action = if (isPlayBuild) null else @@ -115,15 +115,15 @@ fun InAppNotification.toNotificationData( InAppNotification.TunnelStateBlocked -> NotificationData( title = stringResource(id = R.string.blocking_internet), - statusLevel = StatusLevel.Error, + statusLevel = StatusLevel.None, ) is InAppNotification.TunnelStateError -> - errorMessageBannerData(error, onClickShowWireguardPortSettings) + errorMessageBannerData(statusLevel, error, onClickShowWireguardPortSettings) is InAppNotification.UnsupportedVersion -> NotificationData( title = stringResource(id = R.string.unsupported_version), message = stringResource(id = R.string.unsupported_version_description), - statusLevel = StatusLevel.Error, + statusLevel = statusLevel, action = NotificationAction( Icons.AutoMirrored.Default.OpenInNew, @@ -150,7 +150,7 @@ fun InAppNotification.toNotificationData( contentDescription = stringResource(id = R.string.new_changelog_notification_message), ), - statusLevel = StatusLevel.Info, + statusLevel = statusLevel, action = NotificationAction( Icons.Default.Clear, @@ -162,13 +162,14 @@ fun InAppNotification.toNotificationData( @Composable private fun errorMessageBannerData( + statusLevel: StatusLevel, error: ErrorState, onClickShowWireguardPortSettings: () -> Unit, ) = NotificationData( title = error.title().formatWithHtml(), message = NotificationMessage.Text(error.message(onClickShowWireguardPortSettings)), - statusLevel = StatusLevel.Error, + statusLevel = statusLevel, ) @Composable |