Create a floating action button for creating bookmark folders. https://redmine.stout...

diff --git a/app/src/main/assets/de/about_licenses_dark.html b/app/src/main/assets/de/about_licenses_dark.html
index c7809e929a1b6cf158f2d3a7c3782fdd10c885e2..9e15f881aa8ea804c17fdb0f42283a2371d25203 100644 (file)
--- a/app/src/main/assets/de/about_licenses_dark.html
+++ b/app/src/main/assets/de/about_licenses_dark.html
@@ -43,13 +43,19 @@
             are derived from ic_security and ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
             The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/move_to_folder_dark.png"> is derived from elements of ic_folder and ic_exit_to_app, which are part of the <a href="https://material.io/icons/">Android Material icon set</a>
-            and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/create_bookmark_dark.png"> is derived from elements of ic_bookmark and ic_create_new_folder, which are part of the <a href="https://material.io/icons/">Android Material icon set</a>
+            and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/create_folder_dark.png"> is derived from ic_create_new_folder, which is part of the <a href="https://material.io/icons/">Android Material icon set</a>
+            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/clear_and_exit_dark.png"> is derived from ic_exit_to_app, which is part of the <a href="https://material.io/icons/">Android Material icon set</a>
-            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/night_mode_dark.png"> is derived from ic_compare, which is part of the <a href="https://material.io/icons/">Android Material icon set</a>
-            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/orbot_dark.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>,
             which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>.
@@ -67,7 +73,6 @@
         <p><img class="icon" src="../en/images/ic_call_to_action_dark.png"> ic_call_to_action.</p>
         <p><img class="icon" src="../en/images/ic_chrome_reader_mode_dark.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="../en/images/ic_close_dark.png"> ic_close.</p>
-        <p><img class="icon" src="../en/images/ic_create_new_folder_dark.png"> ic_create_new_folder.</p>
         <p><img class="icon" src="../en/images/ic_delete_dark.png"> ic_delete.</p>
         <p><img class="icon" src="../en/images/ic_delete_forever_dark.png"> ic_delete_forever.</p>
         <p><img class="icon" src="../en/images/ic_devices_other_dark.png"> ic_devices_other.</p>

diff --git a/app/src/main/assets/de/about_licenses_light.html b/app/src/main/assets/de/about_licenses_light.html
index 4ed8e87ab6ab897d30d113a72474e8c5d6f40ce8..8d8851f8154fa70715fb059a208bda4303a30f91 100644 (file)
--- a/app/src/main/assets/de/about_licenses_light.html
+++ b/app/src/main/assets/de/about_licenses_light.html
@@ -43,13 +43,19 @@
             are derived from ic_security and ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
             The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/move_to_folder_light.png"> is derived from elements of ic_folder and ic_exit_to_app, which are part of the <a href="https://material.io/icons/">Android Material icon set</a>
-            and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/create_bookmark_light.png"> is derived from elements of ic_bookmark and ic_create_new_folder, which are part of the <a href="https://material.io/icons/">Android Material icon set</a>
+            and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="../en/images/create_folder_light.png"> is derived from ic_create_new_folder, which is part of the <a href="https://material.io/icons/">Android Material icon set</a>
+            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/clear_and_exit_light.png"> is derived from ic_exit_to_app, which is part of the <a href="https://material.io/icons/">Android Material icon set</a>
-            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/night_mode_light.png"> is derived from ic_compare, which is part of the <a href="https://material.io/icons/">Android Material icon set</a>
-            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="../en/images/orbot_light.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>,
             which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>.
@@ -67,7 +73,6 @@
         <p><img class="icon" src="../en/images/ic_call_to_action_light.png"> ic_call_to_action.</p>
         <p><img class="icon" src="../en/images/ic_chrome_reader_mode_light.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="../en/images/ic_close_light.png"> ic_close.</p>
-        <p><img class="icon" src="../en/images/ic_create_new_folder_light.png"> ic_create_new_folder.</p>
         <p><img class="icon" src="../en/images/ic_delete_light.png"> ic_delete.</p>
         <p><img class="icon" src="../en/images/ic_delete_forever_light.png"> ic_delete_forever.</p>
         <p><img class="icon" src="../en/images/ic_devices_other_light.png"> ic_devices_other.</p>

