From: Soren Stoutner <soren@stoutner.com>
Date: Mon, 23 Jul 2018 23:02:42 +0000 (-0700)
Subject: Update the bookmarks icon.  https://redmine.stoutner.com/issues/293
X-Git-Tag: v2.12~10
X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=dbdf194aca3fce9e3e60b254e173bb357a6d8ceb;p=PrivacyBrowserAndroid.git

Update the bookmarks icon.  https://redmine.stoutner.com/issues/293
---

diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 6e3671ed..58477f94 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -78,8 +78,10 @@
                         </option>
                         <option name="values">
                           <map>
-                            <entry key="outputName" value="block_all_third_party_requests_enabled_light" />
-                            <entry key="sourceFile" value="$USER_HOME$" />
+                            <entry key="assetSourceType" value="FILE" />
+                            <entry key="autoMirrored" value="true" />
+                            <entry key="outputName" value="bookmarks_light" />
+                            <entry key="sourceFile" value="$USER_HOME$/ownCloud/Android/Privacy Browser/Icons/Icons/bookmarks_light.svg" />
                           </map>
                         </option>
                       </PersistentState>
diff --git a/app/src/main/assets/de/about_licenses_dark.html b/app/src/main/assets/de/about_licenses_dark.html
index c83a1368..e72616b9 100644
--- a/app/src/main/assets/de/about_licenses_dark.html
+++ b/app/src/main/assets/de/about_licenses_dark.html
@@ -88,6 +88,7 @@
         <p><img class="icon" src="../shared_images/arrow_back_dark.png"> arrow_back.</p>
         <p><img class="icon" src="../shared_images/arrow_forward_dark.png"> arrow_forward.</p>
         <p><img class="icon" src="../shared_images/bookmark_border_dark.png"> bookmark_border.</p>
+        <p><img class="icon" src="../shared_images/bookmarks_dark.png"> bookmarks.</p>
         <p><img class="icon" src="../shared_images/bug_report_dark.png"> bug_report.</p>
         <p><img class="icon" src="../shared_images/call_to_action_dark.png"> call_to_action.</p>
         <p><img class="icon" src="../shared_images/camera_enhance_dark.png"> camera_enhance.</p>
diff --git a/app/src/main/assets/de/about_licenses_light.html b/app/src/main/assets/de/about_licenses_light.html
index 7b5b0cb4..695ed6e6 100644
--- a/app/src/main/assets/de/about_licenses_light.html
+++ b/app/src/main/assets/de/about_licenses_light.html
@@ -88,6 +88,7 @@
         <p><img class="icon" src="../shared_images/arrow_back_light.png"> arrow_back.</p>
         <p><img class="icon" src="../shared_images/arrow_forward_light.png"> arrow_forward.</p>
         <p><img class="icon" src="../shared_images/bookmark_border_light.png"> bookmark_border.</p>
+        <p><img class="icon" src="../shared_images/bookmarks_light.png"> bookmarks.</p>
         <p><img class="icon" src="../shared_images/bug_report_light.png"> bug_report.</p>
         <p><img class="icon" src="../shared_images/call_to_action_light.png"> call_to_action.</p>
         <p><img class="icon" src="../shared_images/camera_enhance_light.png"> camera_enhance.</p>
diff --git a/app/src/main/assets/en/about_licenses_dark.html b/app/src/main/assets/en/about_licenses_dark.html
index 56d6b1c1..8ca08690 100644
--- a/app/src/main/assets/en/about_licenses_dark.html
+++ b/app/src/main/assets/en/about_licenses_dark.html
@@ -86,6 +86,7 @@
         <p><img class="icon" src="../shared_images/arrow_back_dark.png"> arrow_back.</p>
         <p><img class="icon" src="../shared_images/arrow_forward_dark.png"> arrow_forward.</p>
         <p><img class="icon" src="../shared_images/bookmark_border_dark.png"> bookmark_border.</p>
+        <p><img class="icon" src="../shared_images/bookmarks_dark.png"> bookmarks.</p>
         <p><img class="icon" src="../shared_images/bug_report_dark.png"> bug_report.</p>
         <p><img class="icon" src="../shared_images/call_to_action_dark.png"> call_to_action.</p>
         <p><img class="icon" src="../shared_images/camera_enhance_dark.png"> camera_enhance.</p>
diff --git a/app/src/main/assets/en/about_licenses_light.html b/app/src/main/assets/en/about_licenses_light.html
index e4be1e11..92d3911d 100644
--- a/app/src/main/assets/en/about_licenses_light.html
+++ b/app/src/main/assets/en/about_licenses_light.html
@@ -87,6 +87,7 @@
         <p><img class="icon" src="../shared_images/arrow_back_light.png"> arrow_back.</p>
         <p><img class="icon" src="../shared_images/arrow_forward_light.png"> arrow_forward.</p>
         <p><img class="icon" src="../shared_images/bookmark_border_light.png"> bookmark_border.</p>
