update compose material and fix deprecations according to the guide

snabble · Sep 19, 2024 · a9a8031 · a9a8031
1 parent eeacbe3
commit a9a8031
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 37 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -18,7 +18,7 @@ androidx-compose-ui = "1.7.2"
 com-squareup-okhttp3 = "4.11.0"
 io-kotest = "5.6.2"
 org-jetbrains-dokka = "1.8.20"
-androidx-compose-material = "1.4.3"
+androidx-compose-material = "1.7.2"
 
 [libraries]
 airbnb-lottie = "com.airbnb.android:lottie:6.0.1"

diff --git a/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/ImageWidget.kt b/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/ImageWidget.kt
@@ -7,7 +7,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -28,7 +28,7 @@ fun ImageWidget(
     model: ImageItem,
     contentScale: ContentScale = ContentScale.Fit,
     onAction: OnDynamicAction,
-    indication: Indication? = rememberRipple(),
+    indication: Indication? = ripple(),
 ) {
     Column(
         modifier = Modifier
@@ -41,7 +41,7 @@ fun ImageWidget(
                 modifier = Modifier
                     .fillMaxWidth()
                     .clickable(
-                        interactionSource = remember { MutableInteractionSource()  },
+                        interactionSource = remember { MutableInteractionSource() },
                         indication = indication,
                     ) { onAction(DynamicAction(model)) }
                     .then(modifier),

diff --git a/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/SectionWidget.kt b/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/SectionWidget.kt
@@ -6,7 +6,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -125,7 +125,7 @@ fun SectionWidget(
 
                     else -> Unit // Do nothing
                 }
-                Divider(modifier = modifier.fillMaxWidth(), thickness = Dp.Hairline)
+                HorizontalDivider(modifier = modifier.fillMaxWidth(), thickness = Dp.Hairline)
             }
         }
     }

diff --git a/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/TextWidget.kt b/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/TextWidget.kt
@@ -7,9 +7,9 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -28,13 +28,13 @@ fun TextWidget(
     model: TextItem,
     modifier: Modifier = Modifier,
     onAction: OnDynamicAction,
-    indication: Indication? = rememberRipple(),
+    indication: Indication? = ripple(),
 ) {
     Box(
         modifier = Modifier
             .fillMaxWidth()
             .clickable(
-                interactionSource = remember { MutableInteractionSource()  },
+                interactionSource = remember { MutableInteractionSource() },
                 indication = indication,
             ) {
                 onAction(DynamicAction(model))

diff --git a/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/SnabbleCard.kt b/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/SnabbleCard.kt
@@ -3,13 +3,13 @@ package io.snabble.sdk.widgets.snabble
 import androidx.compose.foundation.indication
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material.ripple.LocalRippleTheme
-import androidx.compose.material.ripple.RippleAlpha
-import androidx.compose.material.ripple.RippleTheme
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.LocalRippleConfiguration
+import androidx.compose.material.RippleConfiguration
+import androidx.compose.material.RippleDefaults
+import androidx.compose.material.ripple
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.ElevatedCard
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -18,30 +18,25 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import io.snabble.sdk.dynamicview.theme.properties.elevation
 
+@OptIn(ExperimentalMaterialApi::class)
 @Composable
 internal fun SnabbleCard(
     modifier: Modifier = Modifier,
     onClick: () -> Unit,
     content: @Composable () -> Unit,
 ) {
-    CompositionLocalProvider(
-        LocalRippleTheme provides object : RippleTheme {
+    val rippleConfiguration = RippleConfiguration(
+        color = MaterialTheme.colorScheme.primary,
+        rippleAlpha = RippleDefaults.rippleAlpha(Color.Black, !isSystemInDarkTheme())
+    )
 
-            @Composable
-            override fun defaultColor(): Color = MaterialTheme.colorScheme.primary
-
-            @Composable
-            override fun rippleAlpha(): RippleAlpha =
-                RippleTheme.defaultRippleAlpha(Color.Black, lightTheme = !isSystemInDarkTheme())
-        }
-    ) {
-        @OptIn(ExperimentalMaterial3Api::class)
+    CompositionLocalProvider(LocalRippleConfiguration provides rippleConfiguration) {
         ElevatedCard(
             onClick = onClick,
             modifier = Modifier
                 .indication(
-                    interactionSource = remember { MutableInteractionSource()  },
-                    indication = rememberRipple()
+                    interactionSource = remember { MutableInteractionSource() },
+                    indication = ripple()
                 )
                 .then(modifier),
             shape = MaterialTheme.shapes.small,

diff --git a/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/devsettings/AppIDWidget.kt b/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/devsettings/AppIDWidget.kt
@@ -7,9 +7,9 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -43,7 +43,7 @@ fun AppUserIdWidget(
             .fillMaxWidth()
             .clickable(
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(),
+                indication = ripple(),
             ) {
                 context.copyToClipBoard("AppUser-ID", appUserId)
                 onAction(DynamicAction(model))

diff --git a/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/devsettings/ClientIDWidget.kt b/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/devsettings/ClientIDWidget.kt
@@ -7,9 +7,9 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Text
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
@@ -43,7 +43,7 @@ fun ClientIdWidget(
             .fillMaxWidth()
             .clickable(
                 interactionSource = remember { MutableInteractionSource() },
-                indication = rememberRipple(),
+                indication = ripple(),
             ) {
                 context.copyToClipBoard("Client-ID", clientId)
                 onAction(DynamicAction(model))

diff --git a/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/purchase/OnLifecycleEvent.kt b/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/purchase/OnLifecycleEvent.kt
@@ -3,10 +3,10 @@ package io.snabble.sdk.widgets.snabble.purchase
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.compose.LocalLifecycleOwner
 
 @Composable
 internal fun OnLifecycleEvent(

diff --git a/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/purchase/ui/PurchaseWidget.kt b/ui-toolkit/src/main/kotlin/io/snabble/sdk/widgets/snabble/purchase/ui/PurchaseWidget.kt
@@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.ripple.rememberRipple
+import androidx.compose.material.ripple
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -115,7 +115,7 @@ fun Purchases(
                 .padding(PaddingValues(horizontal = model.padding.start.dp + MaterialTheme.padding.small))
                 .clickable(
                     interactionSource = remember { MutableInteractionSource() },
-                    indication = rememberRipple(
+                    indication = ripple(
                         bounded = false,
                         color = MaterialTheme.colorScheme.primary
                     ),