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

diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index 6e3671ed2cefed64d6580f0167242e6d45daf7f5..58477f9467fc9f1e075a6d64417456dbeadc1761 100644 (file)
--- 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 c83a136841d6c2730a6725c9a4ae4a75b49d1992..e72616b9c240272c493c318e05f04accb948864d 100644 (file)
--- 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 7b5b0cb42858a6e131fd33780c4744da2e695a32..695ed6e6783e4600ae4496cd48443a33fd0e025a 100644 (file)
--- 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 56d6b1c18bdd9fed604e639d3de4bd8b8404d494..8ca08690340b6027b2a2a06ad827d7722dfbd12a 100644 (file)
--- 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 e4be1e11fda94eb66be44d13e30acfef6255d9c6..92d3911d74ceabc56144ed9499cb19b7e3612015 100644 (file)
--- 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 db1fdcefe82aeb0a733b60a75ec6557addc0510f..12449692cfcc80779352bf2e5281167398baa5a6 100644 (file)
--- 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 e21b26f0a52ef6dbf333dde4e0cb8e4f6e4ea7f5..92b11e3c6c39c8a3a78d713c1204c1ed03dd556f 100644 (file)
--- 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 8b51ffeaebc1a148ee51719e762b776a712fcb8b..82565d37288a9620b3c94863dc46b683316d9285 100644 (file)
--- 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 5e08538838ddb34509645aa93391abc72d221b44..818207611ea6756b3d773e1c67f590ebb7f573fd 100644 (file)
--- 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 9a0806f8c0fd9359ebe3c1142d449b651f8eede7..c09ee3f6241fc2a1a51b1515f9e28a872b137dfc 100644 (file)
--- 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 4b5ed099e4bcbe3837d1a2ec5e0c7ca90875ac40..569b933ac9d534ce34d3cc5c567f428b7184a528 100644 (file)
--- 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 (file)
index 0000000..be0ce5e
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 (file)
index 0000000..b7ea2be
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 5547b79751b70fb79b8785558631c0c79de769cb..8b1911851f2c24c0dbc1d823a26bf1051635ec08 100644 (file)
--- 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 95bfa52714539d971e20fe403828930bb7272b92..732df2544dbb0fc51095061cd0b7ba6b5145718c 100644 (file)
--- 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 22cb5f9c267d5b45e1ee7b35f60a806d1128d998..5bf67061e796c5261f5e07a5f0d833e0a1c66bd9 100644 (file)
--- 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 03daa49c3ab7c7fb25cfe227048ef5520c8c7cc8..570c57ce3b8ba535a0a13ace18fdd32cf78201f6 100644 (file)
--- 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. -->