change theme color
This commit is contained in:
		
							parent
							
								
									dc35ac0ef9
								
							
						
					
					
						commit
						6e56313639
					
				
					 5 changed files with 16 additions and 57 deletions
				
			
		| 
						 | 
				
			
			@ -52,7 +52,7 @@ fun HomeNavHost(
 | 
			
		|||
    lexiconListState: LazyListState,
 | 
			
		||||
    questListState: LazyListState,
 | 
			
		||||
    locationListState: LazyListState,
 | 
			
		||||
    startDestination: String = LOCATION_LIST_ROUTE
 | 
			
		||||
    startDestination: String = LEXICON_LIST_ROUTE,
 | 
			
		||||
) {
 | 
			
		||||
    CompositionLocalProvider(
 | 
			
		||||
        LocalSnack provides remember { SnackbarHostState() },
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -28,7 +28,7 @@ fun ScreenNavHost(
 | 
			
		|||
    navHostController: NavHostController = rememberAnimatedNavController(),
 | 
			
		||||
    startDestination: String = AUTHENTICATION_ROUTE,
 | 
			
		||||
) {
 | 
			
		||||
    val lexiconListState =rememberLazyListState()
 | 
			
		||||
    val lexiconListState = rememberLazyListState()
 | 
			
		||||
    val questListState = rememberLazyListState()
 | 
			
		||||
    val locationListState = rememberLazyListState()
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -99,7 +99,7 @@ fun FantasyMap(
 | 
			
		|||
                            )
 | 
			
		||||
                            drawCircle(
 | 
			
		||||
                                color = when (selectedItem.value) {
 | 
			
		||||
                                    index -> Color.Cyan
 | 
			
		||||
                                    index -> colorScheme.base.primary
 | 
			
		||||
                                    else -> Color.White
 | 
			
		||||
                                },
 | 
			
		||||
                                radius = 12.dp.toPx() / animatedScale.value,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,54 +4,11 @@ import androidx.compose.runtime.Immutable
 | 
			
		|||
import androidx.compose.ui.graphics.Color
 | 
			
		||||
 | 
			
		||||
@Immutable
 | 
			
		||||
object BaseDark {
 | 
			
		||||
object Base {
 | 
			
		||||
    val Teal80 = Color(0xFF00838F)
 | 
			
		||||
    val Teal60 = Color(0xFF00ACC1)
 | 
			
		||||
    val Teal40 = Color(0xFF26C6DA)
 | 
			
		||||
    val Teal20 = Color(0xFF80DEEA)
 | 
			
		||||
    val Purple80 = Color(0xFFD0BCFF)
 | 
			
		||||
    val PurpleGrey80 = Color(0xFFCCC2DC)
 | 
			
		||||
    val Pink80 = Color(0xFFEFB8C8)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@Immutable
 | 
			
		||||
object BaseLight {
 | 
			
		||||
    val Purple40 = Color(0xFF6650a4)
 | 
			
		||||
    val PurpleGrey40 = Color(0xFF625b71)
 | 
			
		||||
    val Pink40 = Color(0xFF7D5260)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@Immutable
 | 
			
		||||
object BaseColorPalette {
 | 
			
		||||
    val VeryDarkBlue: Color = Color(0xFF09179D)
 | 
			
		||||
    val DarkBlue: Color = Color(0xFF1A2BDB)
 | 
			
		||||
    val Blue: Color = Color(0xFF2970F2)
 | 
			
		||||
    val LightBlue: Color = Color(0xFF1A91DB)
 | 
			
		||||
    val VeryLightBlue: Color = Color(0xFF1EDDEF)
 | 
			
		||||
    val VeryDarkPurple: Color = Color(0xFF5F0E9E)
 | 
			
		||||
    val DarkPurple: Color = Color(0xFF8330DB)
 | 
			
		||||
    val Purple: Color = Color(0xFF9B54C3)
 | 
			
		||||
    val LightPurple: Color = Color(0xFFBC52D9)
 | 
			
		||||
    val VeryLightPurple: Color = Color(0xFFC856D1)
 | 
			
		||||
    val VeryDarkGreen: Color = Color(0xFF16544A)
 | 
			
		||||
    val DarkGreen: Color = Color(0xFF207A6B)
 | 
			
		||||
    val Green: Color = Color(0xFF269482)
 | 
			
		||||
    val LightGreen: Color = Color(0xFF2AA18D)
 | 
			
		||||
    val VeryLightGreen: Color = Color(0xFF3AE0C5)
 | 
			
		||||
    val VeryDarkRed: Color = Color(0xFF631221)
 | 
			
		||||
    val DarkRed: Color = Color(0xFFA21D36)
 | 
			
		||||
    val Red: Color = Color(0xFFC92443)
 | 
			
		||||
    val LightRed: Color = Color(0xFFE32849)
 | 
			
		||||
    val VeryLightRed: Color = Color(0xFFF02B4F)
 | 
			
		||||
    val VeryDarkPink: Color = Color(0xFF960064)
 | 
			
		||||
    val DarkPink: Color = Color(0xFFBD007E)
 | 
			
		||||
    val Pink: Color = Color(0xFFD6008F)
 | 
			
		||||
    val LightPink: Color = Color(0xFFE35BB5)
 | 
			
		||||
    val VeryLightPink: Color = Color(0xFFFF66CC)
 | 
			
		||||
    val VeryDarkYellow: Color = Color(0xFFB76036)
 | 
			
		||||
    val DarkYellow: Color = Color(0xFFD48341)
 | 
			
		||||
    val Yellow: Color = Color(0xFFF3A850)
 | 
			
		||||
    val LightYellow: Color = Color(0xFFF5BF63)
 | 
			
		||||
    val VeryLightYellow: Color = Color(0xFFF9D679)
 | 
			
		||||
    val VeryDarkGrey: Color = Color(0xFF1D1D1D)
 | 
			
		||||
    val DarkGrey: Color = Color(0xFF424242)
 | 
			
		||||
    val Grey: Color = Color(0xFF919195)
 | 
			
		||||
    val LightGrey: Color = Color(0xFFDFDFDF)
 | 
			
		||||
    val VeryLightGrey: Color = Color(0xFFF9F9F9)
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -21,10 +21,11 @@ class LexiconColors(
 | 
			
		|||
@Stable
 | 
			
		||||
fun darkColorScheme(
 | 
			
		||||
    base: ColorScheme = darkColorScheme(
 | 
			
		||||
        primary = BaseDark.Purple80,
 | 
			
		||||
        secondary = BaseDark.PurpleGrey80,
 | 
			
		||||
        tertiary = BaseDark.Pink80,
 | 
			
		||||
        primary = Base.Teal40,
 | 
			
		||||
        secondary = Base.Teal20,
 | 
			
		||||
        tertiary = Base.Teal60,
 | 
			
		||||
        onPrimary = Color.White,
 | 
			
		||||
        surfaceTint = Base.Purple80,
 | 
			
		||||
    ),
 | 
			
		||||
    shadow: Color = ShadowPalette.shadow,
 | 
			
		||||
    status: Color = Color.Transparent,
 | 
			
		||||
| 
						 | 
				
			
			@ -42,10 +43,11 @@ fun darkColorScheme(
 | 
			
		|||
@Stable
 | 
			
		||||
fun lightColorScheme(
 | 
			
		||||
    base: ColorScheme = lightColorScheme(
 | 
			
		||||
        primary = BaseLight.Purple40,
 | 
			
		||||
        secondary = BaseLight.PurpleGrey40,
 | 
			
		||||
        tertiary = BaseLight.Pink40,
 | 
			
		||||
        primary = Base.Teal60,
 | 
			
		||||
        secondary = Base.Teal80,
 | 
			
		||||
        tertiary = Base.Teal40,
 | 
			
		||||
        onPrimary = Color.White,
 | 
			
		||||
        surfaceTint = Base.Purple40,
 | 
			
		||||
    ),
 | 
			
		||||
    shadow: Color = ShadowPalette.shadow,
 | 
			
		||||
    status: Color = Color.Transparent,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue