From: Soren Stoutner Date: Mon, 25 Sep 2017 21:41:40 +0000 (-0700) Subject: Create a floating action button for creating bookmark folders. https://redmine.stout... X-Git-Tag: v2.7~15 X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=ebec46e2eec4e59304c364063c682c43930cf954;p=PrivacyBrowserAndroid.git Create a floating action button for creating bookmark folders. https://redmine.stoutner.com/issues/197. --- diff --git a/app/src/main/assets/de/about_licenses_dark.html b/app/src/main/assets/de/about_licenses_dark.html index c7809e92..9e15f881 100644 --- 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 Android Material icon set and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2016 Soren Stoutner. The resulting images are released under the GPLv3+ license.

is derived from elements of ic_folder and ic_exit_to_app, which are part of the Android Material icon set - and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + and are released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.

+

is derived from elements of ic_bookmark and ic_create_new_folder, which are part of the Android Material icon set + and are released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.

+

is derived from ic_create_new_folder, which is part of the Android Material icon set + and is released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

is derived from ic_exit_to_app, which is part of the Android Material icon set - and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + and is released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

is derived from ic_compare, which is part of the Android Material icon set - and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + and is released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

orbot is a modified version of the status icon from the Orbot project, which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. @@ -67,7 +73,6 @@

ic_call_to_action.

ic_chrome_reader_mode.

ic_close.

-

ic_create_new_folder.

ic_delete.

ic_delete_forever.

ic_devices_other.

diff --git a/app/src/main/assets/de/about_licenses_light.html b/app/src/main/assets/de/about_licenses_light.html index 4ed8e87a..8d8851f8 100644 --- 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 Android Material icon set and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2016 Soren Stoutner. The resulting images are released under the GPLv3+ license.

is derived from elements of ic_folder and ic_exit_to_app, which are part of the Android Material icon set - and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + and are released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.

+

is derived from elements of ic_bookmark and ic_create_new_folder, which are part of the Android Material icon set + and are released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.

+

is derived from ic_create_new_folder, which is part of the Android Material icon set + and is released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

is derived from ic_exit_to_app, which is part of the Android Material icon set - and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + and is released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

is derived from ic_compare, which is part of the Android Material icon set - and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + and is released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

orbot is a modified version of the status icon from the Orbot project, which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. @@ -67,7 +73,6 @@

ic_call_to_action.

ic_chrome_reader_mode.

ic_close.

-

ic_create_new_folder.

ic_delete.

ic_delete_forever.

ic_devices_other.

diff --git a/app/src/main/assets/en/about_licenses_dark.html b/app/src/main/assets/en/about_licenses_dark.html index 9bdb43d4..aa52ae20 100644 --- 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 Android Material icon set and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2016 Soren Stoutner. The resulting images are released under the GPLv3+ license.

is derived from elements of ic_folder and ic_exit_to_app, which are part of the Android Material icon set - and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + and are released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.

+

is derived from elements of ic_bookmark and ic_create_new_folder, which are part of the Android Material icon set + and are released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.

+

is derived from ic_create_new_folder, which is part of the Android Material icon set + and is released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

is derived from ic_exit_to_app, which is part of the Android Material icon set - and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + and is released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

is derived from ic_compare, which is part of the Android Material icon set - and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + and is released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

orbot is a modified version of the status icon from the Orbot project, which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. @@ -61,7 +67,6 @@

ic_call_to_action.

ic_chrome_reader_mode.

ic_close.

-

ic_create_new_folder.

ic_delete.

ic_delete_forever.

ic_devices_other.

diff --git a/app/src/main/assets/en/about_licenses_light.html b/app/src/main/assets/en/about_licenses_light.html index 48d73412..1cebdb2c 100644 --- 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 Android Material icon set and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2016 Soren Stoutner. The resulting images are released under the GPLv3+ license.

is derived from elements of ic_folder and ic_exit_to_app, which are part of the Android Material icon set - and are released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + and are released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.

+

is derived from elements of ic_bookmark and ic_create_new_folder, which are part of the Android Material icon set + and are released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. + The resulting image is released under the GPLv3+ license.

+

is derived from ic_create_new_folder, which is part of the Android Material icon set + and is released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

is derived from ic_exit_to_app, which is part of the Android Material icon set - and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + and is released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

