From 6249b9eb89f47bb3dd3973139ded8d88167003c0 Mon Sep 17 00:00:00 2001
From: Sawyer Blatz <sdblatz@gmail.com>
Date: Wed, 27 Mar 2019 14:29:38 -0700
Subject: [PATCH] Closes #1231: Changes all use of favorites to bookmarks

---
 .../main/java/org/mozilla/fenix/library/LibraryFragment.kt  | 2 +-
 ...und.xml => library_icon_bookmarks_circle_background.xml} | 4 ++--
 app/src/main/res/layout/fragment_library.xml                | 4 ++--
 app/src/main/res/layout/layout_quick_action_sheet.xml       | 4 ++--
 app/src/main/res/values/colors.xml                          | 4 ++--
 app/src/main/res/values/strings.xml                         | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename app/src/main/res/drawable/{library_icon_favorites_circle_background.xml => library_icon_bookmarks_circle_background.xml} (92%)

diff --git a/app/src/main/java/org/mozilla/fenix/library/LibraryFragment.kt b/app/src/main/java/org/mozilla/fenix/library/LibraryFragment.kt
index 7ed70d9a0..497873f05 100644
--- a/app/src/main/java/org/mozilla/fenix/library/LibraryFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/LibraryFragment.kt
@@ -53,7 +53,7 @@ class LibraryFragment : Fragment() {
         libraryScreenshots.setOnClickListener {
             ItsNotBrokenSnack(context!!).showSnackbar(issueNumber = "89")
         }
-        libraryFavorites.setOnClickListener {
+        libraryBookmarks.setOnClickListener {
             ItsNotBrokenSnack(context!!).showSnackbar(issueNumber = "90")
         }
         libraryReadingList.setOnClickListener {
diff --git a/app/src/main/res/drawable/library_icon_favorites_circle_background.xml b/app/src/main/res/drawable/library_icon_bookmarks_circle_background.xml
similarity index 92%
rename from app/src/main/res/drawable/library_icon_favorites_circle_background.xml
rename to app/src/main/res/drawable/library_icon_bookmarks_circle_background.xml
index 808c57c52..6527a3a8e 100644
--- a/app/src/main/res/drawable/library_icon_favorites_circle_background.xml
+++ b/app/src/main/res/drawable/library_icon_bookmarks_circle_background.xml
@@ -8,7 +8,7 @@
             <size
                 android:width="40dp"
                 android:height="40dp" />
-            <solid android:color="@color/library_favorites_icon_background" />
+            <solid android:color="@color/library_bookmarks_icon_background" />
         </shape>
     </item>
     <item
@@ -22,7 +22,7 @@
             android:viewportWidth="24"
             android:viewportHeight="24">
             <path
-                android:fillColor="@color/library_favorites_icon"
+                android:fillColor="@color/library_bookmarks_icon"
                 android:fillType="evenOdd"
                 android:pathData="M6.749,21.248C6.4234,21.2471 6.1142,21.1054 5.9008,20.8595C5.6875,20.6136 5.5909,20.2874 5.636,19.965L6.414,14.4L2.674,10.38C2.3928,10.0785 2.2991,9.6474 2.4296,9.2564C2.5601,8.8654 2.8941,8.5771 3.3,8.505L8.529,7.57L10.993,2.624C11.1833,2.242 11.5733,2.0006 12,2.0006C12.4267,2.0006 12.8167,2.242 13.007,2.624L15.471,7.57L20.7,8.5C21.1057,8.5724 21.4394,8.8608 21.5697,9.2518C21.7,9.6427 21.6062,10.0737 21.325,10.375L17.586,14.4L18.364,19.968C18.4229,20.3853 18.2434,20.8005 17.8991,21.0434C17.5547,21.2864 17.1034,21.3164 16.73,21.121L12,18.654L7.269,21.119C7.1087,21.2035 6.9302,21.2478 6.749,21.248Z"
                 android:strokeWidth="1"
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index dad8985be..fd2a98190 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -44,14 +44,14 @@
         app:listItemTitle="@string/library_downloads" />
 
     <org.mozilla.fenix.library.LibraryListItem
-        android:id="@+id/libraryFavorites"
+        android:id="@+id/libraryBookmarks"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:contentDescription="@string/library_bookmarks"
         android:focusable="true"
-        app:listItemIcon="@drawable/library_icon_favorites_circle_background"
+        app:listItemIcon="@drawable/library_icon_bookmarks_circle_background"
         app:listItemTitle="@string/library_bookmarks" />
 
     <org.mozilla.fenix.library.LibraryListItem
diff --git a/app/src/main/res/layout/layout_quick_action_sheet.xml b/app/src/main/res/layout/layout_quick_action_sheet.xml
index 48d783374..6869f4154 100644
--- a/app/src/main/res/layout/layout_quick_action_sheet.xml
+++ b/app/src/main/res/layout/layout_quick_action_sheet.xml
@@ -55,12 +55,12 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_width="0dp"
-            android:drawableTop="@drawable/library_icon_favorites_circle_background"
+            android:drawableTop="@drawable/library_icon_bookmarks_circle_background"
             android:drawablePadding="5dp"
             android:textAlignment="center"
             android:textSize="12sp"
             android:textColor="?attr/toolbarTextColor"
-            android:text="@string/quick_action_favorite"/>
+            android:text="@string/quick_action_bookmark"/>
 
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d2a2ace4a..e55549c90 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -60,8 +60,8 @@
     <color name="library_downloads_icon_background">#D4C1FA</color>
     <color name="library_downloads_icon">#2E2060</color>
 
-    <color name="library_favorites_icon_background">#F4B8D9</color>
-    <color name="library_favorites_icon">#491949</color>
+    <color name="library_bookmarks_icon_background">#F4B8D9</color>
+    <color name="library_bookmarks_icon">#491949</color>
 
     <color name="library_history_icon_background">#F5C0C6</color>
     <color name="library_history_icon">#3E0909</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 62d92905e..0d1568e3b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -208,8 +208,8 @@
     <string name="quick_action_share">Share</string>
     <!-- Option in Quick Action Sheet in the browser to download the current page -->
     <string name="quick_action_download">Download</string>
-    <!-- Option in Quick Action Sheet in the browser to favorite the current page -->
-    <string name="quick_action_favorite">Favorite</string>
+    <!-- Option in Quick Action Sheet in the browser to bookmark the current page -->
+    <string name="quick_action_bookmark">Bookmark</string>
     <!-- Option in Quick Action Sheet in the browser to put the the current page in reader mode -->
     <string name="quick_action_read">Read</string>
     <!-- Content description (not visible, for screen readers etc.): Quick action sheet-->
@@ -224,7 +224,7 @@
     <string name="library_screenshots">Screenshots</string>
     <!-- Option in Library to open Downloads page -->
     <string name="library_downloads">Downloads</string>
-    <!-- Option in Library to open Favorites page -->
+    <!-- Option in Library to open Bookmarks page -->
     <string name="library_bookmarks">Bookmarks</string>
     <!-- Option in Library to open History page -->
     <string name="library_history">History</string>