diff options
| author | Albin <albin@mullvad.net> | 2023-08-01 14:21:30 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-08-01 14:21:30 +0200 |
| commit | cd919e46663211243c6ce30d7230e095b1a93a27 (patch) | |
| tree | 5a8d8529964facefb4f776ade1fdebbcfc2a882b /android | |
| parent | 1be0fc8e7eb0e9975f13322a79f47868db297e9d (diff) | |
| parent | b3bab698d80c5abf0aa5291dc7d04139a31cdcaf (diff) | |
| download | mullvadvpn-cd919e46663211243c6ce30d7230e095b1a93a27.tar.xz mullvadvpn-cd919e46663211243c6ce30d7230e095b1a93a27.zip | |
Merge branch 'fix-disconnect-button-color-alpha-value-droid-231'
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt | 8 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt index e6424a1674..377dcfb7be 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt @@ -24,7 +24,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.component.textResource -import net.mullvad.mullvadvpn.compose.theme.AlphaInactive +import net.mullvad.mullvadvpn.compose.theme.AlphaDisconnectButton import net.mullvad.mullvadvpn.compose.theme.AppTheme import net.mullvad.mullvadvpn.compose.theme.Dimens import net.mullvad.mullvadvpn.model.TunnelState @@ -133,7 +133,8 @@ private fun DisconnectButton( ), colors = ButtonDefaults.buttonColors( - containerColor = MaterialTheme.colorScheme.error.copy(alpha = AlphaInactive), + containerColor = + MaterialTheme.colorScheme.error.copy(alpha = AlphaDisconnectButton), contentColor = MaterialTheme.colorScheme.onError ), modifier = Modifier.weight(1f).height(height) @@ -158,7 +159,8 @@ private fun DisconnectButton( ), colors = IconButtonDefaults.filledIconButtonColors( - containerColor = MaterialTheme.colorScheme.error.copy(alpha = AlphaInactive), + containerColor = + MaterialTheme.colorScheme.error.copy(alpha = AlphaDisconnectButton), contentColor = MaterialTheme.colorScheme.onError ), onClick = reconnectClick, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt index 49c64f75d4..d8beb3e7ae 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt @@ -26,4 +26,5 @@ const val AlphaDisabled = 0.2f const val Alpha20 = 0.2f const val AlphaInactive = 0.4f const val AlphaDescription = 0.6f +const val AlphaDisconnectButton = 0.6f const val AlphaInvisible = 0f |