Fix background color of rows

8 files changed, 9 insertions, 17 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CheckboxCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CheckboxCell.kt
index 6940172460..7bf7a2262a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CheckboxCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CheckboxCell.kt
@@ -3,11 +3,9 @@ package net.mullvad.mullvadvpn.compose.cell
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CustomPortCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CustomPortCell.kt
index 2befd75123..3c0947968f 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CustomPortCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/CustomPortCell.kt
@@ -83,7 +83,7 @@ fun CustomPortCell(
                         if (isSelected) {
                             MaterialTheme.colorScheme.selected
                         } else {
-                            MaterialTheme.colorScheme.surfaceContainerLow
+                            MaterialTheme.colorScheme.surfaceContainerHighest
                         }
                     )
                     .padding(start = Dimens.cellStartPadding)
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt
index cc9ed30d9d..23f8145292 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt
@@ -70,7 +70,7 @@ fun DnsCell(
             )
         },
         onCellClicked = { onClick.invoke() },
-        background = MaterialTheme.colorScheme.surfaceContainerLow,
+        background = MaterialTheme.colorScheme.surfaceContainerHighest,
         startPadding = startPadding,
         modifier = modifier,
     )
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ObfuscationModeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ObfuscationModeCell.kt
index 34b3c097e4..c24d975e3c 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ObfuscationModeCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ObfuscationModeCell.kt
@@ -68,7 +68,7 @@ fun ObfuscationModeCell(
             modifier
                 .height(IntrinsicSize.Min)
                 .fillMaxWidth()
-                .background(MaterialTheme.colorScheme.surfaceContainerLow)
+                .background(MaterialTheme.colorScheme.surfaceContainerHighest)
                 .let { if (testTag != null) it.testTag(testTag) else it }
                 .semantics { selected = isSelected }
     ) {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SelectableCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SelectableCell.kt
index d390e92f6a..9761f7891e 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SelectableCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SelectableCell.kt
@@ -53,7 +53,7 @@ fun SelectableCell(
     titleStyle: TextStyle = MaterialTheme.typography.labelLarge,
     startPadding: Dp = Dimens.cellStartPadding,
     selectedColor: Color = MaterialTheme.colorScheme.selected,
-    backgroundColor: Color = MaterialTheme.colorScheme.surfaceContainerLow,
+    backgroundColor: Color = MaterialTheme.colorScheme.surfaceContainerHighest,
     onSelectedColor: Color = MaterialTheme.colorScheme.onSelected,
     onBackgroundColor: Color = MaterialTheme.colorScheme.onSurface,
     onCellClicked: () -> Unit = {},
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt
index 8bbd729edd..bdf383c74e 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt
@@ -59,7 +59,7 @@ fun NormalSwitchComposeCell(
     modifier: Modifier = Modifier,
     startPadding: Dp = Dimens.indentedCellStartPadding,
     isEnabled: Boolean = true,
-    background: Color = MaterialTheme.colorScheme.surfaceContainerLow,
+    background: Color = MaterialTheme.colorScheme.surfaceContainerHighest,
     onBackground: Color = MaterialTheme.colorScheme.onSurface,
     onCellClicked: (Boolean) -> Unit,
     onInfoClicked: (() -> Unit)? = null,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt
index 0623d9f784..7baf354e0e 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt
@@ -122,7 +122,7 @@ fun FilterScreen(
                 OwnershipHeader(ownershipExpanded) { ownershipExpanded = it }
             }
             if (ownershipExpanded) {
-                itemWithDivider (key = Keys.OWNERSHIP_ALL, contentType = ContentType.ITEM) {
+                itemWithDivider(key = Keys.OWNERSHIP_ALL, contentType = ContentType.ITEM) {
                     AnyOwnership(state, { onSelectedOwnership(Constraint.Any) })
                 }
                 itemsWithDivider(
@@ -179,7 +179,7 @@ private fun LazyItemScope.AnyOwnership(state: RelayFilterUiState, onSelectedOwne
         isSelected = state.selectedOwnership is Constraint.Any,
         onCellClicked = { onSelectedOwnership() },
         modifier = Modifier.animateItem(),
-        backgroundColor = MaterialTheme.colorScheme.surfaceContainerHighest
+        backgroundColor = MaterialTheme.colorScheme.surfaceContainerHighest,
     )
 }
 
@@ -194,7 +194,7 @@ private fun LazyItemScope.Ownership(
         isSelected = ownership == state.selectedOwnership.getOrNull(),
         onCellClicked = { onSelectedOwnership(ownership) },
         modifier = Modifier.animateItem(),
-        backgroundColor = MaterialTheme.colorScheme.surfaceContainerHighest
+        backgroundColor = MaterialTheme.colorScheme.surfaceContainerHighest,
     )
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
index af5fbe8edc..6a048e8173 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
@@ -563,7 +563,7 @@ fun VpnSettingsContent(
                                 )
                             },
                             bodyView = {},
-                            background = MaterialTheme.colorScheme.surfaceContainerLow,
+                            background = MaterialTheme.colorScheme.surfaceContainerHighest,
                             startPadding = Dimens.cellStartPaddingLarge,
                         )
                     }
@@ -659,7 +659,6 @@ fun VpnSettingsContent(
                             isToggled = it.enabled,
                             isEnabled = it.featureEnabled,
                             onCellClicked = { onToggleBlockAds(it) },
-                            background = MaterialTheme.colorScheme.surfaceContainerLow,
                             startPadding = Dimens.indentedCellStartPadding,
                             modifier = Modifier.animateItem(),
                         )
@@ -672,7 +671,6 @@ fun VpnSettingsContent(
                             isToggled = it.enabled,
                             isEnabled = it.featureEnabled,
                             onCellClicked = { onToggleBlockAdultContent(it) },
-                            background = MaterialTheme.colorScheme.surfaceContainerLow,
                             startPadding = Dimens.indentedCellStartPadding,
                             modifier = Modifier.animateItem(),
                         )
@@ -684,7 +682,6 @@ fun VpnSettingsContent(
                             isToggled = it.enabled,
                             isEnabled = it.featureEnabled,
                             onCellClicked = { onToggleBlockGambling(it) },
-                            background = MaterialTheme.colorScheme.surfaceContainerLow,
                             startPadding = Dimens.indentedCellStartPadding,
                             modifier = Modifier.animateItem(),
                         )
@@ -699,7 +696,6 @@ fun VpnSettingsContent(
                             isEnabled = it.featureEnabled,
                             onCellClicked = { onToggleBlockMalware(it) },
                             onInfoClicked = { navigateToMalwareInfo() },
-                            background = MaterialTheme.colorScheme.surfaceContainerLow,
                             startPadding = Dimens.indentedCellStartPadding,
                         )
                     }
@@ -712,7 +708,6 @@ fun VpnSettingsContent(
                             isToggled = it.enabled,
                             isEnabled = it.featureEnabled,
                             onCellClicked = { onToggleBlockSocialMedia(it) },
-                            background = MaterialTheme.colorScheme.surfaceContainerLow,
                             startPadding = Dimens.indentedCellStartPadding,
                         )
                     }
@@ -725,7 +720,6 @@ fun VpnSettingsContent(
                             isToggled = it.enabled,
                             isEnabled = it.featureEnabled,
                             onCellClicked = { onToggleBlockTrackers(it) },
-                            background = MaterialTheme.colorScheme.surfaceContainerLow,
                             startPadding = Dimens.indentedCellStartPadding,
                         )
                     }