is derived from ic_compare, which is part of the Android Material icon set - and is released under the Apache License 2.0. The full text of the license is below. Modifications copyright © 2017 Soren Stoutner. + and is released under the Apache License 2.0. Modifications copyright © 2017 Soren Stoutner. The resulting image is released under the GPLv3+ license.

orbot is a modified version of the status icon from the Orbot project, which is copyright 2009-2010 Nathan Freitas, The Guardian Project. It is released under the 3-clause BSD license. @@ -61,7 +67,6 @@

ic_call_to_action.

ic_chrome_reader_mode.

ic_close.

-

ic_create_new_folder.

ic_delete.

ic_delete_forever.

ic_devices_other.

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 index 00000000..a85c5fcd 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 index 00000000..fb04d242 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 index 00000000..5b0b258e 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 index 00000000..98f4418a 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 index 12c7035e..00000000 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 index db0234d7..00000000 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 1ea15638..4feb1e0b 100644 --- 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 conjunto de iconos Android Material y son liberados bajo la Licencia Apache 2.0. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2016 Soren Stoutner. Las imágenes resultantes se liberan bajo la licencia GPLv3+.

+

deriva de elementos de ic_folder y ic_exit_to_app, que son parte del conjunto de iconos Android Material + y son liberados bajo la Licencia Apache 2.0. Copyright de modificaciones © 2017 Soren Stoutner. + La imagen resultante se libera bajo la licencia GPLv3+.

+

deriva de elementos de ic_bookmark y ic_create_new_folder, que son parte del conjunto de iconos Android Material + y son liberados bajo la Licencia Apache 2.0. Copyright de modificaciones © 2017 Soren Stoutner. + La imagen resultante se libera bajo la licencia GPLv3+.

+

deriva de ic_create_new_folder, que es parte del conjunto de iconos Android Material + y es liberado bajo la Licencia Apache 2.0. Copyright de modificaciones © 2017 Soren Stoutner. + La imagen resultante se libera bajo la licencia GPLv3+.

deriva de ic_exit_to_app, que es parte del conjunto de iconos Android Material - y es liberado bajo la Licencia Apache 2.0. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 Soren Stoutner. + y es liberado bajo la Licencia Apache 2.0. Copyright de modificaciones © 2017 Soren Stoutner. La imagen resultante se libera bajo la licencia GPLv3+.

deriva de ic_exit_to_app, que es parte del conjunto de iconos Android Material - y es liberado bajo la Licencia Apache 2.0. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 Soren Stoutner. + y es liberado bajo la Licencia Apache 2.0. Copyright de modificaciones © 2017 Soren Stoutner. La imagen resultante se libera bajo la licencia GPLv3+.

orbot es una versión modificada del icono de estado del proyecto Orbot, que tiene copyright 2009-2010 por Nathan Freitas, The Guardian Project. Es liberado bajo la licencia BSD modificada (de 3 cláusulas). @@ -62,7 +71,6 @@

ic_call_to_action.

ic_chrome_reader_mode.

ic_close.

-

ic_create_new_folder.

ic_delete.

ic_delete_forever.

ic_devices_other.

diff --git a/app/src/main/assets/es/about_licenses_light.html b/app/src/main/assets/es/about_licenses_light.html index 243dc5cd..be90b67e 100644 --- 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 derechos de autor.

derivan de ic_security y de ic_language, que son parte del conjunto de iconos Android Material y son liberados bajo la Licencia Apache 2.0. - El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2016 Soren Stoutner. Las imágenes resultantes se liberan bajo la - licencia GPLv3+.

+ El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2016 Soren Stoutner. + Las imágenes resultantes se liberan bajo la licencia GPLv3+.

+

deriva de elementos de ic_folder y ic_exit_to_app, que son parte del conjunto de iconos Android Material + y son liberados bajo la Licencia Apache 2.0. Copyright de modificaciones © 2017 Soren Stoutner. + La imagen resultante se libera bajo la licencia GPLv3+.

+

deriva de elementos de ic_bookmark y ic_create_new_folder, que son parte del conjunto de iconos Android Material + y son liberados bajo la Licencia Apache 2.0. Copyright de modificaciones © 2017 Soren Stoutner. + La imagen resultante se libera bajo la licencia GPLv3+.

+

