From 7d65e21b83aeaecd0b67ebbb5dab1bdd5720692c Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Tue, 28 May 2019 13:17:32 -0700
Subject: [PATCH] For #2941 - Creates delete dialog style

---
 .../java/org/mozilla/fenix/home/HomeFragment.kt     |  2 +-
 .../fenix/library/history/HistoryFragment.kt        |  4 ++--
 .../fenix/settings/DeleteBrowsingDataFragment.kt    |  2 +-
 app/src/main/res/values/strings.xml                 |  2 ++
 app/src/main/res/values/styles.xml                  | 13 +++++++++++++
 5 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 3166ead6c..0ed9e4d4d 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -376,7 +376,7 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
         AlertDialog.Builder(
             ContextThemeWrapper(
                 activity,
-                R.style.DialogStyle
+                R.style.DeleteDialogStyle
             )
         ).apply {
             val message = context.getString(R.string.tab_collection_dialog_message, tabCollection.title)
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
index 6bfa43af2..49eb0ad97 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/HistoryFragment.kt
@@ -142,14 +142,14 @@ class HistoryFragment : Fragment(), CoroutineScope, BackHandler {
                             AlertDialog.Builder(
                                 ContextThemeWrapper(
                                     it,
-                                    R.style.DialogStyle
+                                    R.style.DeleteDialogStyle
                                 )
                             ).apply {
                                 setMessage(R.string.history_delete_all_dialog)
                                 setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _ ->
                                     dialog.cancel()
                                 }
-                                setPositiveButton(android.R.string.ok) { dialog: DialogInterface, _ ->
+                                setPositiveButton(R.string.history_clear_dialog) { dialog: DialogInterface, _ ->
                                     launch(Dispatchers.IO) {
                                         requireComponents.core.historyStorage.deleteEverything()
                                         reloadData()
diff --git a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt
index f20fb3b99..f59f0fe94 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/DeleteBrowsingDataFragment.kt
@@ -112,7 +112,7 @@ class DeleteBrowsingDataFragment : Fragment(), CoroutineScope {
         AlertDialog.Builder(
             ContextThemeWrapper(
                 activity,
-                R.style.DialogStyle
+                R.style.DeleteDialogStyle
             )
         ).apply {
             val appName = context.getString(R.string.app_name)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 45a041a42..2cb78fbb3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -333,6 +333,8 @@
     <string name="history_delete_all">Delete history</string>
     <!-- Text for the dialog to confirm clearing all history -->
     <string name="history_delete_all_dialog">Are you sure you want to clear your history?</string>
+    <!-- Text for positive action to delete history in deleting history dialog -->
+    <string name="history_clear_dialog">Clear</string>
     <!-- Text for the button to delete a single history item -->
     <string name="history_delete_item">Delete</string>
     <!-- History multi select title in app bar
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e70c78f96..767cf1d9a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -55,6 +55,19 @@
         <item name="android:background">?above</item>
         <item name="colorAccent">?accent</item>
         <item name="android:textColorPrimary">?primaryText</item>
+        <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
+    </style>
+
+    <style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+        <item name="android:textColor">?primaryText</item>
+    </style>
+
+    <style name="PositiveButtonDeleteStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog">
+        <item name="android:textColor">?destructive</item>
+    </style>
+
+    <style name="DeleteDialogStyle" parent="DialogStyle">
+        <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonDeleteStyle</item>
     </style>
 
     <style name="PrivateThemeBase" parent="Theme.AppCompat.NoActionBar">