Skip to content

3.0/material theme end #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juandgaines wants to merge 6 commits into
base: 3.0/MaterialTheme-Start
Choose a base branch
from
Open

3.0/material theme end #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5333a8c
feat: Material Theme
juandagaines Oct 16, 2024
f5f63e4
feat: Material Theme
juandagaines Oct 16, 2024
758d9a5
feat: Material Theme
juandagaines Oct 16, 2024
bf6c9b3
Merge branch '3.0/MaterialTheme-Start' into 3.0/MaterialTheme-End
juandagaines Oct 16, 2024
256daee
Merge branch 'master' into 3.0/MaterialTheme-End
juandagaines Oct 17, 2024
52250f7
Merge branch '3.0/MaterialTheme-Start' into 3.0/MaterialTheme-End
juandagaines Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ dependencies {
implementation(libs.androidx.ui.graphics)
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.material3)
//TODO: 3.5 Agregar libreria fuentes google
implementation(libs.androidx.ui.text.google.fonts)
debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.test.manifest)

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/juandgaines/todoapp/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class MainActivity : ComponentActivity() {
super.onCreate(savedInstanceState)
enableEdgeToEdge()
setContent {
TodoAppTheme {
TodoAppTheme() {
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
HelloWorld(
modifier = Modifier.fillMaxSize()
Expand Down
229 changes: 221 additions & 8 deletions app/src/main/java/com/juandgaines/todoapp/ui/theme/Color.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,226 @@
package com.juandgaines.todoapp.ui.theme

import androidx.compose.ui.graphics.Color
//TODO: 3.1 Mirgrar archivos de tema y arreglar imports.

val primaryLight = Color(0xFF6A5F11)
val onPrimaryLight = Color(0xFFFFFFFF)
val primaryContainerLight = Color(0xFFF4E389)
val onPrimaryContainerLight = Color(0xFF201C00)
val secondaryLight = Color(0xFF655F41)
val onSecondaryLight = Color(0xFFFFFFFF)
val secondaryContainerLight = Color(0xFFECE3BD)
val onSecondaryContainerLight = Color(0xFF201C05)
val tertiaryLight = Color(0xFF426651)
val onTertiaryLight = Color(0xFFFFFFFF)
val tertiaryContainerLight = Color(0xFFC3ECD1)
val onTertiaryContainerLight = Color(0xFF002112)
val errorLight = Color(0xFFBA1A1A)
val onErrorLight = Color(0xFFFFFFFF)
val errorContainerLight = Color(0xFFFFDAD6)
val onErrorContainerLight = Color(0xFF410002)
val backgroundLight = Color(0xFFFFF9EB)
val onBackgroundLight = Color(0xFF1D1C13)
val surfaceLight = Color(0xFFFFF9EB)
val onSurfaceLight = Color(0xFF1D1C13)
val surfaceVariantLight = Color(0xFFE9E2D0)
val onSurfaceVariantLight = Color(0xFF4A4739)
val outlineLight = Color(0xFF7B7768)
val outlineVariantLight = Color(0xFFCCC6B5)
val scrimLight = Color(0xFF000000)
val inverseSurfaceLight = Color(0xFF333027)
val inverseOnSurfaceLight = Color(0xFFF6F0E2)
val inversePrimaryLight = Color(0xFFD7C770)
val surfaceDimLight = Color(0xFFDFDACC)
val surfaceBrightLight = Color(0xFFFFF9EB)
val surfaceContainerLowestLight = Color(0xFFFFFFFF)
val surfaceContainerLowLight = Color(0xFFF9F3E5)
val surfaceContainerLight = Color(0xFFF3EDE0)
val surfaceContainerHighLight = Color(0xFFEEE8DA)
val surfaceContainerHighestLight = Color(0xFFE8E2D4)

val primaryLightMediumContrast = Color(0xFF4C4300)
val onPrimaryLightMediumContrast = Color(0xFFFFFFFF)
val primaryContainerLightMediumContrast = Color(0xFF827527)
val onPrimaryContainerLightMediumContrast = Color(0xFFFFFFFF)
val secondaryLightMediumContrast = Color(0xFF484327)
val onSecondaryLightMediumContrast = Color(0xFFFFFFFF)
val secondaryContainerLightMediumContrast = Color(0xFF7B7555)
val onSecondaryContainerLightMediumContrast = Color(0xFFFFFFFF)
val tertiaryLightMediumContrast = Color(0xFF264A36)
val onTertiaryLightMediumContrast = Color(0xFFFFFFFF)
val tertiaryContainerLightMediumContrast = Color(0xFF577D66)
val onTertiaryContainerLightMediumContrast = Color(0xFFFFFFFF)
val errorLightMediumContrast = Color(0xFF8C0009)
val onErrorLightMediumContrast = Color(0xFFFFFFFF)
val errorContainerLightMediumContrast = Color(0xFFDA342E)
val onErrorContainerLightMediumContrast = Color(0xFFFFFFFF)
val backgroundLightMediumContrast = Color(0xFFFFF9EB)
val onBackgroundLightMediumContrast = Color(0xFF1D1C13)
val surfaceLightMediumContrast = Color(0xFFFFF9EB)
val onSurfaceLightMediumContrast = Color(0xFF1D1C13)
val surfaceVariantLightMediumContrast = Color(0xFFE9E2D0)
val onSurfaceVariantLightMediumContrast = Color(0xFF464336)
val outlineLightMediumContrast = Color(0xFF635F51)
val outlineVariantLightMediumContrast = Color(0xFF7F7B6B)
val scrimLightMediumContrast = Color(0xFF000000)
val inverseSurfaceLightMediumContrast = Color(0xFF333027)
val inverseOnSurfaceLightMediumContrast = Color(0xFFF6F0E2)
val inversePrimaryLightMediumContrast = Color(0xFFD7C770)
val surfaceDimLightMediumContrast = Color(0xFFDFDACC)
val surfaceBrightLightMediumContrast = Color(0xFFFFF9EB)
val surfaceContainerLowestLightMediumContrast = Color(0xFFFFFFFF)
val surfaceContainerLowLightMediumContrast = Color(0xFFF9F3E5)
val surfaceContainerLightMediumContrast = Color(0xFFF3EDE0)
val surfaceContainerHighLightMediumContrast = Color(0xFFEEE8DA)
val surfaceContainerHighestLightMediumContrast = Color(0xFFE8E2D4)

val primaryLightHighContrast = Color(0xFF282200)
val onPrimaryLightHighContrast = Color(0xFFFFFFFF)
val primaryContainerLightHighContrast = Color(0xFF4C4300)
val onPrimaryContainerLightHighContrast = Color(0xFFFFFFFF)
val secondaryLightHighContrast = Color(0xFF27220A)
val onSecondaryLightHighContrast = Color(0xFFFFFFFF)
val secondaryContainerLightHighContrast = Color(0xFF484327)
val onSecondaryContainerLightHighContrast = Color(0xFFFFFFFF)
val tertiaryLightHighContrast = Color(0xFF022817)
val onTertiaryLightHighContrast = Color(0xFFFFFFFF)
val tertiaryContainerLightHighContrast = Color(0xFF264A36)
val onTertiaryContainerLightHighContrast = Color(0xFFFFFFFF)
val errorLightHighContrast = Color(0xFF4E0002)
val onErrorLightHighContrast = Color(0xFFFFFFFF)
val errorContainerLightHighContrast = Color(0xFF8C0009)
val onErrorContainerLightHighContrast = Color(0xFFFFFFFF)
val backgroundLightHighContrast = Color(0xFFFFF9EB)
val onBackgroundLightHighContrast = Color(0xFF1D1C13)
val surfaceLightHighContrast = Color(0xFFFFF9EB)
val onSurfaceLightHighContrast = Color(0xFF000000)
val surfaceVariantLightHighContrast = Color(0xFFE9E2D0)
val onSurfaceVariantLightHighContrast = Color(0xFF262418)
val outlineLightHighContrast = Color(0xFF464336)
val outlineVariantLightHighContrast = Color(0xFF464336)
val scrimLightHighContrast = Color(0xFF000000)
val inverseSurfaceLightHighContrast = Color(0xFF333027)
val inverseOnSurfaceLightHighContrast = Color(0xFFFFFFFF)
val inversePrimaryLightHighContrast = Color(0xFFFEED91)
val surfaceDimLightHighContrast = Color(0xFFDFDACC)
val surfaceBrightLightHighContrast = Color(0xFFFFF9EB)
val surfaceContainerLowestLightHighContrast = Color(0xFFFFFFFF)
val surfaceContainerLowLightHighContrast = Color(0xFFF9F3E5)
val surfaceContainerLightHighContrast = Color(0xFFF3EDE0)
val surfaceContainerHighLightHighContrast = Color(0xFFEEE8DA)
val surfaceContainerHighestLightHighContrast = Color(0xFFE8E2D4)

val primaryDark = Color(0xFFD7C770)
val onPrimaryDark = Color(0xFF383000)
val primaryContainerDark = Color(0xFF514700)
val onPrimaryContainerDark = Color(0xFFF4E389)
val secondaryDark = Color(0xFFCFC7A2)
val onSecondaryDark = Color(0xFF353117)
val secondaryContainerDark = Color(0xFF4C472B)
val onSecondaryContainerDark = Color(0xFFECE3BD)
val tertiaryDark = Color(0xFFA8D0B5)
val onTertiaryDark = Color(0xFF123724)
val tertiaryContainerDark = Color(0xFF2A4E3A)
val onTertiaryContainerDark = Color(0xFFC3ECD1)
val errorDark = Color(0xFFFFB4AB)
val onErrorDark = Color(0xFF690005)
val errorContainerDark = Color(0xFF93000A)
val onErrorContainerDark = Color(0xFFFFDAD6)
val backgroundDark = Color(0xFF15130C)
val onBackgroundDark = Color(0xFFE8E2D4)
val surfaceDark = Color(0xFF15130C)
val onSurfaceDark = Color(0xFFE8E2D4)
val surfaceVariantDark = Color(0xFF4A4739)
val onSurfaceVariantDark = Color(0xFFCCC6B5)
val outlineDark = Color(0xFF959180)
val outlineVariantDark = Color(0xFF4A4739)
val scrimDark = Color(0xFF000000)
val inverseSurfaceDark = Color(0xFFE8E2D4)
val inverseOnSurfaceDark = Color(0xFF333027)
val inversePrimaryDark = Color(0xFF6A5F11)
val surfaceDimDark = Color(0xFF15130C)
val surfaceBrightDark = Color(0xFF3C3930)
val surfaceContainerLowestDark = Color(0xFF100E07)
val surfaceContainerLowDark = Color(0xFF1D1C13)
val surfaceContainerDark = Color(0xFF222017)
val surfaceContainerHighDark = Color(0xFF2C2A21)
val surfaceContainerHighestDark = Color(0xFF37352B)

val primaryDarkMediumContrast = Color(0xFFDCCC74)
val onPrimaryDarkMediumContrast = Color(0xFF1B1600)
val primaryContainerDarkMediumContrast = Color(0xFF9F9140)
val onPrimaryContainerDarkMediumContrast = Color(0xFF000000)
val secondaryDarkMediumContrast = Color(0xFFD4CBA6)
val onSecondaryDarkMediumContrast = Color(0xFF1A1602)
val secondaryContainerDarkMediumContrast = Color(0xFF98916F)
val onSecondaryContainerDarkMediumContrast = Color(0xFF000000)
val tertiaryDarkMediumContrast = Color(0xFFACD4BA)
val onTertiaryDarkMediumContrast = Color(0xFF001B0E)
val tertiaryContainerDarkMediumContrast = Color(0xFF739981)
val onTertiaryContainerDarkMediumContrast = Color(0xFF000000)
val errorDarkMediumContrast = Color(0xFFFFBAB1)
val onErrorDarkMediumContrast = Color(0xFF370001)
val errorContainerDarkMediumContrast = Color(0xFFFF5449)
val onErrorContainerDarkMediumContrast = Color(0xFF000000)
val backgroundDarkMediumContrast = Color(0xFF15130C)
val onBackgroundDarkMediumContrast = Color(0xFFE8E2D4)
val surfaceDarkMediumContrast = Color(0xFF15130C)
val onSurfaceDarkMediumContrast = Color(0xFFFFFAF4)
val surfaceVariantDarkMediumContrast = Color(0xFF4A4739)
val onSurfaceVariantDarkMediumContrast = Color(0xFFD0CAB9)
val outlineDarkMediumContrast = Color(0xFFA8A392)
val outlineVariantDarkMediumContrast = Color(0xFF888373)
val scrimDarkMediumContrast = Color(0xFF000000)
val inverseSurfaceDarkMediumContrast = Color(0xFFE8E2D4)
val inverseOnSurfaceDarkMediumContrast = Color(0xFF2C2A21)
val inversePrimaryDarkMediumContrast = Color(0xFF524800)
val surfaceDimDarkMediumContrast = Color(0xFF15130C)
val surfaceBrightDarkMediumContrast = Color(0xFF3C3930)
val surfaceContainerLowestDarkMediumContrast = Color(0xFF100E07)
val surfaceContainerLowDarkMediumContrast = Color(0xFF1D1C13)
val surfaceContainerDarkMediumContrast = Color(0xFF222017)
val surfaceContainerHighDarkMediumContrast = Color(0xFF2C2A21)
val surfaceContainerHighestDarkMediumContrast = Color(0xFF37352B)

val primaryDarkHighContrast = Color(0xFFFFFAF4)
val onPrimaryDarkHighContrast = Color(0xFF000000)
val primaryContainerDarkHighContrast = Color(0xFFDCCC74)
val onPrimaryContainerDarkHighContrast = Color(0xFF000000)
val secondaryDarkHighContrast = Color(0xFFFFFAF4)
val onSecondaryDarkHighContrast = Color(0xFF000000)
val secondaryContainerDarkHighContrast = Color(0xFFD4CBA6)
val onSecondaryContainerDarkHighContrast = Color(0xFF000000)
val tertiaryDarkHighContrast = Color(0xFFEEFFF1)
val onTertiaryDarkHighContrast = Color(0xFF000000)
val tertiaryContainerDarkHighContrast = Color(0xFFACD4BA)
val onTertiaryContainerDarkHighContrast = Color(0xFF000000)
val errorDarkHighContrast = Color(0xFFFFF9F9)
val onErrorDarkHighContrast = Color(0xFF000000)
val errorContainerDarkHighContrast = Color(0xFFFFBAB1)
val onErrorContainerDarkHighContrast = Color(0xFF000000)
val backgroundDarkHighContrast = Color(0xFF15130C)
val onBackgroundDarkHighContrast = Color(0xFFE8E2D4)
val surfaceDarkHighContrast = Color(0xFF15130C)
val onSurfaceDarkHighContrast = Color(0xFFFFFFFF)
val surfaceVariantDarkHighContrast = Color(0xFF4A4739)
val onSurfaceVariantDarkHighContrast = Color(0xFFFFFAF4)
val outlineDarkHighContrast = Color(0xFFD0CAB9)
val outlineVariantDarkHighContrast = Color(0xFFD0CAB9)
val scrimDarkHighContrast = Color(0xFF000000)
val inverseSurfaceDarkHighContrast = Color(0xFFE8E2D4)
val inverseOnSurfaceDarkHighContrast = Color(0xFF000000)
val inversePrimaryDarkHighContrast = Color(0xFF312A00)
val surfaceDimDarkHighContrast = Color(0xFF15130C)
val surfaceBrightDarkHighContrast = Color(0xFF3C3930)
val surfaceContainerLowestDarkHighContrast = Color(0xFF100E07)
val surfaceContainerLowDarkHighContrast = Color(0xFF1D1C13)
val surfaceContainerDarkHighContrast = Color(0xFF222017)
val surfaceContainerHighDarkHighContrast = Color(0xFF2C2A21)
val surfaceContainerHighestDarkHighContrast = Color(0xFF37352B)





val Purple80 = Color(0xFFD0BCFF)
val PurpleGrey80 = Color(0xFFCCC2DC)
val Pink80 = Color(0xFFEFB8C8)

val Purple40 = Color(0xFF6650a4)
val PurpleGrey40 = Color(0xFF625b71)
val Pink40 = Color(0xFF7D5260)

val ToDoPurple = Color(0xFF9395D3)
Loading