openium/consentium.droid
0
0
Fork 0
Code Pull Requests Releases Activity

feat(CON-287) : Mettre en place le dark theme.

Browse Source
This commit is contained in:
Louis Legrand 2025-02-20 10:59:15 +01:00
parent ed2d0ddb43
commit 76d021d35d
4 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/fr/openium/consentium/ui/navigation/DemoNavGraph.kt
View File

@ -16,20 +16,7 @@ import fr.openium.consentium.R
import fr.openium.consentium.api.Consentium import fr.openium.consentium.api.Consentium
import fr.openium.consentium.ui.screens.main.MainScreen import fr.openium.consentium.ui.screens.main.MainScreen
import fr.openium.consentium.ui.screens.splash.SplashScreen import fr.openium.consentium.ui.screens.splash.SplashScreen
import fr.openium.consentium.ui.theme.Error
import fr.openium.consentium.ui.theme.OnPrimary
import fr.openium.consentium.ui.theme.OnSecondary
import fr.openium.consentium.ui.theme.OnSurface
import fr.openium.consentium.ui.theme.OnSurfaceVariant
import fr.openium.consentium.ui.theme.Primary
import fr.openium.consentium.ui.theme.Secondary
import fr.openium.consentium.ui.theme.Success
import fr.openium.consentium.ui.theme.SurfaceHigh
import fr.openium.consentium.ui.theme.SurfaceHighest
import fr.openium.consentium.ui.theme.SurfaceMiddle
import fr.openium.consentium.ui.theme.Tertiary
import fr.openium.consentium_ui.ui.components.ConsentiumComponent import fr.openium.consentium_ui.ui.components.ConsentiumComponent
import fr.openium.consentium_ui.ui.components.style.ConsentiumDefaults
import fr.openium.consentium_ui.ui.model.ConsentiumPageUI import fr.openium.consentium_ui.ui.model.ConsentiumPageUI
private const val NAV_ANIMATION_TIME = 500 private const val NAV_ANIMATION_TIME = 500
@ -159,20 +146,6 @@ fun DemoNavGraph(navHostController: NavHostController) {
context = context, context = context,
apiKey = apiKey, apiKey = apiKey,
appId = appId, appId = appId,
),
colors = ConsentiumDefaults.colors(
primary = Primary,
onPrimary = OnPrimary,
secondary = Secondary,
onSecondary = OnSecondary,
tertiary = Tertiary,
onSurfaceVariant = OnSurfaceVariant,
onSurface = OnSurface,
error = Error,
surfaceHighest = SurfaceHighest,
surfaceHigh = SurfaceHigh,
surfaceMiddle = SurfaceMiddle,
success = Success,
) )
) )
} }

1
app/src/main/java/fr/openium/consentium/ui/screens/main/MainScreen.kt
View File

@ -18,7 +18,6 @@ fun MainScreen(
onGoToConsentDetail: () -> Unit, onGoToConsentDetail: () -> Unit,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
) { ) {
// View // View
Column( Column(
modifier = modifier.fillMaxSize(), modifier = modifier.fillMaxSize(),

28
app/src/main/java/fr/openium/consentium/ui/theme/Theme.kt
View File

@ -8,14 +8,38 @@ import androidx.compose.runtime.Composable
private val DarkColorScheme = darkColorScheme( private val DarkColorScheme = darkColorScheme(
primary = Primary, primary = Primary,
onPrimary = OnPrimary,
secondary = Secondary, secondary = Secondary,
tertiary = Tertiary onSecondary = OnSecondary,
tertiary = Tertiary,
onSurfaceVariant = OnSurfaceVariant,
onSurface = OnSurface,
error = Error,
surfaceContainerHighest = SurfaceHighest,
surfaceContainerHigh = SurfaceHigh,
surfaceContainer = SurfaceMiddle,
) )
private val LightColorScheme = lightColorScheme( private val LightColorScheme = lightColorScheme(
primary = Primary, primary = Primary,
onPrimary = OnPrimary,
secondary = Secondary, secondary = Secondary,
tertiary = Tertiary onSecondary = OnSecondary,
tertiary = Tertiary,
onSurfaceVariant = OnSurfaceVariant,
onSurface = OnSurface,
error = Error,
surfaceContainerHighest = SurfaceHighest,
surfaceContainerHigh = SurfaceHigh,
surfaceContainer = SurfaceMiddle,
) )
@Composable @Composable

2
consentium-ui/src/main/java/fr/openium/consentium_ui/ui/components/style/ConsentiumDefaults.kt
View File

@ -92,7 +92,7 @@ object ConsentiumDefaults {
fun colors( fun colors(
primary: Color = MaterialTheme.colorScheme.primary, primary: Color = MaterialTheme.colorScheme.primary,
onPrimary: Color = MaterialTheme.colorScheme.onPrimary, onPrimary: Color = MaterialTheme.colorScheme.onPrimary,
secondary: Color = MaterialTheme.colorScheme.background, secondary: Color = MaterialTheme.colorScheme.secondary,
onSecondary: Color = MaterialTheme.colorScheme.surfaceVariant, onSecondary: Color = MaterialTheme.colorScheme.surfaceVariant,
tertiary: Color = MaterialTheme.colorScheme.onBackground, tertiary: Color = MaterialTheme.colorScheme.onBackground,
onSurfaceVariant: Color = MaterialTheme.colorScheme.onBackground, onSurfaceVariant: Color = MaterialTheme.colorScheme.onBackground,