From 9bd3a0d02efe749c6d4f1786d29a9e57db03b34e Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Fri, 21 Feb 2020 09:07:50 -0600
Subject: [PATCH] Use accent color in repeat picker

---
 .../main/java/org/tasks/repeats/CustomRecurrenceDialog.java   | 4 ++--
 app/src/main/res/layout/control_set_repeat.xml                | 4 ++--
 app/src/main/res/values-night/theme_dark_grey.xml             | 2 --
 app/src/main/res/values/attrs.xml                             | 2 --
 app/src/main/res/values/theme.xml                             | 2 --
 app/src/main/res/values/theme_white.xml                       | 2 --
 6 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java b/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java
index 328972601..68970342b 100644
--- a/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java
+++ b/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java
@@ -300,11 +300,11 @@ public class CustomRecurrenceDialog extends InjectingDialogFragment {
               new int[] {android.R.attr.state_checked}, new int[] {-android.R.attr.state_checked}
             },
             new int[] {
-              ResourceResolver.getData(context, R.attr.weekdayButtonText),
+              ResourceResolver.getData(context, R.attr.colorOnSecondary),
               getColor(context, R.color.text_primary)
             });
     int inset = (int) context.getResources().getDimension(R.dimen.week_button_inset);
-    int accentColor = ResourceResolver.getData(context, R.attr.weekdayButtonBackground);
+    int accentColor = ResourceResolver.getData(context, R.attr.colorAccent);
     int animationDuration =
         context.getResources().getInteger(android.R.integer.config_shortAnimTime);
 
diff --git a/app/src/main/res/layout/control_set_repeat.xml b/app/src/main/res/layout/control_set_repeat.xml
index 1f28aaa0f..fd9faeb21 100644
--- a/app/src/main/res/layout/control_set_repeat.xml
+++ b/app/src/main/res/layout/control_set_repeat.xml
@@ -17,7 +17,7 @@
     <FrameLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="?attr/colorPrimary">
+      android:background="?attr/colorAccent">
 
       <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/frequency"
@@ -31,7 +31,7 @@
         android:paddingEnd="@dimen/keyline_first"
         android:paddingLeft="@dimen/keyline_first"
         android:paddingRight="@dimen/keyline_first"
-        app:backgroundTint="?attr/colorOnPrimary"/>
+        app:backgroundTint="?attr/colorOnSecondary"/>
 
     </FrameLayout>
 
diff --git a/app/src/main/res/values-night/theme_dark_grey.xml b/app/src/main/res/values-night/theme_dark_grey.xml
index 099f988ac..598242f8c 100644
--- a/app/src/main/res/values-night/theme_dark_grey.xml
+++ b/app/src/main/res/values-night/theme_dark_grey.xml
@@ -9,8 +9,6 @@
     <item name="materialButtonBackground">@color/button_accent_background</item>
     <item name="materialButtonRipple">@color/button_accent_ripple</item>
     <item name="materialButtonStroke">@color/button_accent_stroke</item>
-    <item name="weekdayButtonBackground">?attr/colorAccent</item>
-    <item name="weekdayButtonText">?attr/colorOnSecondary</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index a8793532c..59baa4bba 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -13,8 +13,6 @@
   <attr format="reference" name="materialButtonBackground"/>
   <attr format="reference" name="materialButtonRipple"/>
   <attr format="reference" name="materialButtonStroke"/>
-  <attr format="reference" name="weekdayButtonBackground"/>
-  <attr format="reference" name="weekdayButtonText"/>
   <attr format="integer" name="horizontal_divider"/>
   <attr format="color" name="colorOnPrimaryHint"/>
 
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index 92fe02c9d..fff4f4d91 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -27,8 +27,6 @@
     <item name="materialButtonBackground">@color/mtrl_btn_text_btn_bg_color_selector</item>
     <item name="materialButtonRipple">@color/mtrl_btn_text_btn_ripple_color</item>
     <item name="materialButtonStroke">@color/mtrl_btn_stroke_color_selector</item>
-    <item name="weekdayButtonBackground">?attr/colorPrimary</item>
-    <item name="weekdayButtonText">?attr/colorOnPrimary</item>
     <item name="horizontal_divider">2</item> <!-- View.GONE -->
     <item name="preferenceTheme">@style/PreferenceTheme</item>
   </style>
diff --git a/app/src/main/res/values/theme_white.xml b/app/src/main/res/values/theme_white.xml
index 64d89e45d..8f3f8f596 100644
--- a/app/src/main/res/values/theme_white.xml
+++ b/app/src/main/res/values/theme_white.xml
@@ -14,8 +14,6 @@
     <item name="materialButtonBackground">@color/button_accent_background</item>
     <item name="materialButtonRipple">@color/button_accent_ripple</item>
     <item name="materialButtonStroke">@color/button_accent_stroke</item>
-    <item name="weekdayButtonBackground">?attr/colorAccent</item>
-    <item name="weekdayButtonText">?attr/colorOnSecondary</item>
   </style>
 
 </resources>
\ No newline at end of file