diff options
| author | David Göransson <david.goransson90@gmail.com> | 2023-10-25 15:40:41 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-11-06 12:37:36 +0100 |
| commit | 19618dbad68dd86d4c5e033b5c37130dde81510e (patch) | |
| tree | 3e621475f0cdc8d371c326a04bd7370b0c99f8b0 /android | |
| parent | 231d3869bbaa9fcdb1174141111152711b8618fb (diff) | |
| download | mullvadvpn-19618dbad68dd86d4c5e033b5c37130dde81510e.tar.xz mullvadvpn-19618dbad68dd86d4c5e033b5c37130dde81510e.zip | |
Adjust switch color
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt | 12 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt | 9 |
2 files changed, 10 insertions, 11 deletions
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt index 688c3c165b..9b6dd9e492 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt @@ -131,7 +131,10 @@ class VpnSettingsScreenTest { // Arrange composeTestRule.setContentWithTheme { VpnSettingsScreen( - uiState = VpnSettingsUiState.createDefault(mtu = VALID_DUMMY_MTU_VALUE), + uiState = + VpnSettingsUiState.createDefault( + dialog = VpnSettingsDialog.Mtu(mtuEditValue = VALID_DUMMY_MTU_VALUE) + ), toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow() ) } @@ -262,9 +265,7 @@ class VpnSettingsScreenTest { toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow() ) } - // composeTestRule - // .onNodeWithTag(LAZY_LIST_TEST_TAG) - // .performScrollToNode(hasTestTag(LAZY_LIST_LAST_ITEM_TEST_TAG)) + // Assert composeTestRule.apply { onNodeWithText(DUMMY_DNS_ADDRESS).assertExists() @@ -388,9 +389,6 @@ class VpnSettingsScreenTest { toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow() ) } - // composeTestRule - // .onNodeWithTag(LAZY_LIST_TEST_TAG) - // .performScrollToNode(hasTestTag(LAZY_LIST_LAST_ITEM_TEST_TAG)) // Act composeTestRule.onNodeWithText("Add a server").performClick() diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt index e1ed80db8e..9ce6a61025 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt @@ -14,6 +14,7 @@ import androidx.compose.material3.SwitchDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.compositeOver import androidx.compose.ui.tooling.preview.Preview import net.mullvad.mullvadvpn.lib.theme.AppTheme @@ -67,18 +68,18 @@ fun MullvadSwitch( fun mullvadSwitchColors(): SwitchColors = SwitchDefaults.colors( checkedThumbColor = MaterialTheme.colorScheme.selected, - checkedTrackColor = MaterialTheme.colorScheme.primary, + checkedTrackColor = Color.Transparent, checkedBorderColor = MaterialTheme.colorScheme.onPrimary, // checkedIconColor= SwitchTokens.SelectedIconColor.toColor(), uncheckedThumbColor = MaterialTheme.colorScheme.error, - uncheckedTrackColor = MaterialTheme.colorScheme.primary, + uncheckedTrackColor = Color.Transparent, uncheckedBorderColor = MaterialTheme.colorScheme.onPrimary, // uncheckedIconColor= SwitchTokens.UnselectedIconColor.toColor(), disabledCheckedThumbColor = MaterialTheme.colorScheme.selected .copy(alpha = AlphaDisabled) .compositeOver(MaterialTheme.colorScheme.primary), - disabledCheckedTrackColor = MaterialTheme.colorScheme.primary, + disabledCheckedTrackColor = Color.Transparent, disabledCheckedBorderColor = MaterialTheme.colorScheme.onPrimary .copy(alpha = AlphaDisabled) @@ -87,7 +88,7 @@ fun mullvadSwitchColors(): SwitchColors = MaterialTheme.colorScheme.error .copy(alpha = AlphaDisabled) .compositeOver(MaterialTheme.colorScheme.primary), - disabledUncheckedTrackColor = MaterialTheme.colorScheme.primary, + disabledUncheckedTrackColor = Color.Transparent, disabledUncheckedBorderColor = MaterialTheme.colorScheme.onPrimary .copy(alpha = AlphaDisabled) |