summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2024-04-04 15:57:57 +0200
committerDavid Göransson <david.goransson@mullvad.net>2024-04-04 15:57:57 +0200
commit662a75f0ecd63cd09b8766b258debe1ef642c337 (patch)
tree0d4983d1e73aa8dd1e152219dbcfa0b01a888dc6
parentbe57953723f8488162f2d37160fc19e1baba7eee (diff)
parentc660099a03b48bf18f73946e207216c0a0354146 (diff)
downloadmullvadvpn-662a75f0ecd63cd09b8766b258debe1ef642c337.tar.xz
mullvadvpn-662a75f0ecd63cd09b8766b258debe1ef642c337.zip
Merge branch 'connection-blocked-text-is-green-on-connect-screen-droid-816'
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/ConnectionStatusText.kt3
1 files changed, 2 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 903bb412dc..a081b9f079 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
@@ -100,7 +100,8 @@ private fun ErrorText(isBlocking: Boolean, modifier: Modifier) {
id = if (isBlocking) R.string.blocked_connection else R.string.error_state
),
color =
- if (isBlocking) MaterialTheme.colorScheme.surface else MaterialTheme.colorScheme.error,
+ if (isBlocking) MaterialTheme.colorScheme.onPrimary
+ else MaterialTheme.colorScheme.error,
style = MaterialTheme.typography.connectionStatus,
modifier = modifier
)