diff --git a/app/src/main/assets/en/about_licenses_dark.html b/app/src/main/assets/en/about_licenses_dark.html
index 9bdb43d46bdfa371d1a776bb2217d3fcc2a9ca8c..aa52ae2013d0cf8c2cdad9ce858f3d7e596ed77f 100644 (file)
--- a/app/src/main/assets/en/about_licenses_dark.html
+++ b/app/src/main/assets/en/about_licenses_dark.html
@@ -38,13 +38,19 @@
             are derived from ic_security and ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
             The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="images/move_to_folder_dark.png"> is derived from elements of ic_folder and ic_exit_to_app, which are part of the <a href="https://material.io/icons/">Android Material icon set</a>
-            and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="images/create_bookmark_dark.png"> is derived from elements of ic_bookmark and ic_create_new_folder, which are part of the <a href="https://material.io/icons/">Android Material icon set</a>
+            and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="images/create_folder_dark.png"> is derived from ic_create_new_folder, which is part of the <a href="https://material.io/icons/">Android Material icon set</a>
+            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="images/clear_and_exit_dark.png"> is derived from ic_exit_to_app, which is part of the <a href="https://material.io/icons/">Android Material icon set</a>
-            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="images/night_mode_dark.png"> is derived from ic_compare, which is part of the <a href="https://material.io/icons/">Android Material icon set</a>
-            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="images/orbot_dark.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>,
             which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>.
@@ -61,7 +67,6 @@
         <p><img class="icon" src="images/ic_call_to_action_dark.png"> ic_call_to_action.</p>
         <p><img class="icon" src="images/ic_chrome_reader_mode_dark.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="images/ic_close_dark.png"> ic_close.</p>
-        <p><img class="icon" src="images/ic_create_new_folder_dark.png"> ic_create_new_folder.</p>
         <p><img class="icon" src="images/ic_delete_dark.png"> ic_delete.</p>
         <p><img class="icon" src="images/ic_delete_forever_dark.png"> ic_delete_forever.</p>
         <p><img class="icon" src="images/ic_devices_other_dark.png"> ic_devices_other.</p>

diff --git a/app/src/main/assets/en/about_licenses_light.html b/app/src/main/assets/en/about_licenses_light.html
index 48d734127ef2e975f2013ef2e2375cdccd0125f3..1cebdb2c40e845984ce30872b4da5d13fb58bd3b 100644 (file)
--- a/app/src/main/assets/en/about_licenses_light.html
+++ b/app/src/main/assets/en/about_licenses_light.html
@@ -38,13 +38,19 @@
             are derived from ic_security and ic_language, which are part of the <a href="https://material.io/icons/">Android Material icon set</a> and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>.
             The full text of the license is below. Modifications copyright © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. The resulting images are released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="images/move_to_folder_light.png"> is derived from elements of ic_folder and ic_exit_to_app, which are part of the <a href="https://material.io/icons/">Android Material icon set</a>
-            and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="images/create_bookmark_light.png"> is derived from elements of ic_bookmark and ic_create_new_folder, which are part of the <a href="https://material.io/icons/">Android Material icon set</a>
+            and are released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
+        <p><img class="left" src="images/create_folder_light.png"> is derived from ic_create_new_folder, which is part of the <a href="https://material.io/icons/">Android Material icon set</a>
+            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="images/clear_and_exit_light.png"> is derived from ic_exit_to_app, which is part of the <a href="https://material.io/icons/">Android Material icon set</a>
-            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="images/night_mode_light.png"> is derived from ic_compare, which is part of the <a href="https://material.io/icons/">Android Material icon set</a>
-            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. The full text of the license is below. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            and is released under the <a href ="https://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a>. Modifications copyright © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             The resulting image is released under the <a href="https://www.gnu.org/licenses/gpl-3.0.html">GPLv3+ license</a>.</p>
         <p><img class="left" src="images/orbot_light.png"> orbot is a modified version of <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">the status icon from the Orbot project</a>,
             which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>.
@@ -61,7 +67,6 @@
         <p><img class="icon" src="images/ic_call_to_action_light.png"> ic_call_to_action.</p>
         <p><img class="icon" src="images/ic_chrome_reader_mode_light.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="images/ic_close_light.png"> ic_close.</p>
-        <p><img class="icon" src="images/ic_create_new_folder_light.png"> ic_create_new_folder.</p>
         <p><img class="icon" src="images/ic_delete_light.png"> ic_delete.</p>
         <p><img class="icon" src="images/ic_delete_forever_light.png"> ic_delete_forever.</p>
         <p><img class="icon" src="images/ic_devices_other_light.png"> ic_devices_other.</p>

diff --git a/app/src/main/assets/en/images/create_bookmark_dark.png b/app/src/main/assets/en/images/create_bookmark_dark.png
new file mode 100644 (file)
index 0000000..a85c5fc
Binary files /dev/null and b/app/src/main/assets/en/images/create_bookmark_dark.png differ

