From 5a4b2754e30d94b2a5e04a24a7359c1c55ee0068 Mon Sep 17 00:00:00 2001
From: Aditya Wasan <adityawasan55@gmail.com>
Date: Sat, 22 Aug 2020 19:45:08 +0530
Subject: [PATCH] Haha material design go brrrrr

Signed-off-by: Aditya Wasan <adityawasan55@gmail.com>
---
 .../java/dev/msfjarvis/todo/MainActivity.kt   |  9 ++---
 .../java/dev/msfjarvis/todo/ui/TodoTheme.kt   | 34 +++++++++++--------
 app/src/main/res/values-night/themes.xml      |  3 +-
 app/src/main/res/values/themes.xml            |  5 +--
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/dev/msfjarvis/todo/MainActivity.kt b/app/src/main/java/dev/msfjarvis/todo/MainActivity.kt
index 2fff6332..6bd2df6e 100644
--- a/app/src/main/java/dev/msfjarvis/todo/MainActivity.kt
+++ b/app/src/main/java/dev/msfjarvis/todo/MainActivity.kt
@@ -9,10 +9,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumnFor
 import androidx.compose.foundation.lazy.LazyItemScope
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Card
-import androidx.compose.material.FloatingActionButton
-import androidx.compose.material.Scaffold
-import androidx.compose.material.TopAppBar
+import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ExposurePlus1
 import androidx.compose.runtime.Composable
@@ -54,7 +51,7 @@ fun TodoApp() {
         },
         elevation = 8.dp,
       ) {
-        Icon(asset = Icons.Filled.ExposurePlus1)
+        Icon(asset = Icons.Filled.ExposurePlus1, tint = MaterialTheme.colors.onSurface)
       }
     },
     bodyContent = {
@@ -73,12 +70,10 @@ fun LazyItemScope.TodoRowItem(item: TodoItem) {
     Card(
       shape = RoundedCornerShape(8.dp),
       modifier = Modifier.fillParentMaxWidth(),
-      backgroundColor = Color.Black
     ) {
       Text(
         text = item.title,
         style = TextStyle(
-          color = Color.White,
           fontSize = 20.sp,
           textAlign = TextAlign.Center
         ),
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 d722a249..74d78c68 100644
--- a/app/src/main/java/dev/msfjarvis/todo/ui/TodoTheme.kt
+++ b/app/src/main/java/dev/msfjarvis/todo/ui/TodoTheme.kt
@@ -14,22 +14,26 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextIndent
 import androidx.compose.ui.unit.sp
 
-private val lightColors = lightColors(
-  primary = Color(0xFF6200EE),
-  primaryVariant = Color(0xFF3700B3),
-  onPrimary = Color(0xFFFFFFFF),
-  secondary = Color(0xFF03DAC5),
-  secondaryVariant = Color(0xFF0000FF),
-  onSecondary = Color(0xFF000000),
-  background = Color(0xFFFFFFFF),
-  onBackground = Color(0xFF000000),
-  surface = Color(0xFFFFFFFF),
-  onSurface = Color(0xFF000000),
-  error = Color(0xFFB00020),
-  onError = Color(0xFFFFFFFF)
+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.White,
+)
+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 darkColors = darkColors()
 
 private val typography = Typography(
   body1 = TextStyle(
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 8452ad79..f4111761 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -3,13 +3,14 @@
     <style name="Theme.ComposeToDo" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimaryVariant">@color/black</item>
         <item name="colorOnPrimary">@color/black</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_200</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
+        <item name="android:windowLightStatusBar">false</item>
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index f80c74b3..f67d3002 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,14 +2,15 @@
     <!-- Base application theme. -->
     <style name="Theme.ComposeToDo" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/white</item>
+        <item name="colorPrimaryVariant">@color/white</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_700</item>
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
+        <item name="android:windowLightStatusBar">true</item>
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>