deriva de ic_create_new_folder, que es parte del conjunto de iconos Android Material + y es liberado bajo la Licencia Apache 2.0. Copyright de modificaciones © 2017 Soren Stoutner. + La imagen resultante se libera bajo la licencia GPLv3+.

deriva de ic_exit_to_app, que es parte del conjunto de iconos Android Material - y es liberado bajo la Licencia Apache 2.0. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 Soren Stoutner. + y es liberado bajo la Licencia Apache 2.0. Copyright de modificaciones © 2017 Soren Stoutner. La imagen resultante se libera bajo la licencia GPLv3+.

deriva de ic_exit_to_app, que es parte del conjunto de iconos Android Material - y es liberado bajo la Licencia Apache 2.0. El texto completo de la licencia se encuentra debajo. Copyright de modificaciones © 2017 Soren Stoutner. + y es liberado bajo la Licencia Apache 2.0. Copyright de modificaciones © 2017 Soren Stoutner. La imagen resultante se libera bajo la licencia GPLv3+.

orbot es una versión modificada del icono de estado del proyecto Orbot, que tiene copyright 2009-2010 por Nathan Freitas, The Guardian Project. Es liberado bajo la licencia BSD modificada (de 3 cláusulas). @@ -62,7 +71,6 @@

ic_call_to_action.

ic_chrome_reader_mode.

ic_close.

-

ic_create_new_folder.

ic_delete.

ic_delete_forever.

ic_devices_other.

diff --git a/app/src/main/assets/it/about_licenses_dark.html b/app/src/main/assets/it/about_licenses_dark.html index 82547ecb..4b213959 100644 --- 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'Android Material icon set e sono state rilasciate sotto Licenza Apache 2.0. Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2016 Soren Stoutner. Le immagini risultanti sono rilasciate sotto Licenza GPLv3+.

+

è stata derivata da ic_create_new_folder, che fa parte dell'Android Material icon set + ed è stata rilasciata sotto Licenza Apache 2.0. Copyright delle modifiche © 2017 Soren Stoutner. + L'immagine risultante è rilasciata sotto Licenza GPLv3+.

è stata derivata da ic_exit_to_app, che fa parte dell'Android Material icon set - ed è stata rilasciata sotto Licenza Apache 2.0. - Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 Soren Stoutner. + ed è stata rilasciata sotto Licenza Apache 2.0. Copyright delle modifiche © 2017 Soren Stoutner. L'immagine risultante è rilasciata sotto Licenza GPLv3+.

è stata derivata da ic_compare, che fa parte dell'Android Material icon set - ed è stata rilasciata sotto Licenza Apache 2.0. - Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 Soren Stoutner. + ed è stata rilasciata sotto Licenza Apache 2.0. Copyright delle modifiche © 2017 Soren Stoutner. L'immagine risultante è rilasciata sotto Licenza GPLv3+.

orbot è una versione modificata della icona di stato del progetto Orbot, il cui copyright è 2009-2010 Nathan Freitas, The Guardian Project. E' rilasciata sotto 3-clause BSD license. Il testo completo della Licenza è riportato di seguito. @@ -67,7 +68,6 @@

ic_call_to_action.

ic_chrome_reader_mode.

ic_close.

-

ic_create_new_folder.

ic_delete.

ic_delete_forever.

ic_devices_other.

diff --git a/app/src/main/assets/it/about_licenses_light.html b/app/src/main/assets/it/about_licenses_light.html index 643997c6..da4c7083 100644 --- 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'Android Material icon set e sono state rilasciate sotto Licenza Apache 2.0. Il testo completo della Licenza è riportato di seguito. Copyright delle modifiche © 2016 Soren Stoutner. Le immagini risultanti sono rilasciate sotto Licenza GPLv3+.

+

è stata derivata da ic_create_new_folder, che fa parte dell'Android Material icon set + ed è stata rilasciata sotto Licenza Apache 2.0. Copyright delle modifiche © 2017 Soren Stoutner. + L'immagine risultante è rilasciata sotto Licenza GPLv3+.

è stata derivata da ic_exit_to_app, che fa parte dell'Android Material icon set - ed è stata rilasciata sotto Licenza Apache 2.0. - Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 Soren Stoutner. + ed è stata rilasciata sotto Licenza Apache 2.0. Copyright delle modifiche © 2017 Soren Stoutner. L'immagine risultante è rilasciata sotto Licenza GPLv3+.