diff --git a/app/src/main/assets/en/images/create_bookmark_light.png b/app/src/main/assets/en/images/create_bookmark_light.png
new file mode 100644 (file)
index 0000000..fb04d24
Binary files /dev/null and b/app/src/main/assets/en/images/create_bookmark_light.png differ

diff --git a/app/src/main/assets/en/images/create_folder_dark.png b/app/src/main/assets/en/images/create_folder_dark.png
new file mode 100644 (file)
index 0000000..5b0b258
Binary files /dev/null and b/app/src/main/assets/en/images/create_folder_dark.png differ

diff --git a/app/src/main/assets/en/images/create_folder_light.png b/app/src/main/assets/en/images/create_folder_light.png
new file mode 100644 (file)
index 0000000..98f4418
Binary files /dev/null and b/app/src/main/assets/en/images/create_folder_light.png differ

diff --git a/app/src/main/assets/en/images/ic_create_new_folder_dark.png b/app/src/main/assets/en/images/ic_create_new_folder_dark.png
deleted file mode 100644 (file)
index 12c7035..0000000
Binary files a/app/src/main/assets/en/images/ic_create_new_folder_dark.png and /dev/null differ

diff --git a/app/src/main/assets/en/images/ic_create_new_folder_light.png b/app/src/main/assets/en/images/ic_create_new_folder_light.png
deleted file mode 100644 (file)
index db0234d..0000000
Binary files a/app/src/main/assets/en/images/ic_create_new_folder_light.png and /dev/null differ

diff --git a/app/src/main/assets/es/about_licenses_dark.html b/app/src/main/assets/es/about_licenses_dark.html
index 1ea15638f00564a5180f7b1d6fcb86a8b0a6be55..4feb1e0b26e985baada5256e21daad8f5bf56321 100644 (file)
--- a/app/src/main/assets/es/about_licenses_dark.html
+++ b/app/src/main/assets/es/about_licenses_dark.html
@@ -40,11 +40,20 @@
             derivan de ic_security y de ic_language, que son parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a> y son liberados bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
             El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. Las imágenes resultantes se liberan bajo la
             <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
+        <p><img class="left" src="../en/images/move_to_folder_dark.png"> deriva de elementos de ic_folder y ic_exit_to_app, que son parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a>
+            y son liberados bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
+        <p><img class="left" src="../en/images/create_bookmark_dark.png"> deriva de elementos de ic_bookmark y ic_create_new_folder, que son parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a>
+            y son liberados bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
+        <p><img class="left" src="../en/images/create_folder_dark.png"> deriva de ic_create_new_folder, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a>
+            y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/clear_and_exit_dark.png"> deriva de ic_exit_to_app, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a>
-            y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/night_mode_dark.png"> deriva de ic_exit_to_app, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a>
-            y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/orbot_dark.png"> orbot es una versión modificada del <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">icono de estado del proyecto Orbot</a>,
             que tiene copyright 2009-2010 por Nathan Freitas, The Guardian Project. Es liberado bajo la <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">licencia BSD modificada (de 3 cláusulas)</a>.
@@ -62,7 +71,6 @@
         <p><img class="icon" src="../en/images/ic_call_to_action_dark.png"> ic_call_to_action.</p>
         <p><img class="icon" src="../en/images/ic_chrome_reader_mode_dark.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="../en/images/ic_close_dark.png"> ic_close.</p>
-        <p><img class="icon" src="../en/images/ic_create_new_folder_dark.png"> ic_create_new_folder.</p>
         <p><img class="icon" src="../en/images/ic_delete_dark.png"> ic_delete.</p>
         <p><img class="icon" src="../en/images/ic_delete_forever_dark.png"> ic_delete_forever.</p>
         <p><img class="icon" src="../en/images/ic_devices_other_dark.png"> ic_devices_other.</p>

diff --git a/app/src/main/assets/es/about_licenses_light.html b/app/src/main/assets/es/about_licenses_light.html
index 243dc5cd59d29e4449250a6f2cab70e776f6b7bb..be90b67e7a0f546c4b1389c3909ee0fa2eb06a48 100644 (file)
--- a/app/src/main/assets/es/about_licenses_light.html
+++ b/app/src/main/assets/es/about_licenses_light.html
@@ -38,13 +38,22 @@
             Ya que una lista de nombres de dominio es una lista de hechos, no puede tener <a href="https://www.copyright.gov/help/faq/faq-protect.html">derechos de autor</a>.</p>
         <p><img class="left" src="../en/images/privacy_browser.png"> <img class="left" src="../en/images/privacy_browser_free.png"> <img class="left" src="../en/images/warning.png"> <img class="left" src="../en/images/javascript_enabled.png">
             derivan de ic_security y de ic_language, que son parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a> y son liberados bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>.
