From a6c8f8b31300f494a9d35ce23db8bf2a02b6b248 Mon Sep 17 00:00:00 2001
From: Gabriel Luong <gabriel.luong@gmail.com>
Date: Sun, 13 Mar 2022 00:39:00 -0500
Subject: [PATCH] For #24252 - Rename destructive attribute to textWarning

---
 .../fenix/home/sessioncontrol/SwipeToDeleteCallback.kt    | 2 +-
 .../sessioncontrol/viewholders/CollectionViewHolder.kt    | 2 +-
 .../mozilla/fenix/library/bookmarks/BookmarkFragment.kt   | 2 +-
 .../mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt   | 2 +-
 .../mozilla/fenix/library/downloads/DownloadFragment.kt   | 2 +-
 .../mozilla/fenix/library/downloads/DownloadItemMenu.kt   | 2 +-
 .../org/mozilla/fenix/library/history/HistoryFragment.kt  | 2 +-
 .../historymetadata/HistoryMetadataGroupFragment.kt       | 2 +-
 .../library/recentlyclosed/RecentlyClosedFragment.kt      | 2 +-
 .../settings/creditcards/view/CreditCardEditorView.kt     | 8 ++++----
 .../org/mozilla/fenix/settings/search/SearchEngineMenu.kt | 2 +-
 .../org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt | 2 +-
 app/src/main/res/layout/stub_find_in_page.xml             | 2 +-
 app/src/main/res/values/attrs.xml                         | 3 ++-
 app/src/main/res/values/styles.xml                        | 6 ++++--
 .../fenix/library/bookmarks/BookmarkItemMenuTest.kt       | 2 +-
 .../settings/creditcards/CreditCardEditorViewTest.kt      | 6 +++---
 17 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