+        <p><img class="icon" src="../shared_images/bookmarks_light.png"> bookmarks.</p>
         <p><img class="icon" src="../shared_images/bug_report_light.png"> bug_report.</p>
         <p><img class="icon" src="../shared_images/call_to_action_light.png"> call_to_action.</p>
         <p><img class="icon" src="../shared_images/camera_enhance_light.png"> camera_enhance.</p>
diff --git a/app/src/main/assets/es/about_licenses_dark.html b/app/src/main/assets/es/about_licenses_dark.html
index db1fdcef..12449692 100644
--- a/app/src/main/assets/es/about_licenses_dark.html
+++ b/app/src/main/assets/es/about_licenses_dark.html
@@ -91,6 +91,7 @@
         <p><img class="icon" src="../shared_images/arrow_back_dark.png"> arrow_back.</p>
         <p><img class="icon" src="../shared_images/arrow_forward_dark.png"> arrow_forward.</p>
         <p><img class="icon" src="../shared_images/bookmark_border_dark.png"> bookmark_border.</p>
+        <p><img class="icon" src="../shared_images/bookmarks_dark.png"> bookmarks.</p>
         <p><img class="icon" src="../shared_images/bug_report_dark.png"> bug_report.</p>
         <p><img class="icon" src="../shared_images/call_to_action_dark.png"> call_to_action.</p>
         <p><img class="icon" src="../shared_images/camera_enhance_dark.png"> camera_enhance.</p>
diff --git a/app/src/main/assets/es/about_licenses_light.html b/app/src/main/assets/es/about_licenses_light.html
index e21b26f0..92b11e3c 100644
--- a/app/src/main/assets/es/about_licenses_light.html
+++ b/app/src/main/assets/es/about_licenses_light.html
@@ -92,6 +92,7 @@
         <p><img class="icon" src="../shared_images/arrow_back_light.png"> arrow_back.</p>
         <p><img class="icon" src="../shared_images/arrow_forward_light.png"> arrow_forward.</p>
         <p><img class="icon" src="../shared_images/bookmark_border_light.png"> bookmark_border.</p>
+        <p><img class="icon" src="../shared_images/bookmarks_light.png"> bookmarks.</p>
         <p><img class="icon" src="../shared_images/bug_report_light.png"> bug_report.</p>
         <p><img class="icon" src="../shared_images/call_to_action_light.png"> call_to_action.</p>
         <p><img class="icon" src="../shared_images/camera_enhance_light.png"> camera_enhance.</p>
diff --git a/app/src/main/assets/it/about_licenses_dark.html b/app/src/main/assets/it/about_licenses_dark.html
index 8b51ffea..82565d37 100644
--- a/app/src/main/assets/it/about_licenses_dark.html
+++ b/app/src/main/assets/it/about_licenses_dark.html
@@ -95,6 +95,7 @@
         <p><img class="icon" src="../shared_images/arrow_back_dark.png"> arrow_back.</p>
         <p><img class="icon" src="../shared_images/arrow_forward_dark.png"> arrow_forward.</p>
         <p><img class="icon" src="../shared_images/bookmark_border_dark.png"> bookmark_border.</p>
+        <p><img class="icon" src="../shared_images/bookmarks_dark.png"> bookmarks.</p>
         <p><img class="icon" src="../shared_images/bug_report_dark.png"> bug_report.</p>
         <p><img class="icon" src="../shared_images/call_to_action_dark.png"> call_to_action.</p>
         <p><img class="icon" src="../shared_images/camera_enhance_dark.png"> camera_enhance.</p>
diff --git a/app/src/main/assets/it/about_licenses_light.html b/app/src/main/assets/it/about_licenses_light.html
index 5e085388..81820761 100644
--- a/app/src/main/assets/it/about_licenses_light.html
+++ b/app/src/main/assets/it/about_licenses_light.html
@@ -95,6 +95,7 @@
         <p><img class="icon" src="../shared_images/arrow_back_light.png"> arrow_back.</p>
         <p><img class="icon" src="../shared_images/arrow_forward_light.png"> arrow_forward.</p>
         <p><img class="icon" src="../shared_images/bookmark_border_light.png"> bookmark_border.</p>
+        <p><img class="icon" src="../shared_images/bookmarks_light.png"> bookmarks.</p>
         <p><img class="icon" src="../shared_images/bug_report_light.png"> bug_report.</p>
         <p><img class="icon" src="../shared_images/call_to_action_light.png"> call_to_action.</p>
         <p><img class="icon" src="../shared_images/camera_enhance_light.png"> camera_enhance.</p>
diff --git a/app/src/main/assets/ru/about_licenses_dark.html b/app/src/main/assets/ru/about_licenses_dark.html
index 9a0806f8..c09ee3f6 100644
--- a/app/src/main/assets/ru/about_licenses_dark.html
+++ b/app/src/main/assets/ru/about_licenses_dark.html
@@ -88,6 +88,7 @@
         <p><img class="icon" src="../shared_images/arrow_back_dark.png"> arrow_back.</p>
         <p><img class="icon" src="../shared_images/arrow_forward_dark.png"> arrow_forward.</p>
         <p><img class="icon" src="../shared_images/bookmark_border_dark.png"> bookmark_border.</p>