-            El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>. Las imágenes resultantes se liberan bajo la
-            <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
+            El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            Las imágenes resultantes se liberan bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
+        <p><img class="left" src="../en/images/move_to_folder_light.png"> deriva de elementos de ic_folder y ic_exit_to_app, que son parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a>
+            y son liberados bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
+        <p><img class="left" src="../en/images/create_bookmark_light.png"> deriva de elementos de ic_bookmark y ic_create_new_folder, que son parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a>
+            y son liberados bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
+        <p><img class="left" src="../en/images/create_folder_light.png"> deriva de ic_create_new_folder, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a>
+            y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/clear_and_exit_light.png"> deriva de ic_exit_to_app, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a>
-            y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/night_mode_light.png"> deriva de ic_exit_to_app, que es parte del <a href="https://material.io/icons/">conjunto de iconos Android Material</a>
-            y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            y es liberado bajo la <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licencia Apache 2.0</a>. Copyright de modificaciones © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             La imagen resultante se libera bajo la <a href="https://www.gnu.org/licenses/gpl-3.0.html">licencia GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/orbot_light.png"> orbot es una versión modificada del <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">icono de estado del proyecto Orbot</a>,
             que tiene copyright 2009-2010 por Nathan Freitas, The Guardian Project. Es liberado bajo la <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">licencia BSD modificada (de 3 cláusulas)</a>.
@@ -62,7 +71,6 @@
         <p><img class="icon" src="../en/images/ic_call_to_action_light.png"> ic_call_to_action.</p>
         <p><img class="icon" src="../en/images/ic_chrome_reader_mode_light.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="../en/images/ic_close_light.png"> ic_close.</p>
-        <p><img class="icon" src="../en/images/ic_create_new_folder_light.png"> ic_create_new_folder.</p>
         <p><img class="icon" src="../en/images/ic_delete_light.png"> ic_delete.</p>
         <p><img class="icon" src="../en/images/ic_delete_forever_light.png"> ic_delete_forever.</p>
         <p><img class="icon" src="../en/images/ic_devices_other_light.png"> ic_devices_other.</p>

diff --git a/app/src/main/assets/it/about_licenses_dark.html b/app/src/main/assets/it/about_licenses_dark.html
index 82547ecb9a35a9303870c5465f98d28d5d784c41..4b2139593e7f2d0cbbdff1515e4b7bdecf4cfb5e 100644 (file)
--- a/app/src/main/assets/it/about_licenses_dark.html
+++ b/app/src/main/assets/it/about_licenses_dark.html
@@ -44,13 +44,14 @@
             sono state derivate da ic_security e ic_language, che fanno parte dell'<a href="https://material.io/icons/">Android Material icon set</a> e sono state rilasciate sotto <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
             Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             Le immagini risultanti sono rilasciate sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
+        <p><img class="left" src="../en/images/create_folder_dark.png"> è stata derivata da ic_create_new_folder, che fa parte dell'<a href="https://material.io/icons/">Android Material icon set</a>
+            ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>. Copyright delle modifiche © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            L'immagine risultante è rilasciata sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/clear_and_exit_dark.png"> è stata derivata da ic_exit_to_app, che fa parte dell'<a href="https://material.io/icons/">Android Material icon set</a>
-            ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
-            Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>. Copyright delle modifiche © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             L'immagine risultante è rilasciata sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/night_mode_dark.png"> è stata derivata da ic_compare, che fa parte dell'<a href="https://material.io/icons/">Android Material icon set</a>
-            ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
-            Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>. Copyright delle modifiche © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             L'immagine risultante è rilasciata sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/orbot_dark.png"> orbot è una versione modificata della <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">icona di stato del progetto Orbot</a>,
             il cui copyright è 2009-2010 Nathan Freitas, The Guardian Project. E' rilasciata sotto <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>. Il testo completo della Licenza è riportato di seguito.
@@ -67,7 +68,6 @@
         <p><img class="icon" src="../en/images/ic_call_to_action_dark.png"> ic_call_to_action.</p>
         <p><img class="icon" src="../en/images/ic_chrome_reader_mode_dark.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="../en/images/ic_close_dark.png"> ic_close.</p>
