From f35dbaa529ff0bfaa6ddbada4198e594f3bde10a Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Wed, 24 Jul 2019 13:49:06 -0500
Subject: [PATCH] Use accent color for light white theme buttons

---
 .../org/tasks/billing/PurchaseAdapter.java    |  2 +-
 .../org/tasks/billing/PurchaseHolder.java     | 19 +++++--------------
 .../org/tasks/dialogs/AlertDialogBuilder.java |  3 ++-
 .../res/color/button_accent_background.xml    |  5 +++++
 .../main/res/color/button_accent_ripple.xml   |  8 ++++++++
 .../main/res/color/button_accent_stroke.xml   |  5 +++++
 app/src/main/res/color/button_accent_text.xml |  7 +++++++
 .../res/layout/dialog_name_your_price.xml     | 10 +++++-----
 .../main/res/layout/dialog_purchase_cell.xml  |  9 +++++----
 app/src/main/res/values-night/theme_white.xml |  6 ++++++
 app/src/main/res/values/attrs.xml             |  4 ++++
 app/src/main/res/values/styles.xml            | 13 +++++++++++++
 app/src/main/res/values/theme.xml             |  6 +++++-
 app/src/main/res/values/theme_white.xml       | 16 +++++++++++++++-
 14 files changed, 86 insertions(+), 27 deletions(-)
 create mode 100644 app/src/main/res/color/button_accent_background.xml
 create mode 100644 app/src/main/res/color/button_accent_ripple.xml
 create mode 100644 app/src/main/res/color/button_accent_stroke.xml
 create mode 100644 app/src/main/res/color/button_accent_text.xml
 create mode 100644 app/src/main/res/values-night/theme_white.xml

diff --git a/app/src/main/java/org/tasks/billing/PurchaseAdapter.java b/app/src/main/java/org/tasks/billing/PurchaseAdapter.java
index bea55a71f..2ef944bac 100644
--- a/app/src/main/java/org/tasks/billing/PurchaseAdapter.java
+++ b/app/src/main/java/org/tasks/billing/PurchaseAdapter.java
@@ -39,7 +39,7 @@ public class PurchaseAdapter extends ListAdapter<Integer, PurchaseHolder> {
   @Override
   public PurchaseHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
     View view = activity.getLayoutInflater().inflate(R.layout.dialog_purchase_cell, parent, false);
-    return new PurchaseHolder(activity, view, onPriceChanged, locale);
+    return new PurchaseHolder(view, onPriceChanged, locale);
   }
 
   @Override
diff --git a/app/src/main/java/org/tasks/billing/PurchaseHolder.java b/app/src/main/java/org/tasks/billing/PurchaseHolder.java
index 88d1f95e9..936a5510a 100644
--- a/app/src/main/java/org/tasks/billing/PurchaseHolder.java
+++ b/app/src/main/java/org/tasks/billing/PurchaseHolder.java
@@ -1,38 +1,32 @@
 package org.tasks.billing;
 
-import static org.tasks.preferences.ResourceResolver.getData;
-
-import android.content.Context;
 import android.view.View;
