From b0ce225c879fe1e501b642959e6a54f1f8035df7 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Tue, 21 Feb 2023 16:48:01 +0100
Subject: [PATCH] Apply card opacity preference to widget surfaces

---
 .../mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt  | 5 +++++
 .../launcher2/ui/launcher/widgets/weather/WeatherWidget.kt   | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt
index 65f91b53..f1fa7c8c 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt
@@ -38,6 +38,7 @@ import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.FilledTonalIconButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.IconButtonDefaults
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.PlainTooltipBox
@@ -73,6 +74,7 @@ import de.mm20.launcher2.ui.component.MissingPermissionBanner
 import de.mm20.launcher2.ui.ktx.conditional
 import de.mm20.launcher2.ui.launcher.transitions.HandleHomeTransition
 import de.mm20.launcher2.ui.launcher.transitions.HomeTransitionParams
+import de.mm20.launcher2.ui.locals.LocalCardStyle
 import de.mm20.launcher2.ui.locals.LocalWindowSize
 import kotlin.math.min
 
@@ -306,6 +308,9 @@ fun MusicWidget() {
             FilledTonalIconButton(
                 modifier = Modifier
                     .size(40.dp),
+                colors = IconButtonDefaults.filledTonalIconButtonColors(
+                    containerColor = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = LocalCardStyle.current.opacity),
+                ),
                 onClick = { viewModel.togglePause() },
                 shape = MaterialTheme.shapes.extraSmall,
             ) {
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
index ecdb2b80..619af5ee 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/weather/WeatherWidget.kt
@@ -59,6 +59,7 @@ import de.mm20.launcher2.ui.component.weather.WeatherIcon
 import de.mm20.launcher2.ui.icons.HumidityPercentage
 import de.mm20.launcher2.ui.icons.Rain
 import de.mm20.launcher2.ui.ktx.blendIntoViewScale
+import de.mm20.launcher2.ui.locals.LocalCardStyle
 import de.mm20.launcher2.weather.DailyForecast
 import de.mm20.launcher2.weather.Forecast
 import java.text.DateFormat
@@ -130,7 +131,7 @@ fun WeatherWidget() {
             val currentDayForecasts by viewModel.currentDayForecasts.observeAsState(emptyList())
 
             Surface(
-                color = MaterialTheme.colorScheme.surfaceVariant,
+                color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = LocalCardStyle.current.opacity),
                 modifier = Modifier.fillMaxWidth()
             ) {
                 Column(
@@ -199,7 +200,7 @@ fun CurrentWeather(forecast: Forecast, imperialUnits: Boolean) {
                     topEnd = CornerSize(0),
                     bottomEnd = CornerSize(0)
                 ),
-                color = MaterialTheme.colorScheme.secondaryContainer,
+                color = MaterialTheme.colorScheme.secondaryContainer.copy(alpha = LocalCardStyle.current.opacity),
             ) {
                 Text(
                     text = "${forecast.provider} (${