From caa2811c0aedc45c67b4df389aba36c8d856170d Mon Sep 17 00:00:00 2001 From: Aditya Wasan Date: Mon, 7 Sep 2020 11:28:55 +0530 Subject: [PATCH] Fix theme colors Signed-off-by: Aditya Wasan --- .../java/dev/msfjarvis/todo/MainActivity.kt | 3 +- .../java/dev/msfjarvis/todo/ui/TodoTheme.kt | 38 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/dev/msfjarvis/todo/MainActivity.kt b/app/src/main/java/dev/msfjarvis/todo/MainActivity.kt index d2321032..a3abd075 100644 --- a/app/src/main/java/dev/msfjarvis/todo/MainActivity.kt +++ b/app/src/main/java/dev/msfjarvis/todo/MainActivity.kt @@ -81,7 +81,7 @@ fun TodoApp( ) { IconResource( resourceId = R.drawable.ic_exposure_plus_1_24dp, - tint = MaterialTheme.colors.onSurface, + tint = MaterialTheme.colors.onSecondary, ) } }, @@ -108,6 +108,7 @@ fun ItemAddDialog( }, text = { OutlinedTextField( + activeColor = MaterialTheme.colors.secondary, value = newItemName, onValueChange = { newItemName = it }, label = { diff --git a/app/src/main/java/dev/msfjarvis/todo/ui/TodoTheme.kt b/app/src/main/java/dev/msfjarvis/todo/ui/TodoTheme.kt index 9baee8e4..85dcb35b 100644 --- a/app/src/main/java/dev/msfjarvis/todo/ui/TodoTheme.kt +++ b/app/src/main/java/dev/msfjarvis/todo/ui/TodoTheme.kt @@ -5,6 +5,44 @@ import androidx.compose.material.MaterialTheme import androidx.compose.material.darkColors import androidx.compose.material.lightColors import androidx.compose.runtime.Composable +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextIndent +import androidx.compose.ui.unit.sp + +val lightColors = lightColors( + primary = Color.White, + secondary = Color(0xFF3700B3), + background = Color.White, + surface = Color.White, + onPrimary = Color.Black, + onSecondary = Color.White, + onBackground = Color.Black, + onSurface = Color.Black, +) +val darkColors = darkColors( + primary = Color(0xFF121212), + secondary = Color(0xFFBB86FC), + background = Color.Black, + surface = Color(0xFF121212), + onPrimary = Color.White, + onSecondary = Color.White, + onBackground = Color.White, + onSurface = Color.White, +) + +private val typography = Typography( + body1 = TextStyle( + fontFamily = FontFamily.Serif, + fontWeight = FontWeight.Normal, + fontSize = 20.sp, + textIndent = TextIndent(firstLine = 16.sp), + textAlign = TextAlign.Justify + ) +) @Composable fun TodoTheme(children: @Composable () -> Unit) {