Remove usage of background

5 files changed, 3 insertions, 13 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/IconCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/IconCell.kt
index da2aeaed31..1a5f4e1030 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/IconCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/IconCell.kt
@@ -52,9 +52,11 @@ fun IconCell(
     titleStyle: TextStyle = MaterialTheme.typography.bodyLarge,
     titleColor: Color = MaterialTheme.colorScheme.onPrimary,
     onClick: () -> Unit = {},
-    background: Color = MaterialTheme.colorScheme.primary,
     enabled: Boolean = true,
 ) {
+    // Using a transparent background to avoid using the default background from BaseCell
+    val background: Color = Color.Transparent
+
     BaseCell(
         headlineContent = {
             Row(modifier = Modifier.weight(1f), verticalAlignment = Alignment.CenterVertically) {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheet.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheet.kt
index 083a271dfd..af2dea81cd 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheet.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/AddTimeBottomSheet.kt
@@ -459,8 +459,6 @@ private fun Products(
                 onBackgroundColor.copy(
                     alpha = if (internetBlocked) AlphaDisabled else AlphaVisible
                 ),
-            background =
-                backgroundColor.copy(alpha = if (internetBlocked) AlphaDisabled else AlphaVisible),
             enabled = !internetBlocked,
             endIcon = {
                 Icon(
@@ -486,7 +484,6 @@ private fun Products(
             onRedeemVoucherClick()
             closeBottomSheet(true)
         },
-        background = backgroundColor,
     )
 }
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt
index 87b196e990..ac7eb140fc 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt
@@ -162,7 +162,6 @@ private fun PaymentAvailable(
         Column {
             billingPaymentState.products.forEach { product ->
                 IconCell(
-                    background = MaterialTheme.colorScheme.surfaceContainer,
                     titleColor =
                         if (enabled) {
                             MaterialTheme.colorScheme.onSurface
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
index a7355a0676..ae80cb07f7 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
@@ -283,7 +283,6 @@ private fun ImportOverridesByBottomSheet(
                 onImportByFile()
                 onCloseSheet()
             },
-            background = backgroundColor,
             modifier = Modifier.testTag(SERVER_IP_OVERRIDES_IMPORT_BY_FILE_TEST_TAG),
         )
         IconCell(
@@ -293,7 +292,6 @@ private fun ImportOverridesByBottomSheet(
                 onImportByText()
                 onCloseSheet()
             },
-            background = backgroundColor,
             modifier = Modifier.testTag(SERVER_IP_OVERRIDES_IMPORT_BY_TEXT_TEST_TAG),
         )
         if (overridesActive) {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/LocationBottomSheet.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/LocationBottomSheet.kt
index 29870b710b..2cc07cfa86 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/LocationBottomSheet.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/LocationBottomSheet.kt
@@ -151,7 +151,6 @@ private fun LocationBottomSheet(
                     onAddLocationToList(item, it)
                     closeBottomSheet(true)
                 },
-                background = backgroundColor,
                 enabled = enabled,
             )
         }
@@ -163,7 +162,6 @@ private fun LocationBottomSheet(
                 onCreateCustomList(item)
                 closeBottomSheet(true)
             },
-            background = backgroundColor,
         )
     }
 }
@@ -196,7 +194,6 @@ private fun EditCustomListBottomSheet(
                 onEditName(customList)
                 closeBottomSheet(true)
             },
-            background = backgroundColor,
         )
         IconCell(
             imageVector = Icons.Default.Add,
@@ -206,7 +203,6 @@ private fun EditCustomListBottomSheet(
                 onEditLocations(customList)
                 closeBottomSheet(true)
             },
-            background = backgroundColor,
         )
         IconCell(
             imageVector = Icons.Default.Delete,
@@ -216,7 +212,6 @@ private fun EditCustomListBottomSheet(
                 onDeleteCustomList(customList)
                 closeBottomSheet(true)
             },
-            background = backgroundColor,
         )
     }
 }
@@ -255,7 +250,6 @@ private fun CustomListEntryBottomSheet(
                 onRemoveLocationFromList(item, customListId)
                 closeBottomSheet(true)
             },
-            background = backgroundColor,
         )
     }
 }