Merge branch 'improve-visiblility-of-disabled-items-droid-95'

2 files changed, 8 insertions, 7 deletions

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 e41fed10ad..79d5209a7f 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
@@ -51,20 +51,21 @@ fun SwitchComposeCell(
     onCellClicked: (Boolean) -> Unit = {},
     onInfoClicked: (() -> Unit)? = null
 ) {
-    val alpha = if (isEnabled) AlphaActive else AlphaInactive
-    val titleModifier = Modifier.alpha(alpha)
-    val bodyViewModifier = Modifier.alpha(alpha)
     val subtitleModifier = Modifier
 
     BaseCell(
-        title = { SwitchCellTitle(title = title, modifier = titleModifier) },
+        title = {
+            SwitchCellTitle(
+                title = title,
+                modifier = Modifier.alpha(if (isEnabled) AlphaActive else AlphaInactive)
+            )
+        },
         isRowEnabled = isEnabled,
         bodyView = {
             SwitchCellView(
                 onSwitchClicked = null,
                 isEnabled = isEnabled,
                 isToggled = isToggled,
-                modifier = bodyViewModifier,
                 onInfoClicked = onInfoClicked
             )
         },
@@ -91,7 +92,7 @@ fun SwitchCellTitle(title: String, modifier: Modifier) {
 fun SwitchCellView(
     isEnabled: Boolean,
     isToggled: Boolean,
-    modifier: Modifier,
+    modifier: Modifier = Modifier,
     onSwitchClicked: ((Boolean) -> Unit)? = null,
     onInfoClicked: (() -> Unit)? = null
 ) {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt
index 503fc4dd02..27ae19b402 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt
@@ -19,4 +19,4 @@ val MullvadWhite40 = Color(0x66FFFFFF)
 val MullvadWhite60 = Color(0x99FFFFFF)
 
 const val AlphaActive = 1f
-const val AlphaInactive = 0.2f
+const val AlphaInactive = 0.4f