diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-03 15:24:01 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-03 15:24:01 +0200 |
| commit | 66059ddae495b1fb173adb33cc950f6840937bb3 (patch) | |
| tree | bbf8a798cfa9c380fb2f521de6b4d74db898f2c0 /android/app/src | |
| parent | de70dee827fdc7b901e6badc84b451d1a5811c12 (diff) | |
| parent | 3bde5a6e9663eefcdf2dfd7174ab0aa168f99c28 (diff) | |
| download | mullvadvpn-66059ddae495b1fb173adb33cc950f6840937bb3.tar.xz mullvadvpn-66059ddae495b1fb173adb33cc950f6840937bb3.zip | |
Merge branch 'replace-primarycontainer-with-primary-with-alpha-droid-378'
Diffstat (limited to 'android/app/src')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt | 7 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SplitTunnelingCell.kt | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt index 5836a5aca1..855bc82982 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/RelayLocationCell.kt @@ -24,10 +24,12 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.compositeOver import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.compose.component.ChevronView +import net.mullvad.mullvadvpn.lib.theme.Alpha40 import net.mullvad.mullvadvpn.lib.theme.AlphaInactive import net.mullvad.mullvadvpn.lib.theme.AlphaInvisible import net.mullvad.mullvadvpn.lib.theme.AlphaVisible @@ -165,7 +167,10 @@ fun RelayLocationCell( when { selected -> MaterialTheme.colorScheme.inversePrimary relay.type == RelayItemType.Country -> MaterialTheme.colorScheme.primary - relay.type == RelayItemType.City -> MaterialTheme.colorScheme.primaryContainer + relay.type == RelayItemType.City -> + MaterialTheme.colorScheme.primary + .copy(alpha = Alpha40) + .compositeOver(MaterialTheme.colorScheme.background) relay.type == RelayItemType.Relay -> MaterialTheme.colorScheme.secondaryContainer else -> MaterialTheme.colorScheme.primary } 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 72cce59124..c44d5da61e 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 @@ -26,6 +26,7 @@ import androidx.compose.ui.unit.dp import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.R +import net.mullvad.mullvadvpn.lib.theme.Alpha40 import net.mullvad.mullvadvpn.lib.theme.AppTheme import net.mullvad.mullvadvpn.lib.theme.Dimens import net.mullvad.mullvadvpn.lib.theme.typeface.listItemText @@ -68,9 +69,9 @@ fun SplitTunnelingCell( .fillMaxWidth() .padding(vertical = Dimens.listItemDivider) .background( - MaterialTheme.colorScheme.primaryContainer.compositeOver( - MaterialTheme.colorScheme.background - ) + MaterialTheme.colorScheme.primary + .copy(alpha = Alpha40) + .compositeOver(MaterialTheme.colorScheme.background) ) .clickable(onClick = onCellClicked) ) { |