+        <p><img class="icon" src="../shared_images/bookmarks_dark.png"> bookmarks.</p>
         <p><img class="icon" src="../shared_images/bug_report_dark.png"> bug_report.</p>
         <p><img class="icon" src="../shared_images/call_to_action_dark.png"> call_to_action.</p>
         <p><img class="icon" src="../shared_images/camera_enhance_dark.png"> camera_enhance.</p>
diff --git a/app/src/main/assets/ru/about_licenses_light.html b/app/src/main/assets/ru/about_licenses_light.html
index 4b5ed099..569b933a 100644
--- a/app/src/main/assets/ru/about_licenses_light.html
+++ b/app/src/main/assets/ru/about_licenses_light.html
@@ -88,6 +88,7 @@
         <p><img class="icon" src="../shared_images/arrow_back_light.png"> arrow_back.</p>
         <p><img class="icon" src="../shared_images/arrow_forward_light.png"> arrow_forward.</p>
         <p><img class="icon" src="../shared_images/bookmark_border_light.png"> bookmark_border.</p>
+        <p><img class="icon" src="../shared_images/bookmarks_light.png"> bookmarks.</p>
         <p><img class="icon" src="../shared_images/bug_report_light.png"> bug_report.</p>
         <p><img class="icon" src="../shared_images/call_to_action_light.png"> call_to_action.</p>
         <p><img class="icon" src="../shared_images/camera_enhance_light.png"> camera_enhance.</p>
diff --git a/app/src/main/assets/shared_images/bookmarks_dark.png b/app/src/main/assets/shared_images/bookmarks_dark.png
new file mode 100644
index 00000000..be0ce5e1
Binary files /dev/null and b/app/src/main/assets/shared_images/bookmarks_dark.png differ
diff --git a/app/src/main/assets/shared_images/bookmarks_light.png b/app/src/main/assets/shared_images/bookmarks_light.png
new file mode 100644
index 00000000..b7ea2be2
Binary files /dev/null and b/app/src/main/assets/shared_images/bookmarks_light.png differ
diff --git a/app/src/main/res/drawable/bookmarks_dark.xml b/app/src/main/res/drawable/bookmarks_dark.xml
index 5547b797..8b191185 100644
--- a/app/src/main/res/drawable/bookmarks_dark.xml
+++ b/app/src/main/res/drawable/bookmarks_dark.xml
@@ -1,13 +1,18 @@
-<!-- `bookmarks_dark.xml` comes from the Android Material icon set, where it is called `bookmark_border`.  It is released under the Apache License 2.0. -->
+<!-- `bookmarks_light.xml` comes from the Android Material icon set, where it is called `bookmarks`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:height="24dp"
     android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    tools:ignore="VectorRaster"
+    android:autoMirrored="true" >
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillColor="#FFE0E0E0"
-        android:pathData="M17,3L7,3c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z"/>
+        android:pathData="M19,18l2,1V3c0,-1.1 -0.9,-2 -2,-2H8.99C7.89,1 7,1.9 7,3h10c1.1,0 2,0.9 2,2v13zM15,5H5c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3V7c0,-1.1 -0.9,-2 -2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/bookmarks_light.xml b/app/src/main/res/drawable/bookmarks_light.xml
index 95bfa527..732df254 100644
--- a/app/src/main/res/drawable/bookmarks_light.xml
+++ b/app/src/main/res/drawable/bookmarks_light.xml
@@ -1,13 +1,18 @@
-<!-- `bookmarks_light.xml` comes from the Android Material icon set, where it is called `bookmark_border`.  It is released under the Apache License 2.0. -->
+<!-- `bookmarks_light.xml` comes from the Android Material icon set, where it is called `bookmarks`.  It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:height="24dp"
     android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    tools:ignore="VectorRaster"
+    android:autoMirrored="true" >
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M17,3L7,3c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,5h10v13z"/>
+        android:pathData="M19,18l2,1V3c0,-1.1 -0.9,-2 -2,-2H8.99C7.89,1 7,1.9 7,3h10c1.1,0 2,0.9 2,2v13zM15,5H5c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3V7c0,-1.1 -0.9,-2 -2,-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/cache_cleared_dark.xml b/app/src/main/res/drawable/cache_cleared_dark.xml
index 22cb5f9c..5bf67061 100644
--- a/app/src/main/res/drawable/cache_cleared_dark.xml
+++ b/app/src/main/res/drawable/cache_cleared_dark.xml
@@ -4,11 +4,11 @@
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
     android:height="24dp"
     android:width="24dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0"
+    android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
diff --git a/app/src/main/res/drawable/cache_cleared_light.xml b/app/src/main/res/drawable/cache_cleared_light.xml
index 03daa49c..570c57ce 100644
--- a/app/src/main/res/drawable/cache_cleared_light.xml
+++ b/app/src/main/res/drawable/cache_cleared_light.xml
@@ -4,11 +4,11 @@
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:autoMirrored="true"
     android:height="24dp"
     android:width="24dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0"
+    android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
     <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->