-        <p><img class="icon" src="../en/images/ic_create_new_folder_dark.png"> ic_create_new_folder.</p>
         <p><img class="icon" src="../en/images/ic_delete_dark.png"> ic_delete.</p>
         <p><img class="icon" src="../en/images/ic_delete_forever_dark.png"> ic_delete_forever.</p>
         <p><img class="icon" src="../en/images/ic_devices_other_dark.png"> ic_devices_other.</p>

diff --git a/app/src/main/assets/it/about_licenses_light.html b/app/src/main/assets/it/about_licenses_light.html
index 643997c67e0f8ffff84e64f234101477e5b4cbf9..da4c70837215e367d08b006d243e36eaa5747061 100644 (file)
--- a/app/src/main/assets/it/about_licenses_light.html
+++ b/app/src/main/assets/it/about_licenses_light.html
@@ -44,13 +44,14 @@
             sono state derivate da ic_security e ic_language, che fanno parte dell'<a href="https://material.io/icons/">Android Material icon set</a> e sono state rilasciate sotto <a href ="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
             Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2016 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             Le immagini risultanti sono rilasciate sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
+        <p><img class="left" src="../en/images/create_folder_light.png"> è stata derivata da ic_create_new_folder, che fa parte dell'<a href="https://material.io/icons/">Android Material icon set</a>
+            ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>. Copyright delle modifiche © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            L'immagine risultante è rilasciata sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/clear_and_exit_light.png"> è stata derivata da ic_exit_to_app, che fa parte dell'<a href="https://material.io/icons/">Android Material icon set</a>
-            ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
-            Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>. Copyright delle modifiche © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             L'immagine risultante è rilasciata sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/night_mode_light.png"> è stata derivata da ic_compare, che fa parte dell'<a href="https://material.io/icons/">Android Material icon set</a>
-            ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>.
-            Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
+            ed è stata rilasciata sotto <a href="https://www.apache.org/licenses/LICENSE-2.0">Licenza Apache 2.0</a>. Copyright delle modifiche © 2017 <a href="mailto:soren@stoutner.com">Soren Stoutner</a>.
             L'immagine risultante è rilasciata sotto <a href="https://www.gnu.org/licenses/gpl-3.0.html">Licenza GPLv3+</a>.</p>
         <p><img class="left" src="../en/images/orbot_light.png"> orbot è una versione modificata della <a href="https://gitweb.torproject.org/orbot.git/tree/app/src/main/res/drawable-xxxhdpi/ic_stat_tor.png">icona di stato del progetto Orbot</a>,
             il cui copyright è 2009-2010 Nathan Freitas, The Guardian Project. E' rilasciata sotto <a href="https://gitweb.torproject.org/orbot.git/tree/LICENSE">3-clause BSD license</a>. Il testo completo della Licenza è riportato di seguito.
@@ -67,7 +68,6 @@
         <p><img class="icon" src="../en/images/ic_call_to_action_light.png"> ic_call_to_action.</p>
         <p><img class="icon" src="../en/images/ic_chrome_reader_mode_light.png"> ic_chrome_reader_mode.</p>
         <p><img class="icon" src="../en/images/ic_close_light.png"> ic_close.</p>
-        <p><img class="icon" src="../en/images/ic_create_new_folder_light.png"> ic_create_new_folder.</p>
         <p><img class="icon" src="../en/images/ic_delete_light.png"> ic_delete.</p>
         <p><img class="icon" src="../en/images/ic_delete_forever_light.png"> ic_delete_forever.</p>
         <p><img class="icon" src="../en/images/ic_devices_other_light.png"> ic_devices_other.</p>

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java
index 68830965c84182d1abcada6c7061740500e79fab..47c5db909341e6c30058cdf198ed839df9643985 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/BookmarksActivity.java
@@ -528,9 +528,22 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma
             }
         });
 
-        // Set a FloatingActionButton for creating new bookmarks.
-        FloatingActionButton createBookmarkFAB = (FloatingActionButton) findViewById(R.id.create_bookmark_fab);
-        createBookmarkFAB.setOnClickListener(new View.OnClickListener() {
+        // Get handles for the `FloatingActionButtons.
+        FloatingActionButton createBookmarkFolderFab = (FloatingActionButton) findViewById(R.id.create_bookmark_folder_fab);
+        FloatingActionButton createBookmarkFab = (FloatingActionButton) findViewById(R.id.create_bookmark_fab);
+
+        // Set the create new bookmark folder FAB to display the dialog box.
+        createBookmarkFolderFab.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                // Show the `CreateBookmarkFolderDialog` `AlertDialog` and name the instance `@string/create_folder`.
+                AppCompatDialogFragment createBookmarkFolderDialog = new CreateBookmarkFolderDialog();
+                createBookmarkFolderDialog.show(getSupportFragmentManager(), getResources().getString(R.string.create_folder));
+            }
+        });
+
+        // Set the create new bookmark FAB to display the dialog box.
+        createBookmarkFab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 // Show the `CreateBookmarkDialog` `AlertDialog` and name the instance `@string/create_bookmark`.
@@ -567,12 +580,6 @@ public class BookmarksActivity extends AppCompatActivity implements CreateBookma
                 }
                 break;
 
