Skip to content

Commit 76b509d

Browse files
committed
Restore a connection button change
1 parent 37b5197 commit 76b509d

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt

+1-6
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import androidx.compose.runtime.remember
2121
import androidx.compose.runtime.setValue
2222
import androidx.compose.ui.Modifier
2323
import androidx.compose.ui.graphics.Color
24-
import androidx.compose.ui.graphics.compositeOver
2524
import androidx.compose.ui.layout.onGloballyPositioned
2625
import androidx.compose.ui.platform.LocalDensity
2726
import androidx.compose.ui.platform.testTag
@@ -53,7 +52,6 @@ fun ConnectionButton(
5352
if (state is TunnelState.Disconnected) {
5453
MaterialTheme.colorScheme.tertiary
5554
} else {
56-
// TODO Should we make this transparent or not?
5755
MaterialTheme.colorScheme.error.copy(alpha = AlphaDisconnectButton)
5856
}
5957

@@ -115,10 +113,7 @@ private fun PreviewConnectionButton() {
115113
ConnectionButton(
116114
text = "Disconnect",
117115
mainClick = {},
118-
containerColor =
119-
MaterialTheme.colorScheme.error
120-
.copy(alpha = AlphaDisconnectButton)
121-
.compositeOver(MaterialTheme.colorScheme.primary),
116+
containerColor = MaterialTheme.colorScheme.error.copy(alpha = AlphaDisconnectButton),
122117
contentColor = MaterialTheme.colorScheme.onError,
123118
reconnectClick = {},
124119
isReconnectButtonEnabled = true

0 commit comments

Comments
 (0)