-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
88677cd
commit 39496da
Showing
6 changed files
with
181 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| package com.rubylichtenstein.ui.theme | ||
|
|
||
| import androidx.compose.ui.graphics.Color | ||
|
|
||
| val md_theme_light_primary = Color(0xFF825500) | ||
| val md_theme_light_onPrimary = Color(0xFFFFFFFF) | ||
| val md_theme_light_primaryContainer = Color(0xFFFFDDB3) | ||
| val md_theme_light_onPrimaryContainer = Color(0xFF291800) | ||
| val md_theme_light_secondary = Color(0xFF6F5B40) | ||
| val md_theme_light_onSecondary = Color(0xFFFFFFFF) | ||
| val md_theme_light_secondaryContainer = Color(0xFFFBDEBC) | ||
| val md_theme_light_onSecondaryContainer = Color(0xFF271904) | ||
| val md_theme_light_tertiary = Color(0xFF51643F) | ||
| val md_theme_light_onTertiary = Color(0xFFFFFFFF) | ||
| val md_theme_light_tertiaryContainer = Color(0xFFD4EABB) | ||
| val md_theme_light_onTertiaryContainer = Color(0xFF102004) | ||
| val md_theme_light_error = Color(0xFFBA1A1A) | ||
| val md_theme_light_errorContainer = Color(0xFFFFDAD6) | ||
| val md_theme_light_onError = Color(0xFFFFFFFF) | ||
| val md_theme_light_onErrorContainer = Color(0xFF410002) | ||
| val md_theme_light_background = Color(0xFFFFFBFF) | ||
| val md_theme_light_onBackground = Color(0xFF1F1B16) | ||
| val md_theme_light_surface = Color(0xFFFFFBFF) | ||
| val md_theme_light_onSurface = Color(0xFF1F1B16) | ||
| val md_theme_light_surfaceVariant = Color(0xFFF0E0CF) | ||
| val md_theme_light_onSurfaceVariant = Color(0xFF4F4539) | ||
| val md_theme_light_outline = Color(0xFF817567) | ||
| val md_theme_light_inverseOnSurface = Color(0xFFF9EFE7) | ||
| val md_theme_light_inverseSurface = Color(0xFF34302A) | ||
| val md_theme_light_inversePrimary = Color(0xFFFFB951) | ||
| val md_theme_light_shadow = Color(0xFF000000) | ||
| val md_theme_light_surfaceTint = Color(0xFF825500) | ||
| val md_theme_light_outlineVariant = Color(0xFFD3C4B4) | ||
| val md_theme_light_scrim = Color(0xFF000000) | ||
|
|
||
| val md_theme_dark_primary = Color(0xFFFFB951) | ||
| val md_theme_dark_onPrimary = Color(0xFF452B00) | ||
| val md_theme_dark_primaryContainer = Color(0xFF633F00) | ||
| val md_theme_dark_onPrimaryContainer = Color(0xFFFFDDB3) | ||
| val md_theme_dark_secondary = Color(0xFFDDC2A1) | ||
| val md_theme_dark_onSecondary = Color(0xFF3E2D16) | ||
| val md_theme_dark_secondaryContainer = Color(0xFF56442A) | ||
| val md_theme_dark_onSecondaryContainer = Color(0xFFFBDEBC) | ||
| val md_theme_dark_tertiary = Color(0xFFB8CEA1) | ||
| val md_theme_dark_onTertiary = Color(0xFF243515) | ||
| val md_theme_dark_tertiaryContainer = Color(0xFF3A4C2A) | ||
| val md_theme_dark_onTertiaryContainer = Color(0xFFD4EABB) | ||
| val md_theme_dark_error = Color(0xFFFFB4AB) | ||
| val md_theme_dark_errorContainer = Color(0xFF93000A) | ||
| val md_theme_dark_onError = Color(0xFF690005) | ||
| val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6) | ||
| val md_theme_dark_background = Color(0xFF1F1B16) | ||
| val md_theme_dark_onBackground = Color(0xFFEAE1D9) | ||
| val md_theme_dark_surface = Color(0xFF1F1B16) | ||
| val md_theme_dark_onSurface = Color(0xFFEAE1D9) | ||
| val md_theme_dark_surfaceVariant = Color(0xFF4F4539) | ||
| val md_theme_dark_onSurfaceVariant = Color(0xFFD3C4B4) | ||
| val md_theme_dark_outline = Color(0xFF9C8F80) | ||
| val md_theme_dark_inverseOnSurface = Color(0xFF1F1B16) | ||
| val md_theme_dark_inverseSurface = Color(0xFFEAE1D9) | ||
| val md_theme_dark_inversePrimary = Color(0xFF825500) | ||
| val md_theme_dark_shadow = Color(0xFF000000) | ||
| val md_theme_dark_surfaceTint = Color(0xFFFFB951) | ||
| val md_theme_dark_outlineVariant = Color(0xFF4F4539) | ||
| val md_theme_dark_scrim = Color(0xFF000000) | ||
|
|
||
|
|
||
| val seed = Color(0xFF825500) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,98 @@ | ||
| package com.rubylichtenstein.ui.theme | ||
|
|
||
| import android.os.Build | ||
| import androidx.compose.foundation.isSystemInDarkTheme | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.darkColorScheme | ||
| import androidx.compose.material3.dynamicDarkColorScheme | ||
| import androidx.compose.material3.dynamicLightColorScheme | ||
| import androidx.compose.material3.lightColorScheme | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.platform.LocalContext | ||
|
|
||
|
|
||
| private val LightColors = lightColorScheme( | ||
| primary = md_theme_light_primary, | ||
| onPrimary = md_theme_light_onPrimary, | ||
| primaryContainer = md_theme_light_primaryContainer, | ||
| onPrimaryContainer = md_theme_light_onPrimaryContainer, | ||
| secondary = md_theme_light_secondary, | ||
| onSecondary = md_theme_light_onSecondary, | ||
| secondaryContainer = md_theme_light_secondaryContainer, | ||
| onSecondaryContainer = md_theme_light_onSecondaryContainer, | ||
| tertiary = md_theme_light_tertiary, | ||
| onTertiary = md_theme_light_onTertiary, | ||
| tertiaryContainer = md_theme_light_tertiaryContainer, | ||
| onTertiaryContainer = md_theme_light_onTertiaryContainer, | ||
| error = md_theme_light_error, | ||
| errorContainer = md_theme_light_errorContainer, | ||
| onError = md_theme_light_onError, | ||
| onErrorContainer = md_theme_light_onErrorContainer, | ||
| background = md_theme_light_background, | ||
| onBackground = md_theme_light_onBackground, | ||
| surface = md_theme_light_surface, | ||
| onSurface = md_theme_light_onSurface, | ||
| surfaceVariant = md_theme_light_surfaceVariant, | ||
| onSurfaceVariant = md_theme_light_onSurfaceVariant, | ||
| outline = md_theme_light_outline, | ||
| inverseOnSurface = md_theme_light_inverseOnSurface, | ||
| inverseSurface = md_theme_light_inverseSurface, | ||
| inversePrimary = md_theme_light_inversePrimary, | ||
| surfaceTint = md_theme_light_surfaceTint, | ||
| outlineVariant = md_theme_light_outlineVariant, | ||
| scrim = md_theme_light_scrim, | ||
| ) | ||
|
|
||
| private val DarkColors = darkColorScheme( | ||
| primary = md_theme_dark_primary, | ||
| onPrimary = md_theme_dark_onPrimary, | ||
| primaryContainer = md_theme_dark_primaryContainer, | ||
| onPrimaryContainer = md_theme_dark_onPrimaryContainer, | ||
| secondary = md_theme_dark_secondary, | ||
| onSecondary = md_theme_dark_onSecondary, | ||
| secondaryContainer = md_theme_dark_secondaryContainer, | ||
| onSecondaryContainer = md_theme_dark_onSecondaryContainer, | ||
| tertiary = md_theme_dark_tertiary, | ||
| onTertiary = md_theme_dark_onTertiary, | ||
| tertiaryContainer = md_theme_dark_tertiaryContainer, | ||
| onTertiaryContainer = md_theme_dark_onTertiaryContainer, | ||
| error = md_theme_dark_error, | ||
| errorContainer = md_theme_dark_errorContainer, | ||
| onError = md_theme_dark_onError, | ||
| onErrorContainer = md_theme_dark_onErrorContainer, | ||
| background = md_theme_dark_background, | ||
| onBackground = md_theme_dark_onBackground, | ||
| surface = md_theme_dark_surface, | ||
| onSurface = md_theme_dark_onSurface, | ||
| surfaceVariant = md_theme_dark_surfaceVariant, | ||
| onSurfaceVariant = md_theme_dark_onSurfaceVariant, | ||
| outline = md_theme_dark_outline, | ||
| inverseOnSurface = md_theme_dark_inverseOnSurface, | ||
| inverseSurface = md_theme_dark_inverseSurface, | ||
| inversePrimary = md_theme_dark_inversePrimary, | ||
| surfaceTint = md_theme_dark_surfaceTint, | ||
| outlineVariant = md_theme_dark_outlineVariant, | ||
| scrim = md_theme_dark_scrim, | ||
| ) | ||
|
|
||
| @Composable | ||
| fun DogBreedsTheme( | ||
| useDarkTheme: Boolean = isSystemInDarkTheme(), | ||
| content: @Composable () -> Unit | ||
| ) { | ||
| val context = LocalContext.current | ||
| val colors = when { | ||
| (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) -> { | ||
| if (useDarkTheme) dynamicDarkColorScheme(context) | ||
| else dynamicLightColorScheme(context) | ||
| } | ||
|
|
||
| useDarkTheme -> DarkColors | ||
| else -> LightColors | ||
| } | ||
|
|
||
| MaterialTheme( | ||
| colorScheme = colors, | ||
| content = content | ||
| ) | ||
| } |