From f9fd5b96449f2306e74c2b83be93fa590ec0dc40 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Wed, 18 Jun 2025 16:17:09 +0800 Subject: [PATCH] Switch compose to Material3 Expressive theme Signed-off-by: Aayush Gupta --- .../store/compose/composables/app/AppProgressComposable.kt | 6 ++++-- app/src/main/java/com/aurora/store/compose/theme/Theme.kt | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/aurora/store/compose/composables/app/AppProgressComposable.kt b/app/src/main/java/com/aurora/store/compose/composables/app/AppProgressComposable.kt index 8cb365eab..f650b8b24 100644 --- a/app/src/main/java/com/aurora/store/compose/composables/app/AppProgressComposable.kt +++ b/app/src/main/java/com/aurora/store/compose/composables/app/AppProgressComposable.kt @@ -9,7 +9,8 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.requiredSize -import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ContainedLoadingIndicator +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier @@ -22,6 +23,7 @@ import com.aurora.store.R * @param modifier The modifier to be applied to the composable */ @Composable +@OptIn(ExperimentalMaterial3ExpressiveApi::class) fun AppProgressComposable(modifier: Modifier = Modifier) { Box( modifier = modifier @@ -29,7 +31,7 @@ fun AppProgressComposable(modifier: Modifier = Modifier) { .padding(dimensionResource(R.dimen.padding_small)), contentAlignment = Alignment.Center ) { - CircularProgressIndicator( + ContainedLoadingIndicator( modifier = Modifier.requiredSize(dimensionResource(R.dimen.icon_size_small)) ) } diff --git a/app/src/main/java/com/aurora/store/compose/theme/Theme.kt b/app/src/main/java/com/aurora/store/compose/theme/Theme.kt index 2e30a78ba..89d4a9cb0 100644 --- a/app/src/main/java/com/aurora/store/compose/theme/Theme.kt +++ b/app/src/main/java/com/aurora/store/compose/theme/Theme.kt @@ -7,8 +7,9 @@ package com.aurora.store.compose.theme import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi +import androidx.compose.material3.MaterialExpressiveTheme import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Typography import androidx.compose.material3.darkColorScheme import androidx.compose.material3.dynamicDarkColorScheme import androidx.compose.material3.dynamicLightColorScheme @@ -23,6 +24,7 @@ import com.aurora.store.util.Preferences * App theme for Aurora Store based on [MaterialTheme] */ @Composable +@OptIn(ExperimentalMaterial3ExpressiveApi::class) fun AuroraTheme(content: @Composable () -> Unit) { val context = LocalContext.current val themeStyle = Preferences.getInteger(context, Preferences.PREFERENCE_THEME_STYLE) @@ -46,5 +48,5 @@ fun AuroraTheme(content: @Composable () -> Unit) { else -> if (isSystemInDarkTheme()) darkScheme else lightScheme } - MaterialTheme(colorScheme = colorScheme, typography = Typography(), content = content) + MaterialExpressiveTheme(colorScheme = colorScheme, content = content) }