m3 expressive theme and full screen loader

revert pre-loading non-main screens
This commit is contained in:
2025-06-20 21:55:17 +03:00
parent 5aa1f21183
commit 17b5c944ac
6 changed files with 28 additions and 19 deletions
@@ -3,12 +3,15 @@ package dev.meloda.fast.ui.components
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.ContainedLoadingIndicator
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
fun FullScreenLoader(modifier: Modifier = Modifier) {
Box(
@@ -17,7 +20,10 @@ fun FullScreenLoader(modifier: Modifier = Modifier) {
.navigationBarsPadding(),
contentAlignment = Alignment.Center
) {
CircularProgressIndicator()
ContainedLoadingIndicator(
containerColor = MaterialTheme.colorScheme.primary,
indicatorColor = MaterialTheme.colorScheme.primaryContainer
)
}
}
@@ -4,6 +4,8 @@ import android.app.Activity
import android.os.Build
import androidx.compose.animation.animateColorAsState
import androidx.compose.material3.ColorScheme
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.MaterialExpressiveTheme
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.darkColorScheme
import androidx.compose.material3.dynamicDarkColorScheme
@@ -142,6 +144,7 @@ fun <T: NavController> ProvidableCompositionLocal<T?>.getOrThrow(): T {
return requireNotNull(current)
}
@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
fun AppTheme(
predefinedColorScheme: ColorScheme? = null,
@@ -213,7 +216,7 @@ fun AppTheme(
}
}
MaterialTheme(
MaterialExpressiveTheme(
colorScheme = (predefinedColorScheme ?: colorScheme)
.copy(
primary = colorPrimary,