From 9009d16ac6995b49b9c19bdb6f97e2f58440357e Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Thu, 13 Jun 2019 15:38:51 -0700
Subject: [PATCH] Closes #3452 Closes #3553 - Implement one button style for
 all themes

---
 .../res/layout/delete_exceptions_button.xml   | 17 ++---
 .../main/res/layout/delete_history_button.xml |  9 +--
 .../layout/fragment_delete_browsing_data.xml  | 14 +---
 .../fragment_site_permissions_exceptions.xml  | 76 +++++++++----------
 .../main/res/layout/save_tab_group_button.xml |  1 -
 app/src/main/res/values/colors.xml            |  5 ++
 app/src/main/res/values/styles.xml            | 13 ++++
 7 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/app/src/main/res/layout/delete_exceptions_button.xml b/app/src/main/res/layout/delete_exceptions_button.xml
index 12b15e88b..0a54865ea 100644
--- a/app/src/main/res/layout/delete_exceptions_button.xml
+++ b/app/src/main/res/layout/delete_exceptions_button.xml
@@ -2,17 +2,14 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<Button android:id="@+id/removeAllExceptions"
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/removeAllExceptions"
+    style="@style/ThemeIndependentMaterialGreyButton"
     android:layout_width="wrap_content"
+    android:paddingStart="24dp"
+    android:paddingEnd="24dp"
     android:layout_height="wrap_content"
     android:layout_gravity="start"
     android:layout_margin="12dp"
-    android:backgroundTint="?attr/neutral"
-    android:paddingStart="24dp"
-    android:paddingEnd="24dp"
-    android:text="@string/preferences_tracking_protection_exceptions_turn_on_for_all"
-    android:textAllCaps="false"
-    android:textColor="?attr/accentHighContrast"
-    android:textSize="14sp"
-    android:textStyle="bold"
-    xmlns:android="http://schemas.android.com/apk/res/android" />
+    android:text="@string/preferences_tracking_protection_exceptions_turn_on_for_all" />
+
diff --git a/app/src/main/res/layout/delete_history_button.xml b/app/src/main/res/layout/delete_history_button.xml
index 528b2f435..9530fb972 100644
--- a/app/src/main/res/layout/delete_history_button.xml
+++ b/app/src/main/res/layout/delete_history_button.xml
@@ -5,16 +5,9 @@
 <com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/delete_history_button"
-    style="@style/Widget.MaterialComponents.Button.TextButton"
+    style="@style/ThemeIndependentMaterialGreyButtonDestructive"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="16dp"
-    android:background="@drawable/button_background"
-    android:letterSpacing="0"
     android:text="@string/history_delete_all"
-    android:textAllCaps="false"
-    android:textColor="?destructive"
-    android:textStyle="bold"
-    android:theme="@style/Theme.MaterialComponents.Light"
-    app:backgroundTint="?neutral"
     app:rippleColor="?secondaryText" />
diff --git a/app/src/main/res/layout/fragment_delete_browsing_data.xml b/app/src/main/res/layout/fragment_delete_browsing_data.xml
index 60e008d5c..20ba5980d 100644
--- a/app/src/main/res/layout/fragment_delete_browsing_data.xml
+++ b/app/src/main/res/layout/fragment_delete_browsing_data.xml
@@ -59,19 +59,13 @@
                 app:deleteBrowsingDataItemIcon="@drawable/ic_collections_circle_background"
                 app:deleteBrowsingDataItemTitle="@string/preferences_delete_browsing_data_collections_title"
                 app:deleteBrowsingDataItemSubtitle="@string/preferences_delete_browsing_data_collections_subtitle" />
-            <Button android:id="@+id/delete_data"
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/delete_data"
+                style="@style/ThemeIndependentMaterialGreyButtonDestructive"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="start"
                 android:layout_margin="12dp"
-                android:backgroundTint="?attr/neutral"
-                android:paddingStart="24dp"
-                android:paddingEnd="24dp"
-                android:text="@string/preferences_delete_browsing_data_button"
-                android:textAllCaps="false"
-                android:textColor="?attr/accentHighContrast"
-                android:textSize="16sp"
-                android:textStyle="bold" />
+                android:text="@string/preferences_delete_browsing_data_button" />
         </LinearLayout>
     </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_site_permissions_exceptions.xml b/app/src/main/res/layout/fragment_site_permissions_exceptions.xml
index a0b93e4a6..ea7281dba 100644
--- a/app/src/main/res/layout/fragment_site_permissions_exceptions.xml
+++ b/app/src/main/res/layout/fragment_site_permissions_exceptions.xml
@@ -3,48 +3,48 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/container">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
     <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/exceptions"
-            android:visibility="gone"
-            tools:visibility="visible"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"/>
+        android:id="@+id/exceptions"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
 
-    <Button
-            android:id="@+id/delete_all_site_permissions_button"
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/clear_permissions_on_all_sites"
-            app:layout_constraintTop_toBottomOf="@id/exceptions"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_margin="16dp"
-            style="@style/SitePermissionButton"/>
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/delete_all_site_permissions_button"
+        style="@style/ThemeIndependentMaterialGreyButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:background="@drawable/button_background"
+        android:text="@string/clear_permissions_on_all_sites"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/exceptions" />
 
     <TextView
-            android:id="@+id/empty_exception_container"
-            tools:visibility="visible"
-            android:visibility="gone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="?primaryText"
-            android:textSize="20sp"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            android:text="@string/no_site_exceptions"/>
+        android:id="@+id/empty_exception_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/no_site_exceptions"
+        android:textColor="?primaryText"
+        android:textSize="20sp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/save_tab_group_button.xml b/app/src/main/res/layout/save_tab_group_button.xml
index 9c2a34d42..11bb5f5d6 100644
--- a/app/src/main/res/layout/save_tab_group_button.xml
+++ b/app/src/main/res/layout/save_tab_group_button.xml
@@ -17,7 +17,6 @@
     android:text="@string/save_to_collection"
     android:textAllCaps="false"
     android:textColor="?contrastText"
-    android:theme="@style/Theme.MaterialComponents.Light"
     app:backgroundTint="?accent"
     app:icon="@drawable/ic_tab_collection"
     app:iconGravity="textStart"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 56d177a21..feaabea30 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -178,4 +178,9 @@
     <!-- Launcher Icon colors -->
     <color name="default_launcher_background">#FDFDFD</color>
     <color name="debug_launcher_background">#220033</color>
+
+    <!-- Button Colors -->
+    <color name="grey_button_color">#E0E0E6</color>
+    <color name="destructive_button_text_color">#C50042</color>
+    <color name="button_text_color">#312A65</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 407e4cbaa..7ddc13912 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -139,6 +139,19 @@
         <item name="android:windowExitAnimation">@anim/fade_out</item>
     </style>
 
+    <style name="ThemeIndependentMaterialGreyButton" parent="Widget.MaterialComponents.Button.TextButton">
+        <item name="android:letterSpacing">0</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="backgroundTint">@color/grey_button_color</item>
+        <item name="android:textColor">@color/button_text_color</item>
+        <item name="rippleColor">?secondaryText</item>
+    </style>
+
+    <style name="ThemeIndependentMaterialGreyButtonDestructive" parent="ThemeIndependentMaterialGreyButton">
+        <item name="android:textColor">@color/destructive_button_text_color</item>
+    </style>
+
     <style name="search_pill" parent="Widget.AppCompat.Button.Borderless">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">32dp</item>