Skip to content

Commit

Permalink
Merge pull request #3 from panos1b/define-theme
Browse files Browse the repository at this point in the history
Define theme
  • Loading branch information
panos1b authored Dec 22, 2024
2 parents 2e5708e + 26f58ab commit f0bb54d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 23 deletions.
12 changes: 6 additions & 6 deletions app/src/main/java/com/example/estiaseek/ui/theme/Color.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package com.example.estiaseek.ui.theme

import androidx.compose.ui.graphics.Color

val Purple80 = Color(0xFFD0BCFF)
val PurpleGrey80 = Color(0xFFCCC2DC)
val Pink80 = Color(0xFFEFB8C8)
// Light Theme Colors
val estiaSeekRed = Color(0xFFF11C33)
val estiaSeekRedCompliment = Color(0xFF7C4A4D)

val Purple40 = Color(0xFF6650a4)
val PurpleGrey40 = Color(0xFF625b71)
val Pink40 = Color(0xFF7D5260)
// Dark Theme Colors
val estiaSeekRedDark = Color(0xFF780E19)
val estiaSeekRedComplimentDark = Color(0xFF3E2526)
25 changes: 8 additions & 17 deletions app/src/main/java/com/example/estiaseek/ui/theme/Theme.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,32 +16,23 @@ import androidx.compose.ui.platform.LocalView
import androidx.core.view.WindowCompat

private val DarkColorScheme = darkColorScheme(
primary = Purple80,
secondary = PurpleGrey80,
tertiary = Pink80
primary = estiaSeekRedDark,
secondary = estiaSeekRedComplimentDark,
tertiary = estiaSeekRedComplimentDark
)

private val LightColorScheme = lightColorScheme(
primary = Purple40,
secondary = PurpleGrey40,
tertiary = Pink40

/* Other default colors to override
background = Color(0xFFFFFBFE),
surface = Color(0xFFFFFBFE),
onPrimary = Color.White,
onSecondary = Color.White,
onTertiary = Color.White,
onBackground = Color(0xFF1C1B1F),
onSurface = Color(0xFF1C1B1F),
*/
primary = estiaSeekRed,
secondary = estiaSeekRedCompliment,
tertiary = estiaSeekRedCompliment
)

@Composable
fun EstiaSeekTheme(
darkTheme: Boolean = isSystemInDarkTheme(),
// Dynamic color is available on Android 12+
dynamicColor: Boolean = true,
// Set to 'false' to enforce consistent custom branding colors.
dynamicColor: Boolean = false,
content: @Composable () -> Unit
) {
val colorScheme = when {
Expand Down

0 comments on commit f0bb54d

Please sign in to comment.