From 09165ad30684457127c72708232a1adefdc75d53 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Tue, 23 Oct 2018 09:37:41 -0500
Subject: [PATCH] Switch to material components themes

---
 app/src/main/res/layout/control_set_repeat.xml |  4 ++--
 app/src/main/res/layout/toolbar.xml            |  2 +-
 app/src/main/res/values-night/styles.xml       |  5 +++++
 app/src/main/res/values/styles.xml             |  8 ++++----
 app/src/main/res/values/theme.xml              | 12 +++++++++---
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/control_set_repeat.xml b/app/src/main/res/layout/control_set_repeat.xml
index ffaf62447..b65b348b3 100644
--- a/app/src/main/res/layout/control_set_repeat.xml
+++ b/app/src/main/res/layout/control_set_repeat.xml
@@ -21,7 +21,7 @@
 
       <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/frequency"
-        style="Widget.AppCompat.Spinner"
+        style="Widget.MaterialComponents.Spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
@@ -119,7 +119,7 @@
 
       <Spinner
         android:id="@+id/repeat_until"
-        style="Widget.AppCompat.Spinner"
+        style="Widget.MaterialComponents.Spinner"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/keyline_first"
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
index c44841fd0..680bd907a 100644
--- a/app/src/main/res/layout/toolbar.xml
+++ b/app/src/main/res/layout/toolbar.xml
@@ -8,5 +8,5 @@
   android:elevation="@dimen/elevation_toolbar"
   app:popupTheme="@style/popup_overlay"
   app:theme="?attr/overlay_theme"
-  app:toolbarStyle="@style/Widget.AppCompat.Toolbar"
+  app:toolbarStyle="@style/Widget.MaterialComponents.Toolbar"
   tools:ignore="UnusedAttribute"/>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 70e4c73ca..623544c7c 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,4 +1,9 @@
 <resources>
+  <style name="DayNight" parent="Theme.MaterialComponents.NoActionBar"/>
+
+  <style name="DayNightDialog" parent="Theme.MaterialComponents.Dialog"/>
+
+  <style name="DayNightAlert" parent="Theme.MaterialComponents.Dialog.Alert"/>
 
   <style name="popup_overlay" parent="ThemeOverlay.AppCompat"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 32ffe6e8f..14059785a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,14 +2,14 @@
 
   <!-- ========================================================== General  -->
 
-  <style name="popup_overlay" parent="ThemeOverlay.AppCompat.Light"/>
+  <style name="popup_overlay" parent="ThemeOverlay.MaterialComponents.Light"/>
 
   <style name="SpinnerNoPadding" parent="Widget.AppCompat.TextView.SpinnerItem">
     <item name="android:paddingLeft">0dp</item>
     <item name="android:paddingRight">0dp</item>
   </style>
 
-  <style name="TranslucentDialog" parent="Theme.AppCompat.Light.Dialog">
+  <style name="TranslucentDialog" parent="Theme.MaterialComponents.Light.Dialog">
     <item name="android:windowNoTitle">true</item>
     <item name="android:windowBackground">@android:color/transparent</item>
     <item name="android:colorBackgroundCacheHint">@null</item>
@@ -48,11 +48,11 @@
     <item name="fab_text">@color/black_87</item>
   </style>
 
-  <style name="WhiteToolbarOverlay" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+  <style name="WhiteToolbarOverlay" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="colorControlNormal">@color/white_100</item>
   </style>
 
-  <style name="BlackToolbarOverlay" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+  <style name="BlackToolbarOverlay" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="colorControlNormal">@color/black_87</item>
   </style>
 
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index e60a0b1b2..25cd5da59 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <style name="TasksBase" parent="Theme.AppCompat.DayNight.NoActionBar">
+  <style name="DayNight" parent="Theme.MaterialComponents.Light.NoActionBar" />
+
+  <style name="DayNightDialog" parent="Theme.MaterialComponents.Light.Dialog" />
+
+  <style name="DayNightAlert" parent="Theme.MaterialComponents.Light.Dialog.Alert" />
+
+  <style name="TasksBase" parent="DayNight">
     <item name="android:windowBackground">@null</item>
     <item name="windowActionModeOverlay">true</item>
     <item name="asWindowBackground">@color/window_background</item>
@@ -27,14 +33,14 @@
 
   <style name="Tasks" parent="TasksBase"/>
 
-  <style name="TasksDialogAlert" parent="@style/Theme.AppCompat.DayNight.Dialog.Alert">
+  <style name="TasksDialogAlert" parent="DayNightAlert">
     <item name="android:windowBackground">@color/dialog_background</item>
     <item name="colorAccent">?attr/colorAccentDialog</item>
     <item name="asTextColor">@color/text_primary</item>
     <item name="icon_tint">@color/icon_tint</item>
   </style>
 
-  <style name="TasksDialog" parent="@style/Theme.AppCompat.DayNight.Dialog">
+  <style name="TasksDialog" parent="DayNightDialog">
     <item name="android:windowBackground">@color/dialog_background</item>
     <item name="colorAccent">?attr/colorAccentDialog</item>
     <item name="asTextColor">@color/text_primary</item>