-            case R.id.create_folder:
-                // Show the `CreateBookmarkFolderDialog` `AlertDialog` and name the instance `@string/create_folder`.
-                AppCompatDialogFragment createBookmarkFolderDialog = new CreateBookmarkFolderDialog();
-                createBookmarkFolderDialog.show(getSupportFragmentManager(), getResources().getString(R.string.create_folder));
-                break;
-
             case R.id.options_menu_select_all_bookmarks:
                 int numberOfBookmarks = bookmarksListView.getCount();
 

diff --git a/app/src/main/res/drawable/create_bookmark_dark.xml b/app/src/main/res/drawable/create_bookmark_dark.xml
new file mode 100644 (file)
index 0000000..c0b28d2
--- /dev/null
+++ b/app/src/main/res/drawable/create_bookmark_dark.xml
@@ -0,0 +1,15 @@
+<!-- `create_bookmark_dark.xml` is derived from elements of `ic_bookmark` and `ic_create_new_folder`, which are part of the Android Material icon set.  They are released under the Apache License 2.0.
+    Modifications copyright © 2017 Soren Stoutner <soren@stoutner.com>.  The resulting image is released under the GPLv3+ license. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
+    <path
+        android:fillColor="#FFE0E0E0"
+        android:pathData="M7,3C5.9,3 5.01,3.9 5.01,5L5,21L12,18L19,21L19,5C19,3.9 18.1,3 17,3L7,3zM11,7L13,7L13,10L16,10L16,12L13,12L13,15L11,15L11,12L8,12L8,10L11,10L11,7z" />
+
+</vector>

diff --git a/app/src/main/res/drawable/create_bookmark_light.xml b/app/src/main/res/drawable/create_bookmark_light.xml
new file mode 100644 (file)
index 0000000..d094677
--- /dev/null
+++ b/app/src/main/res/drawable/create_bookmark_light.xml
@@ -0,0 +1,15 @@
+<!-- `create_bookmark_light.xml` is derived from elements of `ic_bookmark` and `ic_create_new_folder`, which are part of the Android Material icon set.  They are released under the Apache License 2.0.
+    Modifications copyright © 2017 Soren Stoutner <soren@stoutner.com>.  The resulting image is released under the GPLv3+ license. -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M7,3C5.9,3 5.01,3.9 5.01,5L5,21L12,18L19,21L19,5C19,3.9 18.1,3 17,3L7,3zM11,7L13,7L13,10L16,10L16,12L13,12L13,15L11,15L11,12L8,12L8,10L11,10L11,7z" />
+
+</vector>

diff --git a/app/src/main/res/drawable/create_folder_dark.xml b/app/src/main/res/drawable/create_folder_dark.xml
index b3f351eb009a398caa51792167eaa98aa7961c84..1845d7fccb2027cd79678ebd47105b5544f207d1 100644 (file)
--- a/app/src/main/res/drawable/create_folder_dark.xml
+++ b/app/src/main/res/drawable/create_folder_dark.xml
@@ -11,8 +11,8 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillColor="#FFE0E0E0"
-        android:pathData="M20,6h-8l-2,-2L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM19,14h-3v3h-2v-3h-3v-2h3L14,9h2v3h3v2z"/>
+        android:pathData="M4,4C2.89,4 2.01,4.89 2.01,6L2,18C2,19.11 2.89,20 4,20L20,20C21.11,20 22,19.11 22,18L22,8C22,6.89 21.11,6 20,6L12,6L10,4L4,4zM11,9L13,9L13,12L16,12L16,14L13,14L13,17L11,17L11,14L8,14L8,12L11,12L11,9z" />
 </vector>

