From 0436c8d8a485a9c7126a87533e8513a4d175feb9 Mon Sep 17 00:00:00 2001
From: David Walsh <davidwalsh83@gmail.com>
Date: Tue, 3 Mar 2020 17:21:18 -0600
Subject: [PATCH] For #8874 - Update tab deletion colors

---
 app/src/main/res/drawable/session_background.xml              | 2 +-
 .../res/drawable/tab_in_collection_last_swipe_background.xml  | 2 +-
 .../main/res/drawable/tab_in_collection_swipe_background.xml  | 2 +-
 app/src/main/res/values-night/colors.xml                      | 1 +
 app/src/main/res/values/attrs.xml                             | 1 +
 app/src/main/res/values/colors.xml                            | 4 ++++
 app/src/main/res/values/styles.xml                            | 2 ++
 7 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/drawable/session_background.xml b/app/src/main/res/drawable/session_background.xml
index 441bfc421..d4f87bb9e 100644
--- a/app/src/main/res/drawable/session_background.xml
+++ b/app/src/main/res/drawable/session_background.xml
@@ -6,5 +6,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/tab_corner_radius" />
-    <solid android:color="@color/photonGrey30" />
+    <solid android:color="?swipeDeleteBackground" />
 </shape>
diff --git a/app/src/main/res/drawable/tab_in_collection_last_swipe_background.xml b/app/src/main/res/drawable/tab_in_collection_last_swipe_background.xml
index c6f1d61e4..a20b84d2e 100644
--- a/app/src/main/res/drawable/tab_in_collection_last_swipe_background.xml
+++ b/app/src/main/res/drawable/tab_in_collection_last_swipe_background.xml
@@ -6,5 +6,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
     <corners android:bottomLeftRadius="@dimen/tab_corner_radius" android:bottomRightRadius="@dimen/tab_corner_radius" />
-    <solid android:color="@color/photonGrey30" />
+    <solid android:color="?swipeDeleteBackground" />
 </shape>
diff --git a/app/src/main/res/drawable/tab_in_collection_swipe_background.xml b/app/src/main/res/drawable/tab_in_collection_swipe_background.xml
index 5c74a6e40..5b48bf849 100644
--- a/app/src/main/res/drawable/tab_in_collection_swipe_background.xml
+++ b/app/src/main/res/drawable/tab_in_collection_swipe_background.xml
@@ -5,5 +5,5 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-    <solid android:color="@color/photonGrey30" />
+    <solid android:color="?swipeDeleteBackground" />
 </shape>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index ada81fcfa..d83e76dc8 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -34,6 +34,7 @@
     <color name="menu_category_normal_theme">@color/primary_text_normal_theme</color>
     <color name="sync_disconnected_icon_fill_normal_theme">@color/sync_disconnected_icon_fill_dark_theme</color>
     <color name="sync_disconnected_background_normal_theme">@color/sync_disconnected_background_dark_theme</color>
+    <color name="swipe_delete_background_normal_theme">@color/swipe_delete_background_dark_theme</color>
 
     <!-- Collection icons-->
     <color name="collection_icon_color_violet">@color/collection_icon_color_violet_dark_theme</color>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 51ee8dcaa..d95a0fce3 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -42,6 +42,7 @@
     <attr name="fillLinkFromClipboard" format="reference"/>
     <attr name="syncDisconnected" format="reference" />
     <attr name="syncDisconnectedBackground" format="reference" />
+    <attr name="swipeDeleteBackground" format="reference" />
 
     <declare-styleable name="LibraryListItem">
         <attr name="listItemTitle" format="reference" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b79d990f3..992406453 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -36,6 +36,7 @@
     <color name="fill_link_from_clipboard_light_theme">@color/accent_light_theme</color>
     <color name="sync_disconnected_icon_fill_light_theme">#C45A27</color>
     <color name="sync_disconnected_background_light_theme">#FFFDE2</color>
+    <color name="swipe_delete_background_light_theme">#E0E0E6</color>
 
     <!-- Dark theme color palette -->
     <color name="primary_text_dark_theme">#FBFBFE</color>
@@ -68,6 +69,7 @@
     <color name="fill_link_from_clipboard_dark_theme">@color/accent_on_dark_background_normal_theme</color>
     <color name="sync_disconnected_icon_fill_dark_theme">#FFF36E</color>
     <color name="sync_disconnected_background_dark_theme">#5B5846</color>
+    <color name="swipe_delete_background_dark_theme">#4A4A55</color>
 
     <!-- Private theme color palette -->
     <color name="primary_text_private_theme">#FBFBFE</color>
@@ -98,6 +100,7 @@
     <color name="menu_category_private_theme">@color/primary_text_private_theme</color>
     <color name="sync_disconnected_icon_fill_private_theme">#C45A27</color>
     <color name="sync_disconnected_background_private_theme">#5B5846</color>
+    <color name="swipe_delete_background_private_theme">#312A65</color>
 
     <!-- Normal theme colors for light mode -->
     <color name="primary_text_normal_theme">@color/primary_text_light_theme</color>
@@ -127,6 +130,7 @@
     <color name="menu_category_normal_theme">@color/accent_light_theme</color>
     <color name="sync_disconnected_icon_fill_normal_theme">@color/sync_disconnected_icon_fill_light_theme</color>
     <color name="sync_disconnected_background_normal_theme">@color/sync_disconnected_background_light_theme</color>
+    <color name="swipe_delete_background_normal_theme">@color/swipe_delete_background_light_theme</color>
 
     <!-- Bookmark buttons -->
     <color name="bookmark_favicon_background">#DFDFE3</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ac08abfa0..9376da789 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -58,6 +58,7 @@
         <item name="menuCategoryText">@color/menu_category_normal_theme</item>
         <item name="syncDisconnected">@color/sync_disconnected_icon_fill_normal_theme</item>
         <item name="syncDisconnectedBackground">@color/sync_disconnected_background_normal_theme</item>
+        <item name="swipeDeleteBackground">@color/swipe_delete_background_normal_theme</item>
 
         <!-- Drawables -->
         <item name="fenixLogo">@drawable/ic_logo_wordmark_normal</item>
@@ -151,6 +152,7 @@
         <item name="menuCategoryText">@color/menu_category_private_theme</item>
         <item name="syncDisconnected">@color/sync_disconnected_icon_fill_private_theme</item>
         <item name="syncDisconnectedBackground">@color/sync_disconnected_background_private_theme</item>
+        <item name="swipeDeleteBackground">@color/swipe_delete_background_private_theme</item>
 
         <!-- Drawables -->
         <item name="fenixLogo">@drawable/ic_logo_wordmark_private</item>