From bfc0fa36b1b47a909f9a6f48666cdb163485cd1b Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Tue, 28 May 2019 14:10:46 -0700
Subject: [PATCH] For #2133 - Add destructive text color to delete history
 button

---
 .../HistoryDeleteButtonViewHolder.kt          |  1 -
 .../main/res/layout/delete_history_button.xml | 45 ++++++++-----------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryDeleteButtonViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryDeleteButtonViewHolder.kt
index a67bd88918..7734314350 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryDeleteButtonViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryDeleteButtonViewHolder.kt
@@ -17,7 +17,6 @@ class HistoryDeleteButtonViewHolder(
     private val actionEmitter: Observer<HistoryAction>
 ) : RecyclerView.ViewHolder(view) {
     private var mode: HistoryState.Mode? = null
-    private val textView = view.delete_history_button_text
     private val buttonView = view.delete_history_button
 
     init {
diff --git a/app/src/main/res/layout/delete_history_button.xml b/app/src/main/res/layout/delete_history_button.xml
index 735f27ca8b..c817fb7f4e 100644
--- a/app/src/main/res/layout/delete_history_button.xml
+++ b/app/src/main/res/layout/delete_history_button.xml
@@ -2,32 +2,23 @@
 <!-- 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/. -->
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
-    android:foreground="?android:attr/selectableItemBackground"
-    android:background="@drawable/button_background"
-    android:layout_margin="16dp"
-    android:padding="6dp"
-    android:clickable="true"
-    android:focusable="true"
+    style="@style/Widget.MaterialComponents.Button.TextButton"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/delete_history_button_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/history_delete_all"
-        android:gravity="center"
-        android:textColor="?primaryText"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        android:clickable="false"
-        android:focusable="false"
-        android:drawableTint="?primaryText"
-        android:drawableStart="@drawable/ic_delete"
-        android:drawablePadding="12dp"/>
-
-</FrameLayout>
\ No newline at end of file
+    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:icon="@drawable/ic_delete"
+    app:iconGravity="textStart"
+    app:iconPadding="8dp"
+    app:iconTint="?destructive"
+    app:rippleColor="?secondaryText" />