From ebec46e2eec4e59304c364063c682c43930cf954 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Mon, 25 Sep 2017 14:41:40 -0700 Subject: [PATCH] Create a floating action button for creating bookmark folders. https://redmine.stoutner.com/issues/197. --- .../main/assets/de/about_licenses_dark.html | 13 ++++++--- .../main/assets/de/about_licenses_light.html | 13 ++++++--- .../main/assets/en/about_licenses_dark.html | 13 ++++++--- .../main/assets/en/about_licenses_light.html | 13 ++++++--- .../assets/en/images/create_bookmark_dark.png | Bin 0 -> 1043 bytes .../en/images/create_bookmark_light.png | Bin 0 -> 928 bytes .../assets/en/images/create_folder_dark.png | Bin 0 -> 1035 bytes .../assets/en/images/create_folder_light.png | Bin 0 -> 915 bytes .../en/images/ic_create_new_folder_dark.png | Bin 1030 -> 0 bytes .../en/images/ic_create_new_folder_light.png | Bin 911 -> 0 bytes .../main/assets/es/about_licenses_dark.html | 14 +++++++--- .../main/assets/es/about_licenses_light.html | 18 +++++++++---- .../main/assets/it/about_licenses_dark.html | 10 +++---- .../main/assets/it/about_licenses_light.html | 10 +++---- .../activities/BookmarksActivity.java | 25 +++++++++++------- .../res/drawable/create_bookmark_dark.xml | 15 +++++++++++ .../res/drawable/create_bookmark_light.xml | 15 +++++++++++ .../main/res/drawable/create_folder_dark.xml | 4 +-- .../main/res/drawable/create_folder_light.xml | 4 +-- app/src/main/res/drawable/edit_dark.xml | 2 +- app/src/main/res/drawable/edit_light.xml | 2 +- .../main/res/drawable/form_data_enabled.xml | 2 +- .../main/res/drawable/form_data_warning.xml | 2 +- .../main/res/drawable/home_enabled_dark.xml | 2 +- .../main/res/drawable/home_enabled_light.xml | 2 +- .../main/res/drawable/home_ghosted_dark.xml | 2 +- .../main/res/drawable/home_ghosted_light.xml | 2 +- .../layout/bookmarks_coordinatorlayout.xml | 11 +++++++- .../main/res/menu/bookmarks_options_menu.xml | 11 ++------ app/src/main/res/values/attrs.xml | 3 ++- app/src/main/res/values/styles.xml | 6 +++-- 31 files changed, 146 insertions(+), 68 deletions(-) create mode 100644 app/src/main/assets/en/images/create_bookmark_dark.png create mode 100644 app/src/main/assets/en/images/create_bookmark_light.png create mode 100644 app/src/main/assets/en/images/create_folder_dark.png create mode 100644 app/src/main/assets/en/images/create_folder_light.png delete mode 100644 app/src/main/assets/en/images/ic_create_new_folder_dark.png delete mode 100644 app/src/main/assets/en/images/ic_create_new_folder_light.png create mode 100644 app/src/main/res/drawable/create_bookmark_dark.xml create mode 100644 app/src/main/res/drawable/create_bookmark_light.xml 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 0000000000000000000000000000000000000000..a85c5fcdd98de1b2a5e0fd0d01b7be352bf107a9 GIT binary patch literal 1043 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf4nJ zsKq;hZF)NrfI zw`Z@|u@(-_EBhFDHW+UF!p~W$F)d=ppPj|&-{JZ($_J{>+sZDAePH*2`vdcb%_`sT1YBpxna{M3$*k(#;>FPiTs_UJ zau-B1Y&*|*pK1MpxA8r= zeC)OFMRi^A>@t=cb+SJu?~Si|bdzU|_pilAlXTS&L_awy?{r{eSoc<*gmv|It$Ey| zbgvjSgiEh8EzMplc4})yA?Jb}ECDf08hVT((;2$5B^|z(%O9zW2 zz8*Lp$8gW~$lf(QUW|99ZZUq+xXoNs$f2*{QITjsjG6^-qnb9`@n|X&$YI_L zM}1%VADq2y`p=xdvYye-av8s^HtakSHF+W@*!j~N5h{UB2U@+8OG8f>#dlys>e+O& zZ+;g(6NKh)WUC+s0D~rmO>8>Y{B>Cj{5OAV-1y!w`GDzz`RlA-Es0{-eZZ_B=F+q! z(v#kKSnTSM}&gCCBmEj%3^Tx%K^t^9pc6e4N-PoN#}J{BQnH3%O?^2e^;_i72*{TPAm4g`xd5nf~^b zYy}C)b!)heA8y=Kd+hY?+~0HFUazvB|9|t|wCc;>`q@9&JpV4)Dkpzn|F-qF?XLc| zgTe~DWM4f1?kd2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fb04d2420f57a859d96b247fb11c2da309c41a13 GIT binary patch literal 928 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf4nJ zsKL_vSV|~b?h#PGkVpZH+f{PyTdVElR!Rm3~np#3~_R_7_!ZvQ)E+`#b z!5yZh)wK5hu_V!^BNb)l>1p3>{>%H6AKEjswnDwS%viy5k_rr^osD_Rl#yk@AH#Bv zvHO72*`{SLY(I!qu-UN9V~RHAUX?3(V@YJok&QpAd6m{O-d|BKnAQLOK-KxJGIOJ^ z#Q#{>dwXwKiHjbC{fhk$oTcp>y=||RiacwaekK0R!anl@56`W>eQ@8T$&A+ZHk2|HwVy_#k*AzTlkUtwlfOo;Y`&^eSt3T=7xekbRDZ zY2-~3f>Yuqhd_f4%Jt!pcfTM$DWW53#;H(H8}1>79ZV;wB49W0nZYK<8l z@_?DQ4-}MvjDnk*TqSeoS>->!xa~jQ*s9f+?3sLVkAHv>Lv23uZJYD&Uss-=FMswo zOCBTC0I*p#5+dioZUCBlOr#<7m+awP7n9cY&MRJ9_D`2vI+($P6==uy#)ofU7K8Qe z;pRwZhkFO&hTfO<&A)zqwrkwBks0AmhL+EX0l1wXlf|&_(j2QQF$-QB2D|XJ8V6E; z$?n=9{#dqv-C~<_E%yPdvlF*$eJyjAQ8@Ps&jIcPUJDb)xt~qMA9xl=@omxBa?`Uw=AU$* z#Xx2+h?zVk<8$oWr{5A7w)M`+-M4z*?ZZB73*LIpch348TY6V+5wpP)pb59%D(W#L z=X{R!-DG=&B|+>~P5ACyeq;HDNTAr;Ew*P;7{VIb4+On+V$11F>kZ2iSAwNlVDdfo aTHL{V_AU;__cwsKiNVv=&t;ucLK6T3uY+O$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5b0b258e521a6b1055e571c13e3c5ce3d9aaea98 GIT binary patch literal 1035 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf4nJ zsK+UCE`&>Mf%alC03|EM=ByX9NTG*^0SoE!Org8DL&#Ut`exG@Cj{WO3yVKcJJSQQe zEnky*x>KGBK9DI8vtWDEQ+Stgo$C>IzlWorx~Kf42|F-ES88nPFn+jE z@^sBvcEOF-<$|*pEM>MiYLsVpgY(~2p@zqkLk;=aoo~r8u4kU_8`1slt@s1A53CWGK544`$9tuwtReV-^#RcbRcZT-o;2w)N<3{=?tN96U~jCSmbU(P@&6O7nSYrg z?*82UbIWD-14V0$KA*kjYsWP0>EkmsTT-398Q6ShM|I0Scsq@^tl??p;?#}C2R_+M zpXpx`o5L_oySU0}f+Fo#j&oaBNXUa|@LR!rZX>6OK5 zu{!)e%pj7^&{fQ#bB+(J0yp=L*(7iagJ92+nRIHfxUO4CM^PkS4Tn8?^7uJ~swDcUqQAw~f zbQyP;Mv6+^ejh8ojpadFzmrM-{9Sr)Y;LAMQwBz0!2GT)X7!Bj%8$!g3NJa}oX|E1z} zobN012dy1H_N4}Ywsdf*IsWkdv%Kx^uBQBBIJf;?&5KF_5y9}r%?Enzew(h6Z!i|T znC4nJ zsK28E+`#=p<}JAdljnVFm(lT}Y9kP6tNy=9s>vsBQoZ8oD@jlLJq%7iiFdJfRQuhq{z<$8kg@#4 z{(`cmo@FQZXS6Ly($r@?&*cAlRtHxk`?ZGY2ZaCqb-mUR`N=+c?cA?yJIpdJmTgu~ z%n8kxS!pHyvb0gPEoT1SsebO3J&d1k+v_ipn{$cLy_+3wHHLoF}Vlvd2l); z@Al=*W!f>js6lo?^|K(h-Rv*saUa;YsF~N{d(Xw)X^RDzFZfP&W#7gAV%c9;_FIfi z#ta7~8y?(YW)WY>yygOT;l!wuCdZGtay9%ifXJ}0rL%LKV_->V0IA){$#afRU=AZx zq*z#Dj;z8CGggJCfB)1?{nXgGbJF*#vtD!F5@EP{fPv+?nt_G2LjjwD1v6NaZ$d#? z!-HF2Obde#ycIfLzu^1%C0#ps=4ceg2dnnUMs7dx|Lly^EX#*6xBqSZ(K=t_9~Z|t zh$bGGF|!XmcmsACM8v%D;7zbMw!W-t*c7x*{l$~tKmWRL9Z|zaPka^M;>!_JPJHFIRZ(Z&-Zbyi#+p)dBtoKMjn77S9VT z_^4Pb{6nK~&#dn|-dR_;{`21#@i%)aTiga~=9-f=i?03uDrsSxa9698`A6Jm&d8(L z+&kh6uiCDlvu!Of12K5I`njxgN@xNA+9riz literal 0 HcmV?d00001 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 12c7035e3748682b882462e520094b3306192e54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1030 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf4nJ zsK0a&w)_H6tT zyRUuj()-IpPn`)j`h4wD`S!&??t0&AHq0r{I3HLQqjSqZhZxT1f5YnG2g-cYPO_49s+HW{Yw&CDX{3|+=x zQy|>%mnt7B()cW6e;X>TD~+5nQ=i$Nw_@#M=5J;zMH;3zcr$-{&oq~bVb5_N_npo^ zIW*2GZUDLtHKwkJ$b9ZLB&_rOKW$<+Mb6Mw<&;$UF2hA@4 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 db0234d7b9e35cae4e5e159ebd095d6679b87741..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 911 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSEX7WqAsj$Z!;#Vf4nJ zsJsMW#sHP)KY)UgC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NHH)l^LV;A zhE&XXdv|wMNT5jjM}4=W++{+_5&|x7_9QHx(Xc2Xiko>~6MsU|bfdZZ8tfb{-H7zi zGR>@Ez39ZF=6JDUrAs%bN5PCYw$C@IZ{8=b<576-%)Fcb*Q_}+$H!rkiYGFvzUSe) z-I&XVaqYf0vNcQ|<>i2b{<~m7g+o*80DaoM{t3&CXEQc*5{u>L+OsgXgLF zIlq7lDo@SN3S7~7zVt!ngUVp;z)7VEycMiAkMHNFtevs!Px+dyo9{80SLNQy`<5yb zeO=mp)%jGb*n~#A@9FhxPX}@;A9(Zadht&6=Oqlh+ae#tz4QFXA)(jbm~5&3gk{0j z%-~vS=6BEMB(O`^8C$YjGxN;%KG1oknfJg4$%Vyd-GrD8<{S&=FJY7LV-M!v!pxG+ z&}7VT&=SaC_t@_8e73^UX2~TRU+Yy!J_Z77aiK! zyVLon|1q7&ZprhZFZ-|h^X;-{BFcWC>+~*tWe9y5<8LtG{qyob~W^_YY>D`aiYr>fW%-hpfAc4@^JAf92PHJLdH2H_>bJ z81GBhIfPZ^GMZPvi(uAcdatE-XH{H&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 -- 2.45.2