Migrate elevated colors on new M3 color roles

aleksey-saenko · Mar 14, 2024 · 24b5d5b · 24b5d5b
1 parent fd41e90
commit 24b5d5b
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 19 deletions.
diff --git a/...in/java/com/mrsep/musicrecognizer/feature/library/presentation/library/TrackLazyColumn.kt b/...in/java/com/mrsep/musicrecognizer/feature/library/presentation/library/TrackLazyColumn.kt
@@ -24,7 +24,6 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -134,7 +133,7 @@ internal fun TrackLazyColumnItem(
                     shape = shape
                 )
                 .background(
-                    color = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
+                    color = MaterialTheme.colorScheme.surfaceContainer,
                     shape = shape
                 )
                 .clip(shape)

diff --git a/...main/java/com/mrsep/musicrecognizer/feature/library/presentation/library/TrackLazyGrid.kt b/...main/java/com/mrsep/musicrecognizer/feature/library/presentation/library/TrackLazyGrid.kt
@@ -109,7 +109,7 @@ internal fun TrackLazyGridItem(
                     shape = shape
                 )
                 .background(
-                    color = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
+                    color = MaterialTheme.colorScheme.surfaceContainer,
                     shape = shape
                 )
                 .clip(shape)

diff --git a/...ain/java/com/mrsep/musicrecognizer/feature/library/presentation/search/TrackSearchItem.kt b/...ain/java/com/mrsep/musicrecognizer/feature/library/presentation/search/TrackSearchItem.kt
@@ -5,7 +5,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.ui.Alignment
@@ -65,7 +64,7 @@ internal fun TrackSearchItem(
                     shape = shape
                 )
                 .background(
-                    color = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
+                    color = MaterialTheme.colorScheme.surfaceContainer,
                     shape = shape
                 )
                 .clip(shape)

diff --git a/.../mrsep/musicrecognizer/feature/preferences/presentation/common/PreferenceClickableItem.kt b/.../mrsep/musicrecognizer/feature/preferences/presentation/common/PreferenceClickableItem.kt
@@ -21,7 +21,7 @@ internal fun PreferenceClickableItem(
         verticalArrangement = Arrangement.Center,
         modifier = modifier
             .fillMaxWidth()
-            .heightIn(min = 72.dp)
+            .heightIn(min = 76.dp)
             .clickable { onItemClick() }
             .padding(16.dp)
             .alpha(if (enabled) 1f else 0.7f)

diff --git a/...com/mrsep/musicrecognizer/feature/preferences/presentation/common/PreferenceSwitchItem.kt b/...com/mrsep/musicrecognizer/feature/preferences/presentation/common/PreferenceSwitchItem.kt
@@ -23,7 +23,7 @@ internal fun PreferenceSwitchItem(
         verticalAlignment = Alignment.CenterVertically,
         modifier = modifier
             .fillMaxWidth()
-            .heightIn(min = 72.dp)
+            .heightIn(min = 76.dp)
             .clickable(
                 onClick = onClick,
                 enabled = enabled

diff --git a/...musicrecognizer/feature/recognition/presentation/queuescreen/RecognitionLazyColumnItem.kt b/...musicrecognizer/feature/recognition/presentation/queuescreen/RecognitionLazyColumnItem.kt
@@ -29,7 +29,6 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -94,7 +93,7 @@ internal fun RecognitionLazyColumnItem(
                     shape = shape
                 )
                 .background(
-                    color = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
+                    color = MaterialTheme.colorScheme.surfaceContainer,
                     shape = shape
                 )
                 .clip(shape)

diff --git a/...p/musicrecognizer/feature/recognition/presentation/queuescreen/RecognitionLazyGridItem.kt b/...p/musicrecognizer/feature/recognition/presentation/queuescreen/RecognitionLazyGridItem.kt
@@ -27,7 +27,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
-import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -89,7 +88,7 @@ internal fun RecognitionLazyGridItem(
                     shape = shape
                 )
                 .background(
-                    color = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
+                    color = MaterialTheme.colorScheme.surfaceContainer,
                     shape = shape
                 )
                 .clip(shape)

diff --git a/...ep/musicrecognizer/feature/recognition/presentation/recognitionscreen/OfflineModePopup.kt b/...ep/musicrecognizer/feature/recognition/presentation/recognitionscreen/OfflineModePopup.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -29,7 +28,7 @@ internal fun OfflineModePopup(
         modifier = modifier
     ) {
         Surface(
-            color = MaterialTheme.colorScheme.surfaceColorAtElevation(3.dp),
+            color = MaterialTheme.colorScheme.surfaceContainer,
             shape = CircleShape,
         ) {
             Text(

diff --git a/.../main/java/com/mrsep/musicrecognizer/feature/track/presentation/lyrics/AutoScrollPanel.kt b/.../main/java/com/mrsep/musicrecognizer/feature/track/presentation/lyrics/AutoScrollPanel.kt
@@ -10,7 +10,6 @@ import androidx.compose.material3.FilledIconButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Slider
-import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -35,7 +34,7 @@ internal fun AutoScrollPanel(
         horizontalAlignment = Alignment.CenterHorizontally,
         modifier = modifier
             .background(
-                color = MaterialTheme.colorScheme.surfaceColorAtElevation(3.dp),
+                color = MaterialTheme.colorScheme.surfaceContainerHigh,
                 shape = CircleShape
             )
     ) {

diff --git a/.../src/main/java/com/mrsep/musicrecognizer/feature/track/presentation/track/AlbumArtwork.kt b/.../src/main/java/com/mrsep/musicrecognizer/feature/track/presentation/track/AlbumArtwork.kt
@@ -4,7 +4,6 @@ import android.net.Uri
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
@@ -95,7 +94,7 @@ internal fun AlbumArtwork(
                 shape = MaterialTheme.shapes.extraLarge
             )
             .background(
-                color = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
+                color = MaterialTheme.colorScheme.surfaceContainer,
                 shape = MaterialTheme.shapes.extraLarge
             )
     )

diff --git a/...va/com/mrsep/musicrecognizer/feature/track/presentation/track/MusicServiceChipsFlowRow.kt b/...va/com/mrsep/musicrecognizer/feature/track/presentation/track/MusicServiceChipsFlowRow.kt
@@ -94,9 +94,8 @@ internal fun MusicServiceChip(
     Surface(
         modifier = modifier,
         shape = MaterialTheme.shapes.small,
-        color = MaterialTheme.colorScheme.surface,
+        color = MaterialTheme.colorScheme.surfaceContainer,
         contentColor = MaterialTheme.colorScheme.onSurfaceVariant,
-        tonalElevation = 2.dp,
         shadowElevation = 1.dp,
     ) {
         Row(