From 09c75914d6d43fe4a644d1a02ee79c30afa622ee Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Sun, 6 Sep 2020 14:26:14 +0300
Subject: [PATCH] Update appcompat deps and update styles as required

---
 app/build.gradle                   |  6 +++---
 app/src/main/res/values/styles.xml | 34 +++++++++++++++++++++++-------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8020b75d..4c759439 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -142,9 +142,9 @@ dependencies {
     implementation "androidx.legacy:legacy-support-core-ui:$supportVersion"
     implementation "androidx.core:core:$supportVersion"
     implementation "androidx.fragment:fragment:$supportVersion"
-    implementation "androidx.appcompat:appcompat:$supportVersion"
-    implementation "androidx.cardview:cardview:$supportVersion"
-    implementation "com.google.android.material:material:$supportVersion"
+    implementation "androidx.appcompat:appcompat:1.1.0"
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation 'com.google.android.material:material:1.2.0-beta01'
     implementation "androidx.legacy:legacy-preference-v14:$supportVersion"
     implementation 'com.github.yukuku:ambilwarna:2.0.1'
     implementation ('com.github.worker8:tourguide:1.0.17-SNAPSHOT@aar') {
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7add454c..585541bf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,17 +24,35 @@
     <!-- preference-v14 uses this color for categories text -->
     <color name="preference_fallback_accent_color">@color/orangeA700</color>
 
+    <color name="primaryColor">#FFC107</color>
+    <color name="primaryLightColor">#FFD54F</color>
+    <color name="primaryDarkColor">#FFA000</color>
+    <color name="secondaryColor">#29B6F6</color>
+    <color name="secondaryLightColor">#81D4FA</color>
+    <color name="secondaryDarkColor">#039BE5</color>
+    <color name="primaryTextColor">#000000</color>
+
+    <color name="errorColor">#d32f2f</color>
+
 
     <!-- app theme -->
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light">
-        <item name="alertDialogTheme">@style/AppTheme.Dialog.Alert</item>
-        <item name="colorPrimary">@color/light_green500</item>
-        <item name="colorPrimaryDark">@color/light_green700</item>
-        <item name="colorAccent">@color/orangeA700</item>
-        <item name="android:textColorPrimary">@drawable/text_color</item>
-        <item name="android:textColorSecondary">@color/grey700</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light">
+        <!-- see https://github.com/material-components/material-components-android/blob/master/docs/theming/Color.md for component color names -->
+        <item name="colorPrimary">@color/primaryColor</item>
+        <item name="colorPrimaryDark">@color/primaryDarkColor</item>       <!-- additionally required for AppCompatActivity -->
+        <item name="colorPrimaryVariant">@color/primaryLightColor</item>
+        <item name="colorOnPrimary">@android:color/black</item>
+
+        <item name="colorSecondary">@color/secondaryColor</item>
+        <item name="colorSecondaryVariant">@color/secondaryLightColor</item>
+        <item name="colorOnSecondary">@android:color/white</item>
+
+        <item name="colorError">@color/errorColor</item>
+        <item name="colorOnError">@android:color/white</item>
+
+        <item name="android:colorBackground">@color/grey200</item>
+        <item name="colorSurface">@android:color/white</item>
     </style>
 
     <style name="AppTheme.NoActionBar">