diff --git a/app/src/main/res/drawable/create_folder_light.xml b/app/src/main/res/drawable/create_folder_light.xml
index 6799516cf7b24fc2a8397664d0071dd62c40339f..d86d5bb065426f74a09054fec34832d768f68e83 100644 (file)
--- a/app/src/main/res/drawable/create_folder_light.xml
+++ b/app/src/main/res/drawable/create_folder_light.xml
@@ -11,8 +11,8 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M20,6h-8l-2,-2L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM19,14h-3v3h-2v-3h-3v-2h3L14,9h2v3h3v2z"/>
+        android:pathData="M4,4C2.89,4 2.01,4.89 2.01,6L2,18C2,19.11 2.89,20 4,20L20,20C21.11,20 22,19.11 22,18L22,8C22,6.89 21.11,6 20,6L12,6L10,4L4,4zM11,9L13,9L13,12L16,12L16,14L13,14L13,17L11,17L11,14L8,14L8,12L11,12L11,9z" />
 </vector>

diff --git a/app/src/main/res/drawable/edit_dark.xml b/app/src/main/res/drawable/edit_dark.xml
index 7fec007284ce0e1c96412e8c6162c634905c9de7..9f068bb03f75a8988171543f15a958c0dfbf581b 100644 (file)
--- a/app/src/main/res/drawable/edit_dark.xml
+++ b/app/src/main/res/drawable/edit_dark.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillColor="#FFE0E0E0"
         android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>

diff --git a/app/src/main/res/drawable/edit_light.xml b/app/src/main/res/drawable/edit_light.xml
index 97ea7d9201a01bb1315ff794d174c34e8658c483..a4989817458525f6fddf3eb96cf8efcf0fd6ef49 100644 (file)
--- a/app/src/main/res/drawable/edit_light.xml
+++ b/app/src/main/res/drawable/edit_light.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster" >
 
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>

diff --git a/app/src/main/res/drawable/form_data_enabled.xml b/app/src/main/res/drawable/form_data_enabled.xml
index fa609665e3ec1e62e050808e45115bc52a8f01d2..889e0525805d80c985ebfd3f02180cbcc97e7364 100644 (file)
--- a/app/src/main/res/drawable/form_data_enabled.xml
+++ b/app/src/main/res/drawable/form_data_enabled.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster">
 
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillColor="#FFF57F17"
         android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,12h4v2L4,14v-2zM14,18L4,18v-2h10v2zM20,18h-4v-2h4v2zM20,14L10,14v-2h10v2z"/>

diff --git a/app/src/main/res/drawable/form_data_warning.xml b/app/src/main/res/drawable/form_data_warning.xml
index 8fb307675c11f4509082dac2a53529ed3d7de71e..1e2855b616c6170832b30cb1dffdf8de36ffb5f0 100644 (file)
--- a/app/src/main/res/drawable/form_data_warning.xml
+++ b/app/src/main/res/drawable/form_data_warning.xml
@@ -11,7 +11,7 @@
     android:autoMirrored="true"
     tools:ignore="VectorRaster">
 
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillColor="#FFB71C1C"
         android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,12h4v2L4,14v-2zM14,18L4,18v-2h10v2zM20,18h-4v-2h4v2zM20,14L10,14v-2h10v2z"/>

diff --git a/app/src/main/res/drawable/home_enabled_dark.xml b/app/src/main/res/drawable/home_enabled_dark.xml
index 9d10705ee615aa6343163d19d940bc6482b93d2a..2afe7d77ca94ba933785ed631018e8bec720e6d0 100644 (file)
--- a/app/src/main/res/drawable/home_enabled_dark.xml
+++ b/app/src/main/res/drawable/home_enabled_dark.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillColor="#FF1E88E5"
         android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />

diff --git a/app/src/main/res/drawable/home_enabled_light.xml b/app/src/main/res/drawable/home_enabled_light.xml
index ba3d55e8b97a9a80a18cb3d16623d48a1016d8b3..e26e6de4307b7bdbb8b2c42531cba41380f5d69e 100644 (file)
--- a/app/src/main/res/drawable/home_enabled_light.xml
+++ b/app/src/main/res/drawable/home_enabled_light.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillColor="#FF1565C0"
         android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />

diff --git a/app/src/main/res/drawable/home_ghosted_dark.xml b/app/src/main/res/drawable/home_ghosted_dark.xml
index 4754495eaf70e3d32c063807e96123251add0269..2f858eb7fdf8243c5e868fe22cb496c4977b212b 100644 (file)
--- a/app/src/main/res/drawable/home_ghosted_dark.xml
+++ b/app/src/main/res/drawable/home_ghosted_dark.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillColor="#FF616161"
         android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />

diff --git a/app/src/main/res/drawable/home_ghosted_light.xml b/app/src/main/res/drawable/home_ghosted_light.xml
index 135f801ac83f2169df12d41ed2bbb1df2d21fc7e..9d25fcb827cfd174f125418e26e9ac04148d898e 100644 (file)
--- a/app/src/main/res/drawable/home_ghosted_light.xml
+++ b/app/src/main/res/drawable/home_ghosted_light.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0" >
 
