diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-01-29 11:41:43 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-01-29 11:41:43 +0100 |
| commit | 6c0dd68310036e52d92027810effbaeb530548fc (patch) | |
| tree | 55302c13fae80a9d8818d9ffd42c36cfbb12f205 /android | |
| parent | fafec04a2cca8479f1a3f2090d0952d16bd6c90a (diff) | |
| parent | 1b97d06e87955ee4683e56b2b138d68bca3a638c (diff) | |
| download | mullvadvpn-6c0dd68310036e52d92027810effbaeb530548fc.tar.xz mullvadvpn-6c0dd68310036e52d92027810effbaeb530548fc.zip | |
Merge branch 'fix-blocking-color'
Diffstat (limited to 'android')
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 -> |