From e74a12b4420cbc375f45039e6bbf36b8a72b945f Mon Sep 17 00:00:00 2001
From: Jocelyne <38375996+joc-a@users.noreply.github.com>
Date: Thu, 1 Oct 2020 23:10:33 +0300
Subject: [PATCH] For #15471: Show Delete button in red in multi-select
 overflow menu (#15576)

---
 .../mozilla/fenix/library/bookmarks/BookmarkFragment.kt   | 7 +++++++
 .../org/mozilla/fenix/library/history/HistoryFragment.kt  | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
index f976a39fa..974551b44 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt
@@ -6,6 +6,7 @@ package org.mozilla.fenix.library.bookmarks
 
 import android.content.DialogInterface
 import android.os.Bundle
+import android.text.SpannableString
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
@@ -49,6 +50,7 @@ import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.minus
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.requireComponents
+import org.mozilla.fenix.ext.setTextColor
 import org.mozilla.fenix.ext.toShortUrl
 import org.mozilla.fenix.library.LibraryPageFragment
 import org.mozilla.fenix.utils.allowUndo
@@ -185,6 +187,11 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
                     inflater.inflate(R.menu.bookmarks_select_multi_not_item, menu)
                 } else {
                     inflater.inflate(R.menu.bookmarks_select_multi, menu)
+
+                    menu.findItem(R.id.delete_bookmarks_multi_select).title =
+                        SpannableString(getString(R.string.bookmark_menu_delete_button)).apply {
+                            setTextColor(requireContext(), R.attr.destructive)
+                        }
                 }
             }
         }
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 a158eecc9..ee4f50180 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
@@ -8,6 +8,7 @@ import android.content.ClipboardManager
 import android.content.Context.CLIPBOARD_SERVICE
 import android.content.DialogInterface
 import android.os.Bundle
+import android.text.SpannableString
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
@@ -42,6 +43,7 @@ import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.requireComponents
+import org.mozilla.fenix.ext.setTextColor
 import org.mozilla.fenix.ext.showToolbar
 import org.mozilla.fenix.ext.toShortUrl
 import org.mozilla.fenix.library.LibraryPageFragment
@@ -166,7 +168,13 @@ class HistoryFragment : LibraryPageFragment<HistoryItem>(), UserInteractionHandl
         }
 
         inflater.inflate(menuRes, menu)
+
         menu.findItem(R.id.share_history_multi_select)?.isVisible = true
+
+        menu.findItem(R.id.delete_history_multi_select)?.title =
+            SpannableString(getString(R.string.bookmark_menu_delete_button)).apply {
+                setTextColor(requireContext(), R.attr.destructive)
+            }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {