From 139446e03d5428ddeb37070215c8f07d8a007525 Mon Sep 17 00:00:00 2001
From: istiakshihab <istiak@pm.me>
Date: Tue, 19 Oct 2021 20:37:13 +0600
Subject: [PATCH] Fixed Dark Mode

---
 app/src/main/res/drawable/home_bg.xml             |  2 +-
 .../activity_geography_or_literature_quiz.xml     |  2 --
 app/src/main/res/layout/activity_history.xml      |  2 +-
 app/src/main/res/layout/activity_login.xml        |  3 +--
 app/src/main/res/layout/activity_main.xml         |  2 +-
 app/src/main/res/layout/activity_math_quiz.xml    |  2 --
 app/src/main/res/layout/slide_rules.xml           |  1 -
 app/src/main/res/values-night/themes.xml          |  3 +++
 app/src/main/res/values/themes.xml                |  6 +++---
 local.properties                                  | 15 ++++++++-------
 10 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/app/src/main/res/drawable/home_bg.xml b/app/src/main/res/drawable/home_bg.xml
index b47f410..d6b173a 100644
--- a/app/src/main/res/drawable/home_bg.xml
+++ b/app/src/main/res/drawable/home_bg.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <solid android:color="@color/white"/>
+    <solid android:color="?attr/colorOnBackground"/>
     <corners android:topRightRadius="32dp"
         android:topLeftRadius="24dp"/>
 
diff --git a/app/src/main/res/layout/activity_geography_or_literature_quiz.xml b/app/src/main/res/layout/activity_geography_or_literature_quiz.xml
index 62a02ef..37daaa5 100644
--- a/app/src/main/res/layout/activity_geography_or_literature_quiz.xml
+++ b/app/src/main/res/layout/activity_geography_or_literature_quiz.xml
@@ -48,7 +48,6 @@
                 android:layout_marginTop="40dp"
                 android:layout_marginEnd="24dp"
                 android:textAlignment="center"
-                android:textColor="@color/black"
                 android:textSize="32sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -118,7 +117,6 @@ last name of Hitler?" />
                 android:layout_height="wrap_content"
                 android:layout_marginTop="60dp"
                 android:layout_marginBottom="60dp"
-                android:textColor="@color/black"
                 android:textSize="26sp"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toTopOf="@+id/btnNextQuestionLiteratureAndGeography"
diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_history.xml
index dc00cc5..f82e427 100644
--- a/app/src/main/res/layout/activity_history.xml
+++ b/app/src/main/res/layout/activity_history.xml
@@ -17,7 +17,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/arrow"
-        app:tint="@color/black" />
+        app:tint="?attr/tint" />
 
     <TextView
         android:id="@+id/textView"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index ca7e249..6004b3e 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -13,7 +13,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="160dp"
         android:text="@string/welcome_back"
-        android:textColor="@color/black"
         android:textSize="28sp"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
@@ -26,7 +25,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:text="@string/login_to_continue"
-        android:textColor="@color/black"
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="@+id/tvSignUp2"
         app:layout_constraintStart_toStartOf="@+id/tvSignUp2"
@@ -76,6 +74,7 @@
         style="@style/btnStyle"
         android:layout_width="0dp"
         android:layout_marginTop="32dp"
+        android:textColor="@color/white"
         android:text="@string/login"
         app:layout_constraintEnd_toEndOf="@+id/textInputLayout2"
         app:layout_constraintHorizontal_bias="0.464"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 25669fc..61508cf 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/peach"
+    android:background="?attr/backgroundColor"
     tools:context=".MainActivity">
 
 
diff --git a/app/src/main/res/layout/activity_math_quiz.xml b/app/src/main/res/layout/activity_math_quiz.xml
index 96b4ce4..5324336 100644
--- a/app/src/main/res/layout/activity_math_quiz.xml
+++ b/app/src/main/res/layout/activity_math_quiz.xml
@@ -38,7 +38,6 @@
         android:layout_marginTop="80dp"
         android:layout_marginEnd="24dp"
         android:textAlignment="center"
-        android:textColor="@color/black"
         android:textSize="32sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -86,7 +85,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
-        android:textColor="@color/black"
         android:textSize="26sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/btnNextQuestionMath"
diff --git a/app/src/main/res/layout/slide_rules.xml b/app/src/main/res/layout/slide_rules.xml
index 0c0d4bc..bc4cc75 100644
--- a/app/src/main/res/layout/slide_rules.xml
+++ b/app/src/main/res/layout/slide_rules.xml
@@ -22,7 +22,6 @@
         android:layout_marginEnd="24dp"
         android:textSize="24sp"
         android:textAlignment="center"
-        android:textColor="@color/black"
         android:text="@string/rules1_description"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index cc3eb02..06f7c9d 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -11,6 +11,9 @@
         <item name="colorOnSecondary">@color/black</item>
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="backgroundColor">@color/teal_200</item>
+        <item name="colorOnBackground">@color/black</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 7681fd0..710e8f2 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -8,8 +8,10 @@
         <!-- Status bar color. -->
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
-
+        <item name="android:textColor">@color/black</item>
         <item name="textInputStyle">@style/editTextLayoutStyle</item>
+        <item name="backgroundColor">@color/peach</item>
+        <item name="colorOnBackground">@color/white</item>
     </style>
 
     <style name="splashScreenTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
@@ -53,7 +55,6 @@
 
     <style name="titleTextStyle">
         <item name="android:textSize">28sp</item>
-        <item name="android:textColor">@color/black</item>
         <item name="android:textStyle">bold</item>
     </style>
 
@@ -83,7 +84,6 @@
 
     <style name="text_radio_button_answer">
         <item name="android:textSize">20sp</item>
-        <item name="android:textColor">@color/black</item>
         <item name="buttonTint">@color/peach</item>
     </style>
 
diff --git a/local.properties b/local.properties
index aeb6b69..48858f9 100644
--- a/local.properties
+++ b/local.properties
@@ -1,7 +1,8 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=C\:\\Users\\sagar\\AppData\\Local\\Android\\Sdk
\ No newline at end of file
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Tue Oct 19 19:43:23 BDT 2021
+sdk.dir=/home/istiak/Android/Sdk