index 862e31984..814722a8f 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
@@ -45,7 +45,7 @@ class SwipeToDeleteCallback(
     ) {
         super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
         val icon = AppCompatResources.getDrawable(recyclerView.context, R.drawable.ic_delete)
-        icon?.setTint(recyclerView.context.getColorFromAttr(R.attr.destructive))
+        icon?.setTint(recyclerView.context.getColorFromAttr(R.attr.textWarning))
 
         val backgroundDrawable = when {
             viewHolder is TabInCollectionViewHolder && viewHolder.isLastItem -> {
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/CollectionViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/CollectionViewHolder.kt
index ce2df3aac..810cdc03a 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/CollectionViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/CollectionViewHolder.kt
@@ -146,7 +146,7 @@ class CollectionItemMenu(
 
             SimpleBrowserMenuItem(
                 context.getString(R.string.collection_delete),
-                textColorResource = ThemeManager.resolveAttribute(R.attr.destructive, context)
+                textColorResource = ThemeManager.resolveAttribute(R.attr.textWarning, context)
             ) {
                 onItemTapped.invoke(Item.DeleteCollection)
             }
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 c4a09deba..22e58747d 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
@@ -187,7 +187,7 @@ class BookmarkFragment : LibraryPageFragment<BookmarkNode>(), UserInteractionHan
 
                     menu.findItem(R.id.delete_bookmarks_multi_select).title =
                         SpannableString(getString(R.string.bookmark_menu_delete_button)).apply {
-                            setTextColor(requireContext(), R.attr.destructive)
+                            setTextColor(requireContext(), R.attr.textWarning)
                         }
                 }
             }
diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt
index 5d0c93d66..12e5d8179 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenu.kt
@@ -80,7 +80,7 @@ class BookmarkItemMenu(
             },
             TextMenuCandidate(
                 text = context.getString(R.string.bookmark_menu_delete_button),
-                textStyle = TextStyle(color = context.getColorFromAttr(R.attr.destructive))
+                textStyle = TextStyle(color = context.getColorFromAttr(R.attr.textWarning))
             ) {
                 onItemTapped.invoke(Item.Delete)
             }
diff --git a/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt b/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt
index 8991e1fe6..763bc9e60 100644
--- a/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadFragment.kt
@@ -162,7 +162,7 @@ class DownloadFragment : LibraryPageFragment<DownloadItem>(), UserInteractionHan
 
         menu.findItem(R.id.delete_downloads_multi_select)?.title =
             SpannableString(getString(R.string.download_delete_item_1)).apply {
-                setTextColor(requireContext(), R.attr.destructive)
+                setTextColor(requireContext(), R.attr.textWarning)
             }
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadItemMenu.kt b/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadItemMenu.kt
index 5a2aab6b5..ad8dc5d52 100644
--- a/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadItemMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/downloads/DownloadItemMenu.kt
@@ -34,7 +34,7 @@ class DownloadItemMenu(
             TextMenuCandidate(
                 text = context.getString(R.string.history_delete_item),
                 textStyle = TextStyle(
-                    color = context.getColorFromAttr(R.attr.destructive)
+                    color = context.getColorFromAttr(R.attr.textWarning)
                 )
             ) {
                 onItemTapped.invoke(Item.Delete)
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 1c43bc5a4..48f05dd5e 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
@@ -177,7 +177,7 @@ class HistoryFragment : LibraryPageFragment<History>(), UserInteractionHandler {
             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)
+                    setTextColor(requireContext(), R.attr.textWarning)
                 }
         } else {
             inflater.inflate(R.menu.history_menu, menu)
diff --git a/app/src/main/java/org/mozilla/fenix/library/historymetadata/HistoryMetadataGroupFragment.kt b/app/src/main/java/org/mozilla/fenix/library/historymetadata/HistoryMetadataGroupFragment.kt
index b5da41f4a..c22f1f575 100644
--- a/app/src/main/java/org/mozilla/fenix/library/historymetadata/HistoryMetadataGroupFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/historymetadata/HistoryMetadataGroupFragment.kt
@@ -109,7 +109,7 @@ class HistoryMetadataGroupFragment :
 
             menu.findItem(R.id.delete_history_multi_select)?.let { deleteItem ->
                 deleteItem.title = SpannableString(deleteItem.title).apply {
-                    setTextColor(requireContext(), R.attr.destructive)
+                    setTextColor(requireContext(), R.attr.textWarning)
                 }
             }
         } else {
diff --git a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragment.kt b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragment.kt
index 8cfba0c77..f264fdde5 100644
--- a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedFragment.kt
@@ -56,7 +56,7 @@ class RecentlyClosedFragment : LibraryPageFragment<RecoverableTab>(), UserIntera
             inflater.inflate(R.menu.history_select_multi, menu)
             menu.findItem(R.id.delete_history_multi_select)?.let { deleteItem ->
                 deleteItem.title = SpannableString(deleteItem.title)
-                    .apply { setTextColor(requireContext(), R.attr.destructive) }
+                    .apply { setTextColor(requireContext(), R.attr.textWarning) }
             }
         } else {
             inflater.inflate(R.menu.library_menu, menu)
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardEditorView.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardEditorView.kt
index 90391f1f7..cae125f70 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardEditorView.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/view/CreditCardEditorView.kt
@@ -62,12 +62,12 @@ class CreditCardEditorView(
 
         binding.cardNumberLayout.setErrorTextColor(
             ColorStateList.valueOf(
-                binding.root.context.getColorFromAttr(R.attr.destructive)
+                binding.root.context.getColorFromAttr(R.attr.textWarning)
             )
         )
         binding.nameOnCardLayout.setErrorTextColor(
             ColorStateList.valueOf(
-                binding.root.context.getColorFromAttr(R.attr.destructive)
+                binding.root.context.getColorFromAttr(R.attr.textWarning)
             )
         )
 
@@ -128,7 +128,7 @@ class CreditCardEditorView(
 
             binding.cardNumberLayout.error =
                 binding.root.context.getString(R.string.credit_cards_number_validation_error_message)
-            binding.cardNumberTitle.setTextColor(binding.root.context.getColorFromAttr(R.attr.destructive))
+            binding.cardNumberTitle.setTextColor(binding.root.context.getColorFromAttr(R.attr.textWarning))
         }
 
         if (binding.nameOnCardInput.text.toString().isNotBlank()) {
@@ -139,7 +139,7 @@ class CreditCardEditorView(
 
             binding.nameOnCardLayout.error =
                 binding.root.context.getString(R.string.credit_cards_name_on_card_validation_error_message)
-            binding.nameOnCardTitle.setTextColor(binding.root.context.getColorFromAttr(R.attr.destructive))
+            binding.nameOnCardTitle.setTextColor(binding.root.context.getColorFromAttr(R.attr.textWarning))
         }
 
         return isValid
diff --git a/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineMenu.kt b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineMenu.kt
index b38568f71..11817f4d4 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineMenu.kt
@@ -40,7 +40,7 @@ class SearchEngineMenu(
             items.add(
                 SimpleBrowserMenuItem(
                     context.getString(R.string.search_engine_delete),
-                    textColorResource = ThemeManager.resolveAttribute(R.attr.destructive, context)
+                    textColorResource = ThemeManager.resolveAttribute(R.attr.textWarning, context)
                 ) {
                     onItemTapped.invoke(Item.Delete)
                 }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt
index be67b9a99..41041350c 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt
@@ -85,7 +85,7 @@ class TouchCallback(
 
         val icon = recyclerView.context.getDrawableWithTint(
             R.drawable.ic_delete,
-            recyclerView.context.getColorFromAttr(R.attr.destructive)
+            recyclerView.context.getColorFromAttr(R.attr.textWarning)
         )!!
         val background = AppCompatResources.getDrawable(
             recyclerView.context,
diff --git a/app/src/main/res/layout/stub_find_in_page.xml b/app/src/main/res/layout/stub_find_in_page.xml
index b9328ae35..8f57d836d 100644
--- a/app/src/main/res/layout/stub_find_in_page.xml
+++ b/app/src/main/res/layout/stub_find_in_page.xml
@@ -11,6 +11,6 @@
     android:background="?attr/layer1"
     android:clickable="true"
     android:focusable="true"
-    app:findInPageNoMatchesTextColor="?attr/destructive"
+    app:findInPageNoMatchesTextColor="?attr/textWarning"
     app:findInPageButtonsTint="?attr/textPrimary"
     app:findInPageResultCountTextColor="?attr/textPrimary" />
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 0f2b0a5d1..64c716009 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -27,6 +27,8 @@
     <attr name="textSecondary" format="reference" />
     <!-- Disabled text -->
     <attr name="textDisabled" format="reference" />
+    <!-- Warning text -->
+    <attr name="textWarning" format="reference"/>
     <!-- Small heading, Text link -->
     <attr name="textAccent" format="reference" />
     <!-- Action Primary text -->
@@ -53,7 +55,6 @@
     <attr name="snackbar" format="reference" />
     <attr name="neutral" format="reference" />
     <attr name="neutralFaded" format="reference" />
-    <attr name="destructive" format="reference"/>
     <attr name="preferenceSectionHeader" format="reference"/>
 
     <!-- Color used in DefaultToolbarMenu for buttons placed at the end of menu items -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4c3721c86..edba34b2a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -55,6 +55,8 @@
         <item name="textSecondary">@color/fx_mobile_text_color_secondary</item>
         <!-- Disabled text -->
         <item name="textDisabled">@color/fx_mobile_text_color_disabled</item>
+        <!-- Warning text -->
+        <item name="textWarning">@color/fx_mobile_text_color_warning</item>
         <!-- Small heading, Text link -->
         <item name="textAccent">@color/fx_mobile_text_color_accent</item>
         <!-- Action Primary text -->
@@ -88,7 +90,6 @@
         <item name="accentHighContrast">@color/accent_high_contrast_normal_theme</item>
         <item name="neutral">@color/neutral_normal_theme</item>
         <item name="neutralFaded">@color/neutral_faded_normal_theme</item>
-        <item name="destructive">@color/fx_mobile_text_color_warning</item>
         <item name="accentUsedOnDarkBackground">@color/fx_mobile_text_color_accent</item>
         <item name="toolbarStartGradient">@color/fx_mobile_layer_color_1</item>
         <item name="toolbarCenterGradient">@color/fx_mobile_layer_color_1</item>
@@ -250,6 +251,8 @@
         <item name="textSecondary">@color/fx_mobile_private_text_color_secondary</item>
         <!-- Disabled text -->
         <item name="textDisabled">@color/fx_mobile_private_text_color_disabled</item>
+        <!-- Warning text -->
+        <item name="textWarning">@color/fx_mobile_private_text_color_warning</item>
         <!-- Small heading, Text link -->
         <item name="textAccent">@color/fx_mobile_private_text_color_accent</item>
         <!-- Action Primary text -->
@@ -281,7 +284,6 @@
         <item name="accentHighContrast">@color/accent_high_contrast_private_theme</item>
         <item name="neutral">@color/neutral_private_theme</item>
         <item name="neutralFaded">@color/neutral_faded_private_theme</item>
-        <item name="destructive">@color/fx_mobile_private_text_color_warning</item>
         <item name="accentUsedOnDarkBackground">@color/accent_high_contrast_private_theme</item>
         <item name="toolbarStartGradient">@color/fx_mobile_private_layer_color_4_start</item>
         <item name="toolbarCenterGradient">@color/fx_mobile_private_layer_color_4_center</item>
diff --git a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenuTest.kt b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenuTest.kt
index 44afca0d4..b1ba5a171 100644
--- a/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenuTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/library/bookmarks/BookmarkItemMenuTest.kt
@@ -38,7 +38,7 @@ class BookmarkItemMenuTest {
         val deleteItem = menu.menuItems(BookmarkNodeType.SEPARATOR).last()
         assertEquals("Delete", deleteItem.text)
         assertEquals(
-            TextStyle(color = context.getColorFromAttr(R.attr.destructive)),
+            TextStyle(color = context.getColorFromAttr(R.attr.textWarning)),
             deleteItem.textStyle
         )
 
diff --git a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorViewTest.kt b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorViewTest.kt
index d0c975da5..59184f52e 100644
--- a/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorViewTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/settings/creditcards/CreditCardEditorViewTest.kt
@@ -167,7 +167,7 @@ class CreditCardEditorViewTest {
         assertNotNull(fragmentCreditCardEditorBinding.cardNumberLayout.error)
         assertEquals(
             fragmentCreditCardEditorBinding.cardNumberLayout.errorCurrentTextColors,
-            fragmentCreditCardEditorBinding.root.context.getColorFromAttr(R.attr.destructive)
+            fragmentCreditCardEditorBinding.root.context.getColorFromAttr(R.attr.textWarning)
         )
 
         verify(exactly = 0) {
@@ -192,7 +192,7 @@ class CreditCardEditorViewTest {
         assertNotNull(fragmentCreditCardEditorBinding.cardNumberLayout.error)
         assertEquals(
             fragmentCreditCardEditorBinding.cardNumberLayout.errorCurrentTextColors,
-            fragmentCreditCardEditorBinding.root.context.getColorFromAttr(R.attr.destructive)
+            fragmentCreditCardEditorBinding.root.context.getColorFromAttr(R.attr.textWarning)
         )
 
         verify(exactly = 0) {
@@ -234,7 +234,7 @@ class CreditCardEditorViewTest {
         assertNotNull(fragmentCreditCardEditorBinding.nameOnCardLayout.error)
         assertEquals(
             fragmentCreditCardEditorBinding.nameOnCardLayout.errorCurrentTextColors,
-            fragmentCreditCardEditorBinding.root.context.getColorFromAttr(R.attr.destructive)
+            fragmentCreditCardEditorBinding.root.context.getColorFromAttr(R.attr.textWarning)
         )
 
         verify(exactly = 0) {