Restore buttons

Author: Pururun

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/ConnectionButton.kt

@@ -54,7 +54,7 @@ fun ConnectionButton(
             MaterialTheme.colorScheme.tertiary
         } else {
             // TODO Should we make this transparent or not?
-            MaterialTheme.colorScheme.error // .copy(alpha = AlphaDisconnectButton)
+            MaterialTheme.colorScheme.error.copy(alpha = AlphaDisconnectButton)
         }
 
     val contentColor =

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/button/SwitchLocationButton.kt

@@ -10,6 +10,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.component.SpacedColumn
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
+import net.mullvad.mullvadvpn.lib.theme.color.Alpha20
 
 @Preview
 @Composable
@@ -33,8 +34,8 @@ fun SwitchLocationButton(
         onClick = onClick,
         colors =
             ButtonDefaults.buttonColors(
-                containerColor = MaterialTheme.colorScheme.primaryContainer,
-                contentColor = MaterialTheme.colorScheme.onPrimaryContainer
+                containerColor = MaterialTheme.colorScheme.onPrimary.copy(alpha = Alpha20),
+                contentColor = MaterialTheme.colorScheme.onPrimary
             ),
         modifier = modifier,
         text = text,

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/CustomListsScreen.kt

@@ -16,7 +16,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.compositeOver
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
@@ -50,7 +49,6 @@ import net.mullvad.mullvadvpn.compose.util.showSnackbarImmediately
 import net.mullvad.mullvadvpn.lib.model.CustomList
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
-import net.mullvad.mullvadvpn.lib.theme.color.Alpha60
 import net.mullvad.mullvadvpn.viewmodel.CustomListsViewModel
 import org.koin.androidx.compose.koinViewModel
 
@@ -131,10 +129,7 @@ fun CustomListsScreen(
             ) {
                 Icon(
                     painterResource(id = R.drawable.ic_icons_add),
-                    tint =
-                        MaterialTheme.colorScheme.onBackground
-                            .copy(alpha = Alpha60)
-                            .compositeOver(MaterialTheme.colorScheme.background),
+                    tint = MaterialTheme.colorScheme.onSurface,
                     contentDescription = stringResource(id = R.string.new_list)
                 )
             }

android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/Color.kt

@@ -15,7 +15,6 @@ const val AlphaInactive = 0.4f
 const val Alpha40 = 0.4f
 const val AlphaDisconnectButton = 0.6f
 const val AlphaScrollbar = 0.6f
-const val Alpha60 = 0.6f
 const val AlphaInvisible = 0f
 
 // Custom colors, they only link to normal material 3 colors for now