-import android.widget.TextView;
 import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import com.google.android.material.button.MaterialButton;
 import org.tasks.Callback;
 import org.tasks.R;
 import org.tasks.locale.Locale;
 
 public class PurchaseHolder extends RecyclerView.ViewHolder {
 
-  private final Context context;
   private final Callback<Integer> onClick;
   private final Locale locale;
 
   @BindView(R.id.price)
-  TextView textView;
+  MaterialButton button;
 
   private int price;
 
-  PurchaseHolder(Context context, @NonNull View view, Callback<Integer> onClick, Locale locale) {
+  PurchaseHolder(@NonNull View view, Callback<Integer> onClick, Locale locale) {
     super(view);
     this.locale = locale;
 
     ButterKnife.bind(this, view);
 
-    this.context = context;
     this.onClick = onClick;
   }
 
@@ -43,10 +37,7 @@ public class PurchaseHolder extends RecyclerView.ViewHolder {
 
   public void bind(int price, boolean selected) {
     this.price = price;
-    textView.setText(String.format("$%s", locale.formatNumber(price)));
-    textView.setTextColor(
-        selected
-            ? getData(context, R.attr.colorPrimary)
-            : ContextCompat.getColor(context, R.color.text_primary));
+    button.setText(String.format("$%s", locale.formatNumber(price)));
+    button.setChecked(selected);
   }
 }
diff --git a/app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java b/app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java
index 75cec5e11..94e6aaa43 100644
--- a/app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java
+++ b/app/src/main/java/org/tasks/dialogs/AlertDialogBuilder.java
@@ -8,6 +8,7 @@ import android.view.ContextThemeWrapper;
 import android.view.View;
 import android.widget.ListAdapter;
 import androidx.appcompat.app.AlertDialog;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import java.util.List;
 import org.tasks.locale.Locale;
 import org.tasks.themes.Theme;
@@ -25,7 +26,7 @@ public class AlertDialogBuilder {
     this.locale = locale;
     ContextThemeWrapper wrapper = theme.getThemedDialog(context);
     theme.applyToContext(wrapper);
-    builder = new AlertDialog.Builder(wrapper);
+    builder = new MaterialAlertDialogBuilder(wrapper);
   }
 
   public AlertDialogBuilder setMessage(int message, Object... formatArgs) {
diff --git a/app/src/main/res/color/button_accent_background.xml b/app/src/main/res/color/button_accent_background.xml
new file mode 100644
index 000000000..404d7771b
--- /dev/null
+++ b/app/src/main/res/color/button_accent_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:alpha="0.08" android:color="?attr/colorAccent" android:state_checked="true"/>
+  <item android:color="@android:color/transparent" android:state_checked="false"/>
+</selector>
diff --git a/app/src/main/res/color/button_accent_ripple.xml b/app/src/main/res/color/button_accent_ripple.xml
new file mode 100644
index 000000000..88ef2febb
--- /dev/null
+++ b/app/src/main/res/color/button_accent_ripple.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:alpha="0.16" android:color="?attr/colorAccent" android:state_pressed="true"/>
+  <item android:alpha="0.12" android:color="?attr/colorAccent" android:state_focused="true" android:state_hovered="true"/>
+  <item android:alpha="0.12" android:color="?attr/colorAccent" android:state_focused="true"/>
+  <item android:alpha="0.04" android:color="?attr/colorAccent" android:state_hovered="true"/>
+  <item android:alpha="0.00" android:color="?attr/colorAccent"/>
+</selector>
diff --git a/app/src/main/res/color/button_accent_stroke.xml b/app/src/main/res/color/button_accent_stroke.xml
new file mode 100644
index 000000000..ef283a50a
--- /dev/null
+++ b/app/src/main/res/color/button_accent_stroke.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="?attr/colorAccent" android:state_checked="true"/>
+  <item android:alpha="0.12" android:color="?attr/colorOnSurface" android:state_checked="false"/>
+</selector>
diff --git a/app/src/main/res/color/button_accent_text.xml b/app/src/main/res/color/button_accent_text.xml
new file mode 100644
index 000000000..08b2a61bb
--- /dev/null
+++ b/app/src/main/res/color/button_accent_text.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:alpha="1.00" android:color="?attr/colorAccent" android:state_checkable="true" android:state_checked="true" android:state_enabled="true"/>
+  <item android:alpha="0.60" android:color="?attr/colorOnSurface" android:state_checkable="true" android:state_checked="false" android:state_enabled="true"/>
+  <item android:alpha="1.00" android:color="?attr/colorAccent" android:state_enabled="true"/>
+  <item android:alpha="0.38" android:color="?attr/colorOnSurface"/>
+</selector>
diff --git a/app/src/main/res/layout/dialog_name_your_price.xml b/app/src/main/res/layout/dialog_name_your_price.xml
index 97555190c..d7a8ff030 100644
--- a/app/src/main/res/layout/dialog_name_your_price.xml
+++ b/app/src/main/res/layout/dialog_name_your_price.xml
@@ -33,14 +33,14 @@
 
       <com.google.android.material.button.MaterialButton
         android:id="@+id/button_monthly"
-        style="?attr/materialButtonOutlinedStyle"
+        style="@style/OutlineButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/monthly"/>
 
       <com.google.android.material.button.MaterialButton
         android:id="@+id/button_annually"
-        style="?attr/materialButtonOutlinedStyle"
+        style="@style/OutlineButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/annually"/>
@@ -55,7 +55,7 @@
 
     <com.google.android.material.button.MaterialButton
       android:id="@+id/subscribe"
-      style="?attr/materialButtonOutlinedStyle"
+      style="@style/TextButton"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="end"
@@ -63,7 +63,7 @@
 
     <com.google.android.material.button.MaterialButton
       android:id="@+id/unsubscribe"
-      style="?attr/materialButtonOutlinedStyle"
+      style="@style/TextButton"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="end"
@@ -72,7 +72,7 @@
 
     <com.google.android.material.button.MaterialButton
       android:id="@+id/button_more_info"
-      style="?attr/materialButtonOutlinedStyle"
+      style="@style/TextButton"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="end"
diff --git a/app/src/main/res/layout/dialog_purchase_cell.xml b/app/src/main/res/layout/dialog_purchase_cell.xml
index 197f550c8..1826dc043 100644
--- a/app/src/main/res/layout/dialog_purchase_cell.xml
+++ b/app/src/main/res/layout/dialog_purchase_cell.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.AppCompatTextView
+<com.google.android.material.button.MaterialButton
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
+  style="@style/TextButton"
   android:id="@+id/price"
+  android:paddingLeft="0dp"
+  android:paddingRight="0dp"
   android:layout_width="@dimen/icon_picker_size"
   android:layout_height="@dimen/icon_picker_size"
-  android:padding="8dp"
   android:textSize="18sp"
   android:textAlignment="center"
-  android:textColor="@color/text_primary"
   android:clickable="true"
   android:focusable="true"
-  android:background="?attr/selectableItemBackgroundBorderless"
+  android:checkable="true"
   tools:ignore="ContentDescription"/>
diff --git a/app/src/main/res/values-night/theme_white.xml b/app/src/main/res/values-night/theme_white.xml
new file mode 100644
index 000000000..444468ced
--- /dev/null
+++ b/app/src/main/res/values-night/theme_white.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+  <style name="White" parent="White_Base"/>
+
+</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 1d9314dde..fd561ba66 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -18,6 +18,10 @@
   <attr format="dimension" name="alpha_disabled"/>
   <attr format="color" name="colorAccentDialog"/>
   <attr format="dimension" name="card_elevation"/>
+  <attr format="reference" name="materialButtonText"/>
+  <attr format="reference" name="materialButtonBackground"/>
+  <attr format="reference" name="materialButtonRipple"/>
+  <attr format="reference" name="materialButtonStroke"/>
 
   <declare-styleable name="TimePreference">
     <attr format="string" name="summary"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c5be6c3d3..852836226 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -154,4 +154,17 @@
     <item name="closeIconStartPadding">0dp</item>
   </style>
 
+  <style name="OutlineButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <item name="android:textColor">?attr/materialButtonText</item>
+    <item name="backgroundTint">?attr/materialButtonBackground</item>
+    <item name="rippleColor">?attr/materialButtonRipple</item>
+    <item name="strokeColor">?attr/materialButtonStroke</item>
+  </style>
+
+  <style name="TextButton" parent="Widget.MaterialComponents.Button.TextButton">
+    <item name="android:textColor">?attr/materialButtonText</item>
+    <item name="backgroundTint">?attr/materialButtonBackground</item>
+    <item name="rippleColor">?attr/materialButtonRipple</item>
+  </style>
+
 </resources>
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index 0b10b7f1f..6fce8cf0d 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -18,7 +18,7 @@
     <item name="android:spinnerItemStyle">@style/SpinnerNoPadding</item>
     <item name="dialogTheme">@style/TasksDialog</item>
     <item name="android:dialogTheme">@style/TasksDialog</item>
-    <item name="alertDialogTheme">@style/TasksDialogAlert</item>
+    <item name="materialAlertDialogTheme">@style/TasksDialogAlert</item>
     <item name="alpha_secondary">@dimen/alpha_secondary</item>
     <item name="alpha_disabled">@dimen/alpha_disabled</item>
     <item name="android:textColorPrimary">@color/text_primary</item>
@@ -31,6 +31,10 @@
     <item name="nnf_save_icon_color">?attr/colorAccent</item>
     <item name="nnf_dir_icon_color">?attr/colorAccent</item>
     <item name="card_elevation">2dp</item>
+    <item name="materialButtonText">@color/mtrl_text_btn_text_color_selector</item>
+    <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>
   </style>
 
   <style name="Tasks" parent="TasksBase"/>
diff --git a/app/src/main/res/values/theme_white.xml b/app/src/main/res/values/theme_white.xml
index 08dce7c80..bde4f07d5 100644
--- a/app/src/main/res/values/theme_white.xml
+++ b/app/src/main/res/values/theme_white.xml
@@ -1,9 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <style name="White" parent="BlackToolbarTheme">
+  <style name="White_Base" parent="BlackToolbarTheme">
     <item name="colorPrimary">@color/white_100</item>
     <item name="colorPrimaryVariant">@color/white_100</item>
   </style>
 
+  <style name="White" parent="White_Base">
+    <item name="buttonBarPositiveButtonStyle">@style/AlertButtonStyle</item>
+    <item name="buttonBarNegativeButtonStyle">@style/AlertButtonStyle</item>
+    <item name="buttonBarNeutralButtonStyle">@style/AlertButtonStyle</item>
+    <item name="materialButtonText">@color/button_accent_text</item>
+    <item name="materialButtonBackground">@color/button_accent_background</item>
+    <item name="materialButtonRipple">@color/button_accent_ripple</item>
+    <item name="materialButtonStroke">@color/button_accent_stroke</item>
+  </style>
+
+  <style name="AlertButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog.Flush">
+    <item name="android:textColor">?attr/colorAccent</item>
+  </style>
+
 </resources>
\ No newline at end of file