Switch to MaterialExpressiveTheme
This commit is contained in:
@@ -159,6 +159,7 @@ kotlin {
|
|||||||
"-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
|
"-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
|
||||||
"-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
|
"-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi",
|
||||||
"-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
|
"-opt-in=androidx.compose.material3.ExperimentalMaterial3Api",
|
||||||
|
"-opt-in=androidx.compose.material3.ExperimentalMaterial3ExpressiveApi",
|
||||||
"-opt-in=androidx.compose.ui.ExperimentalComposeUiApi",
|
"-opt-in=androidx.compose.ui.ExperimentalComposeUiApi",
|
||||||
"-opt-in=coil3.annotation.ExperimentalCoilApi",
|
"-opt-in=coil3.annotation.ExperimentalCoilApi",
|
||||||
"-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
|
"-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ package eu.kanade.presentation.theme
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import androidx.compose.foundation.isSystemInDarkTheme
|
import androidx.compose.foundation.isSystemInDarkTheme
|
||||||
import androidx.compose.material3.ColorScheme
|
import androidx.compose.material3.ColorScheme
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialExpressiveTheme
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalContext
|
||||||
@@ -56,7 +56,7 @@ private fun BaseTachiyomiTheme(
|
|||||||
) {
|
) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
val isDark = isSystemInDarkTheme()
|
val isDark = isSystemInDarkTheme()
|
||||||
MaterialTheme(
|
MaterialExpressiveTheme(
|
||||||
colorScheme = remember(appTheme, isDark, isAmoled) {
|
colorScheme = remember(appTheme, isDark, isAmoled) {
|
||||||
getThemeColorScheme(
|
getThemeColorScheme(
|
||||||
context = context,
|
context = context,
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ import androidx.compose.material3.ColorScheme
|
|||||||
import androidx.compose.material3.dynamicDarkColorScheme
|
import androidx.compose.material3.dynamicDarkColorScheme
|
||||||
import androidx.compose.material3.dynamicLightColorScheme
|
import androidx.compose.material3.dynamicLightColorScheme
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
|
import com.materialkolor.PaletteStyle
|
||||||
|
import com.materialkolor.dynamiccolor.ColorSpec
|
||||||
import com.materialkolor.ktx.DynamicScheme
|
import com.materialkolor.ktx.DynamicScheme
|
||||||
import com.materialkolor.toColorScheme
|
import com.materialkolor.toColorScheme
|
||||||
|
|
||||||
@@ -48,7 +50,12 @@ internal class MonetCompatColorScheme(seed: Color) : BaseColorScheme() {
|
|||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
fun generateColorSchemeFromSeed(seed: Color, dark: Boolean): ColorScheme {
|
fun generateColorSchemeFromSeed(seed: Color, dark: Boolean): ColorScheme {
|
||||||
return DynamicScheme(seedColor = seed, isDark = dark)
|
return DynamicScheme(
|
||||||
|
seedColor = seed,
|
||||||
|
isDark = dark,
|
||||||
|
specVersion = ColorSpec.SpecVersion.SPEC_2025,
|
||||||
|
style = PaletteStyle.Expressive,
|
||||||
|
)
|
||||||
.toColorScheme(isAmoled = false)
|
.toColorScheme(isAmoled = false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user