Adjust switch color

mullvad · Nov 6, 2023 · abb2034 · abb2034
1 parent 3dccd38
commit abb2034
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/...app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt b/...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
@@ -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)