diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-11-08 11:19:33 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-11-08 11:19:33 +0100 |
| commit | 8f7b581ba3633c8ea645211197311890702c55a6 (patch) | |
| tree | 53f19a0898ae832af9605beeb7d041300178bf23 /android/app | |
| parent | 497ea3ece263727bf340b43045c918851abd031c (diff) | |
| parent | a2b505163ffcae6c7be6fbb7250854b10b27d304 (diff) | |
| download | mullvadvpn-8f7b581ba3633c8ea645211197311890702c55a6.tar.xz mullvadvpn-8f7b581ba3633c8ea645211197311890702c55a6.zip | |
Merge branch 'split-tunneling-ui-fixes-droid-457'
Diffstat (limited to 'android/app')
2 files changed, 5 insertions, 4 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt index 05709d089b..7f4ee36d47 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt @@ -207,8 +207,7 @@ class SplitTunnelingScreenTest { private const val INCLUDED_APP_PACKAGE_NAME = "included-pkg" private const val INCLUDED_APP_NAME = "Included Name" private const val TITLE = "Split tunneling" - private const val DESCRIPTION = - "Split tunneling makes it possible to select which applications should not be routed through the VPN tunnel." + private const val DESCRIPTION = "Choose the apps you want to exclude from the VPN tunnel." private const val EXCLUDED_APPLICATIONS = "Excluded applications" private const val SHOW_SYSTEM_APPS = "Show system apps" private const val ALL_APPLICATIONS = "All applications" 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 ba5dc959b6..db241664d5 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 @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.wrapContentHeight +import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.* @@ -67,7 +68,7 @@ fun SplitTunnelingCell( .wrapContentHeight() .defaultMinSize(minHeight = Dimens.listItemHeightExtra) .fillMaxWidth() - .padding(vertical = Dimens.listItemDivider) + .padding(bottom = Dimens.listItemDivider) .background( MaterialTheme.colorScheme.primary .copy(alpha = Alpha40) @@ -93,7 +94,7 @@ fun SplitTunnelingCell( .padding(horizontal = Dimens.mediumPadding, vertical = Dimens.smallPadding) .align(Alignment.CenterVertically) ) - Image( + Icon( painter = painterResource( id = @@ -104,6 +105,7 @@ fun SplitTunnelingCell( } ), contentDescription = null, + tint = MaterialTheme.colorScheme.onBackground.copy(alpha = Alpha40), modifier = Modifier.padding(end = Dimens.cellStartPadding) .align(Alignment.CenterVertically) |