summaryrefslogtreecommitdiffhomepage
path: root/android/lib/theme/src/main
diff options
context:
space:
mode:
authorJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-06-20 16:04:00 +0200
committerJonatan Rhodin <jonatan.rhodin@mullvad.net>2024-06-25 15:08:48 +0200
commit5271e04eaa42c668635310f0cdadf43662c5a77d (patch)
treec34eda5f9c7cdd682a5ba445cca49773a1db2217 /android/lib/theme/src/main
parentd604ed8cc5a0eb0a5d26d28fdfba83c6cdcee672 (diff)
downloadmullvadvpn-5271e04eaa42c668635310f0cdadf43662c5a77d.tar.xz
mullvadvpn-5271e04eaa42c668635310f0cdadf43662c5a77d.zip
Update compose to 1.7.0-beta03
Also update some related libraries that were required This fixes a crash on release build
Diffstat (limited to 'android/lib/theme/src/main')
-rw-r--r--android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt21
1 files changed, 9 insertions, 12 deletions
diff --git a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt
index 69096ceccb..554eb6d421 100644
--- a/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt
+++ b/android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/Theme.kt
@@ -1,17 +1,16 @@
package net.mullvad.mullvadvpn.lib.theme
import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.ripple.LocalRippleTheme
import androidx.compose.material.ripple.RippleAlpha
-import androidx.compose.material.ripple.RippleTheme
-import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.LocalRippleConfiguration
import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.RippleConfiguration
import androidx.compose.material3.Shapes
import androidx.compose.material3.Typography
import androidx.compose.material3.darkColorScheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.Immutable
import androidx.compose.runtime.remember
import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.graphics.Color
@@ -137,6 +136,7 @@ fun ProvideDimens(dimensions: Dimensions, content: @Composable () -> Unit) {
private val LocalAppDimens = staticCompositionLocalOf { defaultDimensions }
+@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun AppTheme(content: @Composable () -> Unit) {
val colors = darkColorScheme
@@ -150,15 +150,12 @@ fun AppTheme(content: @Composable () -> Unit) {
shapes = Shapes,
typography = typography,
content = {
- CompositionLocalProvider(LocalRippleTheme provides MullvadRippleTheme) { content() }
+ CompositionLocalProvider(
+ LocalRippleConfiguration provides RippleConfiguration(rippleAlpha = rippleAlpha)
+ ) {
+ content()
+ }
}
)
}
}
-
-@Immutable
-object MullvadRippleTheme : RippleTheme {
- @Composable override fun defaultColor() = LocalContentColor.current
-
- @Composable override fun rippleAlpha() = rippleAlpha
-}