-    <!-- We have to use a hard coded color until API >= 21.  Then we can use `@color`. -->
+    <!-- A hard coded color must be used until API >= 21.  Then `@color` may be used. -->
     <path
         android:fillColor="#44000000"
         android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />

diff --git a/app/src/main/res/layout/bookmarks_coordinatorlayout.xml b/app/src/main/res/layout/bookmarks_coordinatorlayout.xml
index e07ce174955ee960ca8442f7c91209594f374dbe..6183daf57cd75b220c18e712515d2109b5b6b033 100644 (file)
--- a/app/src/main/res/layout/bookmarks_coordinatorlayout.xml
+++ b/app/src/main/res/layout/bookmarks_coordinatorlayout.xml
@@ -59,11 +59,20 @@
             android:dividerHeight="0dp" />
     </LinearLayout>
 
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/create_bookmark_folder_fab"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="85dp"
+        android:src="?attr/addFolderIcon" />
+
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/create_bookmark_fab"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="16dp"
-        android:src="?attr/addIcon" />
+        android:src="?attr/addBookmarkIcon" />
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file

diff --git a/app/src/main/res/menu/bookmarks_options_menu.xml b/app/src/main/res/menu/bookmarks_options_menu.xml
index e91b13429f4b470930a6fe0166868c2ec6755c6b..e5bf25cfb91daf43e4a2bb60b6b0fa259cb2cf29 100644 (file)
--- a/app/src/main/res/menu/bookmarks_options_menu.xml
+++ b/app/src/main/res/menu/bookmarks_options_menu.xml
@@ -22,23 +22,16 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/create_folder"
-        android:title="@string/create_folder"
-        android:orderInCategory="10"
-        android:icon="?attr/createFolderIcon"
-        app:showAsAction="ifRoom" />
-
     <item
         android:id="@+id/options_menu_select_all_bookmarks"
         android:title="@string/select_all"
-        android:orderInCategory="20"
+        android:orderInCategory="10"
         android:icon="?attr/selectAllIcon"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/bookmarks_database_view"
         android:title="@string/database_view"
-        android:orderInCategory="30"
+        android:orderInCategory="20"
         app:showAsAction="never" />
 </menu>
\ No newline at end of file

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index a10133ab656695320e52ac5ee74ac953182e80fa..55d6c2ed97ab629fe3be97a332f866ef49f9b03f 100644 (file)
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -52,7 +52,8 @@
     <attr name="fontSizeIcon" format="reference" />
     <attr name="deleteIcon" format="reference" />
     <attr name="addIcon" format="reference" />
-    <attr name="createFolderIcon" format="reference" />
+    <attr name="addBookmarkIcon" format="reference" />
+    <attr name="addFolderIcon" format="reference" />
     <attr name="selectAllIcon" format="reference" />
     <attr name="editIcon" format="reference" />
     <attr name="moveToFolderIcon" format="reference" />

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 084da1032b547d324289f0b05770b2462189cde8..1f180735e6fb5824ff7bfbb41c5ed4068110f4d2 100644 (file)
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -53,7 +53,8 @@
         <item name="iconTintColor">@color/blue_800</item>
         <item name="deleteIcon">@drawable/delete_light</item>
         <item name="addIcon">@drawable/add_light</item>
-        <item name="createFolderIcon">@drawable/create_folder_light</item>
+        <item name="addBookmarkIcon">@drawable/create_bookmark_light</item>
+        <item name="addFolderIcon">@drawable/create_folder_light</item>
         <item name="selectAllIcon">@drawable/select_all_light</item>
         <item name="editIcon">@drawable/edit_light</item>
         <item name="moveToFolderIcon">@drawable/move_to_folder_light</item>
@@ -133,7 +134,8 @@
         <item name="iconTintColor">@color/blue_600</item>
         <item name="deleteIcon">@drawable/delete_dark</item>
         <item name="addIcon">@drawable/add_dark</item>
-        <item name="createFolderIcon">@drawable/create_folder_dark</item>
+        <item name="addBookmarkIcon">@drawable/create_bookmark_dark</item>
+        <item name="addFolderIcon">@drawable/create_folder_dark</item>
         <item name="selectAllIcon">@drawable/select_all_dark</item>
         <item name="editIcon">@drawable/edit_dark</item>
         <item name="moveToFolderIcon">@drawable/move_to_folder_dark</item>