summaryrefslogtreecommitdiffhomepage
path: root/android/app/src
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2025-01-29 10:15:47 +0100
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2025-01-29 11:40:50 +0100
commit1b97d06e87955ee4683e56b2b138d68bca3a638c (patch)
tree55302c13fae80a9d8818d9ffd42c36cfbb12f205 /android/app/src
parentfafec04a2cca8479f1a3f2090d0952d16bd6c90a (diff)
downloadmullvadvpn-1b97d06e87955ee4683e56b2b138d68bca3a638c.tar.xz
mullvadvpn-1b97d06e87955ee4683e56b2b138d68bca3a638c.zip
Fix blocking text color
Diffstat (limited to 'android/app/src')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/ConnectionStatusText.kt2
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/ConnectUiStatePreviewParameterProvider.kt3
2 files changed, 4 insertions, 1 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/ConnectionStatusText.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/ConnectionStatusText.kt
index a5b1cff000..a308802042 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/ConnectionStatusText.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/ConnectionStatusText.kt
@@ -67,7 +67,7 @@ private fun TunnelState.textColor() =
is TunnelState.Disconnecting ->
when (actionAfterDisconnect) {
ActionAfterDisconnect.Nothing -> MaterialTheme.colorScheme.error
- ActionAfterDisconnect.Block -> MaterialTheme.colorScheme.tertiary
+ ActionAfterDisconnect.Block -> MaterialTheme.colorScheme.onSurface
ActionAfterDisconnect.Reconnect -> MaterialTheme.colorScheme.onSurface
}
is TunnelState.Error ->
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/ConnectUiStatePreviewParameterProvider.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/ConnectUiStatePreviewParameterProvider.kt
index 1c08feb6f1..b2150d0037 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/ConnectUiStatePreviewParameterProvider.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/ConnectUiStatePreviewParameterProvider.kt
@@ -24,6 +24,9 @@ private fun generateOtherStates(): Sequence<ConnectUiState> =
TunnelStatePreviewData.generateDisconnectingState(
actionAfterDisconnect = ActionAfterDisconnect.Reconnect
),
+ TunnelStatePreviewData.generateDisconnectingState(
+ actionAfterDisconnect = ActionAfterDisconnect.Block
+ ),
TunnelStatePreviewData.generateErrorState(isBlocking = true),
)
.map { state ->