summaryrefslogtreecommitdiffhomepage
path: root/android/app/src
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson90@gmail.com>2023-09-11 11:40:01 +0200
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2023-09-12 11:20:28 +0200
commit281805d8231a88cd1ec4c7ad81afe3c62b9ee36c (patch)
tree078f37e918e81d3d461b4374313a4c24a61425b4 /android/app/src
parentaf5a3b7227c8fb442cf3ca98bafa0e0f97e8640b (diff)
downloadmullvadvpn-281805d8231a88cd1ec4c7ad81afe3c62b9ee36c.tar.xz
mullvadvpn-281805d8231a88cd1ec4c7ad81afe3c62b9ee36c.zip
Fix alpha issue on split tunneling view
Diffstat (limited to 'android/app/src')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt13
1 files changed, 11 insertions, 2 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt
index aaf0d28838..dd5e075d70 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt
@@ -18,9 +18,11 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.graphics.compositeOver
import androidx.compose.ui.graphics.painter.BitmapPainter
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import net.mullvad.mullvadvpn.R
@@ -33,7 +35,10 @@ import org.koin.androidx.compose.get
@Composable
private fun PreviewTunnelingCell() {
AppTheme {
- Column(modifier = Modifier.background(color = MaterialTheme.colorScheme.background)) {
+ Column(
+ modifier =
+ Modifier.background(color = MaterialTheme.colorScheme.background).padding(20.dp)
+ ) {
SplitTunnelingCell(title = "Mullvad VPN", packageName = "", isSelected = false)
SplitTunnelingCell(title = "Mullvad VPN", packageName = "", isSelected = true)
}
@@ -63,7 +68,11 @@ fun SplitTunnelingCell(
.defaultMinSize(minHeight = Dimens.listItemHeightExtra)
.fillMaxWidth()
.padding(vertical = Dimens.listItemDivider)
- .background(MaterialTheme.colorScheme.primaryContainer)
+ .background(
+ MaterialTheme.colorScheme.primaryContainer.compositeOver(
+ MaterialTheme.colorScheme.background
+ )
+ )
.clickable(onClick = onCellClicked)
) {
Image(