è stata derivata da ic_compare, che fa parte dell'Android Material icon set - ed è stata rilasciata sotto Licenza Apache 2.0. - Il testo completo della licenza è riportato di seguito. Copyright delle modifiche © 2017 Soren Stoutner. + ed è stata rilasciata sotto Licenza Apache 2.0. Copyright delle modifiche © 2017 Soren Stoutner. L'immagine risultante è rilasciata sotto Licenza GPLv3+.

orbot è una versione modificata della icona di stato del progetto Orbot, il cui copyright è 2009-2010 Nathan Freitas, The Guardian Project. E' rilasciata sotto 3-clause BSD license. Il testo completo della Licenza è riportato di seguito. @@ -67,7 +68,6 @@

ic_call_to_action.

ic_chrome_reader_mode.

ic_close.

-

ic_create_new_folder.

ic_delete.

ic_delete_forever.

ic_devices_other.

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 68830965..47c5db90 100644 --- 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 index 00000000..c0b28d29 --- /dev/null +++ b/app/src/main/res/drawable/create_bookmark_dark.xml @@ -0,0 +1,15 @@ + + + + + + + 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 index 00000000..d0946776 --- /dev/null +++ b/app/src/main/res/drawable/create_bookmark_light.xml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/app/src/main/res/drawable/create_folder_dark.xml b/app/src/main/res/drawable/create_folder_dark.xml index b3f351eb..1845d7fc 100644 --- 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" > - + + 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" /> diff --git a/app/src/main/res/drawable/create_folder_light.xml b/app/src/main/res/drawable/create_folder_light.xml index 6799516c..d86d5bb0 100644 --- 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" > - + + 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" /> diff --git a/app/src/main/res/drawable/edit_dark.xml b/app/src/main/res/drawable/edit_dark.xml index 7fec0072..9f068bb0 100644 --- 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" > - + diff --git a/app/src/main/res/drawable/edit_light.xml b/app/src/main/res/drawable/edit_light.xml index 97ea7d92..a4989817 100644 --- 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" > - + diff --git a/app/src/main/res/drawable/form_data_enabled.xml b/app/src/main/res/drawable/form_data_enabled.xml index fa609665..889e0525 100644 --- 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"> - + diff --git a/app/src/main/res/drawable/form_data_warning.xml b/app/src/main/res/drawable/form_data_warning.xml index 8fb30767..1e2855b6 100644 --- 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"> - + diff --git a/app/src/main/res/drawable/home_enabled_dark.xml b/app/src/main/res/drawable/home_enabled_dark.xml index 9d10705e..2afe7d77 100644 --- 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" > - + diff --git a/app/src/main/res/drawable/home_enabled_light.xml b/app/src/main/res/drawable/home_enabled_light.xml index ba3d55e8..e26e6de4 100644 --- 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" > - + diff --git a/app/src/main/res/drawable/home_ghosted_dark.xml b/app/src/main/res/drawable/home_ghosted_dark.xml index 4754495e..2f858eb7 100644 --- 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" > - + diff --git a/app/src/main/res/drawable/home_ghosted_light.xml b/app/src/main/res/drawable/home_ghosted_light.xml index 135f801a..9d25fcb8 100644 --- 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" > - + diff --git a/app/src/main/res/layout/bookmarks_coordinatorlayout.xml b/app/src/main/res/layout/bookmarks_coordinatorlayout.xml index e07ce174..6183daf5 100644 --- 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" /> + + + android:src="?attr/addBookmarkIcon" /> \ 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 e91b1342..e5bf25cf 100644 --- 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"> - - \ 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 a10133ab..55d6c2ed 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -52,7 +52,8 @@ - + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 084da103..1f180735 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -53,7 +53,8 @@ @color/blue_800 @drawable/delete_light @drawable/add_light - @drawable/create_folder_light + @drawable/create_bookmark_light + @drawable/create_folder_light @drawable/select_all_light @drawable/edit_light @drawable/move_to_folder_light @@ -133,7 +134,8 @@ @color/blue_600 @drawable/delete_dark @drawable/add_dark - @drawable/create_folder_dark + @drawable/create_bookmark_dark + @drawable/create_folder_dark @drawable/select_all_dark @drawable/edit_dark @drawable/move_to_folder_dark