From d0a7cb2b0358e979f02db3ac80b3d0d991cffa82 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 1 Jun 2016 22:15:38 +0200 Subject: [PATCH] add some icons and colors --- .../gallery/activities/MainActivity.java | 2 +- .../gallery/activities/PhotosActivity.java | 2 +- .../gallery/activities/ViewPagerActivity.java | 2 +- app/src/main/res/layout/activity_photo.xml | 2 +- app/src/main/res/menu/directories_menu.xml | 8 ++++---- app/src/main/res/menu/photos_menu.xml | 6 +++--- app/src/main/res/menu/viewpager_menu.xml | 12 ++++++------ app/src/main/res/mipmap-hdpi/delete.png | Bin 0 -> 161 bytes app/src/main/res/mipmap-hdpi/edit.png | Bin 0 -> 214 bytes app/src/main/res/mipmap-hdpi/share.png | Bin 0 -> 397 bytes app/src/main/res/mipmap-hdpi/undo.png | Bin 0 -> 274 bytes app/src/main/res/mipmap-mdpi/delete.png | Bin 0 -> 115 bytes app/src/main/res/mipmap-mdpi/edit.png | Bin 0 -> 165 bytes app/src/main/res/mipmap-mdpi/share.png | Bin 0 -> 268 bytes app/src/main/res/mipmap-mdpi/undo.png | Bin 0 -> 196 bytes app/src/main/res/mipmap-xhdpi/delete.png | Bin 0 -> 151 bytes app/src/main/res/mipmap-xhdpi/edit.png | Bin 0 -> 239 bytes app/src/main/res/mipmap-xhdpi/share.png | Bin 0 -> 496 bytes app/src/main/res/mipmap-xhdpi/undo.png | Bin 0 -> 339 bytes app/src/main/res/mipmap-xxhdpi/delete.png | Bin 0 -> 194 bytes app/src/main/res/mipmap-xxhdpi/edit.png | Bin 0 -> 302 bytes app/src/main/res/mipmap-xxhdpi/share.png | Bin 0 -> 698 bytes app/src/main/res/mipmap-xxhdpi/undo.png | Bin 0 -> 477 bytes app/src/main/res/mipmap-xxxhdpi/delete.png | Bin 0 -> 243 bytes app/src/main/res/mipmap-xxxhdpi/edit.png | Bin 0 -> 355 bytes app/src/main/res/mipmap-xxxhdpi/share.png | Bin 0 -> 938 bytes app/src/main/res/mipmap-xxxhdpi/undo.png | Bin 0 -> 606 bytes app/src/main/res/values/colors.xml | 6 +++--- app/src/main/res/values/strings.xml | 3 ++- 29 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 app/src/main/res/mipmap-hdpi/delete.png create mode 100644 app/src/main/res/mipmap-hdpi/edit.png create mode 100644 app/src/main/res/mipmap-hdpi/share.png create mode 100644 app/src/main/res/mipmap-hdpi/undo.png create mode 100644 app/src/main/res/mipmap-mdpi/delete.png create mode 100644 app/src/main/res/mipmap-mdpi/edit.png create mode 100644 app/src/main/res/mipmap-mdpi/share.png create mode 100644 app/src/main/res/mipmap-mdpi/undo.png create mode 100644 app/src/main/res/mipmap-xhdpi/delete.png create mode 100644 app/src/main/res/mipmap-xhdpi/edit.png create mode 100644 app/src/main/res/mipmap-xhdpi/share.png create mode 100644 app/src/main/res/mipmap-xhdpi/undo.png create mode 100644 app/src/main/res/mipmap-xxhdpi/delete.png create mode 100644 app/src/main/res/mipmap-xxhdpi/edit.png create mode 100644 app/src/main/res/mipmap-xxhdpi/share.png create mode 100644 app/src/main/res/mipmap-xxhdpi/undo.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/delete.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/edit.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/share.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/undo.png diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java index 5f1a09873..64ad0f210 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/gallery/activities/MainActivity.java @@ -332,7 +332,7 @@ public class MainActivity extends AppCompatActivity case R.id.cab_edit: editDirectory(); return true; - case R.id.cab_remove: + case R.id.cab_delete: prepareForDeleting(); mode.finish(); return true; diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/PhotosActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/PhotosActivity.java index bfcb64bd1..baf0aa952 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/activities/PhotosActivity.java +++ b/app/src/main/java/com/simplemobiletools/gallery/activities/PhotosActivity.java @@ -264,7 +264,7 @@ public class PhotosActivity extends AppCompatActivity @Override public boolean onActionItemClicked(ActionMode mode, MenuItem item) { switch (item.getItemId()) { - case R.id.cab_remove: + case R.id.cab_delete: prepareForDeleting(); mode.finish(); return true; diff --git a/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java index 4cc61d7ca..ae9c2bef2 100644 --- a/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java +++ b/app/src/main/java/com/simplemobiletools/gallery/activities/ViewPagerActivity.java @@ -102,7 +102,7 @@ public class ViewPagerActivity extends AppCompatActivity case R.id.menu_share: shareImage(); return true; - case R.id.menu_remove: + case R.id.menu_delete: notifyDeletion(); return true; case R.id.menu_edit: diff --git a/app/src/main/res/layout/activity_photo.xml b/app/src/main/res/layout/activity_photo.xml index cb2830950..884715a3f 100644 --- a/app/src/main/res/layout/activity_photo.xml +++ b/app/src/main/res/layout/activity_photo.xml @@ -18,7 +18,7 @@ android:layout_alignParentBottom="true" android:layout_alignParentRight="true" android:padding="@dimen/undo_padding" - android:src="@mipmap/ic_launcher" + android:src="@mipmap/undo" android:visibility="gone"/> diff --git a/app/src/main/res/menu/directories_menu.xml b/app/src/main/res/menu/directories_menu.xml index c976961b9..d5f64ce2e 100644 --- a/app/src/main/res/menu/directories_menu.xml +++ b/app/src/main/res/menu/directories_menu.xml @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/menu/photos_menu.xml b/app/src/main/res/menu/photos_menu.xml index ccf1ce9bf..6e774a7c3 100644 --- a/app/src/main/res/menu/photos_menu.xml +++ b/app/src/main/res/menu/photos_menu.xml @@ -2,8 +2,8 @@ diff --git a/app/src/main/res/menu/viewpager_menu.xml b/app/src/main/res/menu/viewpager_menu.xml index de5242bad..243dc202a 100644 --- a/app/src/main/res/menu/viewpager_menu.xml +++ b/app/src/main/res/menu/viewpager_menu.xml @@ -3,17 +3,17 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/app/src/main/res/mipmap-hdpi/delete.png b/app/src/main/res/mipmap-hdpi/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..4a9f769475ae98c44086a5498057c799cdc1eb2e GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8hNp{Th{y5d1PNA=hW|4Ewf~tb z9PIip^F(s-FKmRW+J}dc&f#K)gg?ihMxz_^iWbkzL Kb6Mw<&;$SheLUU( literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/edit.png b/app/src/main/res/mipmap-hdpi/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..d3ff58dccd3c40504d3f55a4be8e0b79e3bde9d2 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpTu&Fr5Rc<;uUK<67znUjnB%lT zoOSjO>jray$uJw$FFVMU;3(SEsNVV` zY0pZ=3oE8p__*1#52{6WCQLy}71A z^UjP{%xC@x1hXWnn6M?T5oq1$VC;1(TE5wU%_Uvsiq|WdbN}v4kacX7_2athUkr38 NgQu&X%Q~loCIIWZPKE#g literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/share.png b/app/src/main/res/mipmap-hdpi/share.png new file mode 100644 index 0000000000000000000000000000000000000000..b09a6926de5aa48dee59265aadac32da236f9e1c GIT binary patch literal 397 zcmV;80doF{P)>pxai;{B2*!N!D>LzNpR^R2)fik{R2|aH0bP5 z*MdarD7a}-Ez;H;8^R0acFB7?>Nyer70h^N-MY7?BcJR3C~UbFc^uKRQ`h0hp&@lM za=0&bFUnK#Sn5WUrS5~&57j8c2`}{x^lU0@xf-K$z+Gzw`kpzeuI-nfmQ2OyT(N5C zy>l@-b#t1gVw*GChQ69riBYL)DYQJYY2deq4n`STc6((!%2Aj4=wg&-PHHZ4XiD9R z9L`I1T#6jpc6)6i%2KtYuxQ?fferHxMOo@@yJIr8nefKYHw~583zvN|v}`i=!hTIX z1AQ+XH*Uda9ScrJS&n(GZ(vPNp{o|YP)4&L<^}8G*Fn!6XpzR}Y@(EyK0Tihl%XpP!XLjqhwZF}SQ1py zTugwTv#Usu@L$nUy9-I_jI_7CM{eR+v zgY~R6ULP4=Whfl~yJVLAs>BdxJ>K;jR@FB~H~;@Xea5N(zxh7d@H058PdfN2J>(P6 O6b4UMKbLh*2~7YiM=IO^ literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/edit.png b/app/src/main/res/mipmap-mdpi/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..12b09f1d9b28e275323add8a5f26a40709b3550e GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i98VX=5R22v2@+Kg_J9Ac|NpmV z;J?TA96oAc&PVGdUZ@}Y5}^>ueD%XLiQ|9%%Clen^me~?-P5>$?ao_51Xjx|Qk^y- zdBRlThZ6o?Q|jd-p2|(pELRqpvP6?TOTpK2Qrr9gcRRh0Ezy*ZVPIH1?c-DthJyV- Pdl@`k{an^LB{Ts5yXZdH literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/share.png b/app/src/main/res/mipmap-mdpi/share.png new file mode 100644 index 0000000000000000000000000000000000000000..e944fd70c428619696e7eb6fd8787959df32a774 GIT binary patch literal 268 zcmV+n0rUQeP)$QBEc|F(1{8;NsTa>qG@_iujyHwlsAj>Z++)3fC}yCvtVKF!sca`eyb>*4FKdrw*xulirCLeRN& z^QFUAPo7a=d*Zn${r%>-c`OmTn@=6Q2_V^9|xQ)mki()6{CLnr9^_ w5bLw-m>HX4WMdr<)1s$ItM2}Jv;PZ=BijL0ndfp*KxZ*{y85}Sb4q9e0MIo~B>(^b literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/delete.png b/app/src/main/res/mipmap-xhdpi/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..388b5b060af924493b057a63216fe7db75d4435a GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DI8PVHkch)?FC64-Fko=L=%?Iw zv$u;+&1tXu2b~*Nwk`N$?;xkbvPe<$)w&zy|9BUkVz|Zlf5mTGpk6SDXXMMa|9v2f u@g#fN+oPXnt4Z(ZaQ*pHX6dTRMUVWXo;a(XeY#{ZNU5i*pUXO@geCyi%r-Ls literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/edit.png b/app/src/main/res/mipmap-xhdpi/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..5a06bff5a2fc95d5117ce9880821384626d8864d GIT binary patch literal 239 zcmV+mP(MLbxIU@tZx11_<06E_Cm;EuJEI5KzuPNK$?!{-w< zW;{Mke9afh-**!m1^<@N@NHtL5K^$DhZ|FM=P=&qvIgiFq?I{~>Up@NR&` pI{_Y_4KVpkfXgQVHXn-(+!KC0r!M+UZ~XuO002ovPDHLkV1hXhU+Vw> literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/share.png b/app/src/main/res/mipmap-xhdpi/share.png new file mode 100644 index 0000000000000000000000000000000000000000..22a8783e70f01488cb1396f18645fef00c7bb299 GIT binary patch literal 496 zcmVF8i@ z;dr8?qTnEcf#YSTw1b150_0@p@+*a+28_exGc&aM`@C!DnA6=W1TD^dHLWnpGa); zm^Y+_9MMXOw6r9KVVSO%^j7PWo5BRDgS~&Qbd>xvN%`yeR`YD z)4BDW`aIihmI&-SWsJ<(rgS(atdBC2BU0ko1l(JHGNkqUyB%Gpj!n6!HqQ(vxYCmi;AOMb-;F8eJ8CL;#qq`0VG)Wkymp(?Q z(`28N?w+ZuK(Pmw81!Da#v->AOG(0jPuBdmb?aw^cW^y1rUS1uh=k2>hl?{}70`e8 zC>OYBD?m7LPu>@kI-nD?e2{mj0O7yn>!GXc$q3uOx zabB)cz0QC}ts}W53MuVBD%UsZPv&gw=#W`?Y0ciWQ2$4FyseJx>{`Oj#KIv^yWsd< zb^!&41_nkD7m4wnX|34#N6cTv0=_gxaj*E+Smb+hj$`D9r9sI`%Q@~%Ssl3i>7S{h gq0!eBm41aw^UfFNx4vv@4|EiRr>mdKI;Vst0RDqR&j0`b literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/edit.png b/app/src/main/res/mipmap-xxhdpi/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..02e19d04570c6f86c7885615cbc9a271a7a04873 GIT binary patch literal 302 zcmV+}0nz@6P)Nklp%{z$v^{5pMgUJ9P141uEYB)_=4RF_CjEcv6+Mn znIBAnGv0XNgxmvXi5r?~6rMQtq!!1P)XA|U^>VC8*ddh(X+J>9y^)Suv$GbGo?4@P z$3{eY=xvsabkJP%VN!{O?z@vFl@sq+=QG$(GU4=-%sAbo$vH)W(#MY3BegB1ZSKdK$X(b(iukxii#&) zXB+`2Dj&R^aRxxq;yb_>Cjp8^Kc>z&j4?L%KF;(Ssh;`jUH||907*qoM6N<$f)^cq A)Bpeg literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/share.png b/app/src/main/res/mipmap-xxhdpi/share.png new file mode 100644 index 0000000000000000000000000000000000000000..a35b3cd14af89804b7c3aab8f9b54cfe88771d19 GIT binary patch literal 698 zcmV;r0!96aP))E)Qv=1Dpnk1InpvI&qSnTPM&I{WK*8?NJ&ecW~5|Co@S)v zo;+)jihdt!$TJgZIOCp9j7RYtcTHy&qi7EMT1#hYjzy7Fyz4JnxBa7?nwO$TPFj`q zr?*r*?-yB%jzw_{yK2{dO_w|wdyK1E*V43R#&{IRA)lzr`oVKi2CrL}b=NCV1}DtR zdf-F7Q4|%E=4@)&v1!&s>@nzymi_)U?dd3vQ7f{R9MxmWmaIiDM3IbXXy<|7Wc}gI zD3(zTooV{g6HzP`D?0PNXQFr}b>fbfBMo!%)O?^fQn4w|-AGAGo@S(ETb^d5WJ8`i zk&;ORsJsW`0@zk4-OaZ6`@bTm>hqOLRBE*psAIi;?hzpcu;@0>~$&4^`LKYLci zIrnAV_F@#zgsOE-E$e2C#U2B`(z4&Ks^KV)cEMwO`8>gR#dEQ>t#buIhb5Q9LKD%GxreN1uxt9@X%L{wSIr@7a>|t0nC$dn$@& z&^LB;W=UV9V8l;4^I4?g4IA>+3`Qyrxu7A>*+|KZJl{o1ZpgC`DY-7se57PXp6N)* zlss=oN`^EXD3GFD?@r<9B$_L#^*SyGd&g+Jmb7Sxo&$S^B*)YMEYl&O*2x^UI}yvXEwskcI2a*TTj-XPl1no0^H|`&&J`&+2iOWm%SGS(at}!x7@3b0c$+x9+x;wpo2(B+Ch~TpGoc$kEya<2PKmZ(&Q`Y`$Cfg z0w|GGrbCv-v?+_A7-<*xiO60=gQ5iTNay%~-h0k!pkJf{b!OLX@(Kv9^NOT?(5J;6 zu5pDM+@(XGh@@V!TL2~WmKrD7HuWu>pvDG&s?VNTgPw7U94>J=j?-q$wBGn64b$Up`%kb!;z6yinR TJ@r{w00000NkvXXu0mjf?+@0e literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/delete.png b/app/src/main/res/mipmap-xxxhdpi/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..8d322aa9baba09c58b0058760fb7d53a392b63a1 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgc6quuhE&{od*w9mAp-%|!1oIz zUAkW?IxdlN5p^sPGLtM@^D{+9cy9DT>q|G5dQ4KuY+ck{{`y~aU3Uxr^X+awlIm)m zLim6tF)Yw+SYp*L31Z?03ltA1m;Rr_zhgPmvYG>yq8FYs_ibEqHvUn-r*1=DgDFx+ z?bd02*59bTR4g&(=Y(kztIpQ%Z4JJY^zZNE9?f4`+x0ysZP__5=_$iXi`hvQAj>>m L{an^LB{Ts5t^ZVx literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/edit.png b/app/src/main/res/mipmap-xxxhdpi/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..d6668a051cd53b2ef454e8e09872339348c2ee22 GIT binary patch literal 355 zcmV-p0i6DcP)o)4CwERtj4{R- zW9;vcYqq-8KB2^1t{_z z0h;{m09AfwfG$5PK$)Krpv|uhQ0Fto7-NhzVt3qk;nT+k=6L`B002ovPDHLkV1hVj BpML-V literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxxhdpi/share.png b/app/src/main/res/mipmap-xxxhdpi/share.png new file mode 100644 index 0000000000000000000000000000000000000000..e351c7beb089e9513ef5ddaa2ac3f1a6638474cf GIT binary patch literal 938 zcmV;b16BNqP)OV%)fi;J>`G%jw)8gjVE${JR2aaY!G0~hnM zhG|@UElYTe3EXtc3bxQs9yfX7vVdw{;WqBh$^xF`2P*M9I}|qJ3{e@6PKArjoMZ`q zzv59!fmanSI=PO&6?&+plSP6ovR7f^QNATeik(_R0|VqKmg6Jp6&~t1O&))jcuMQg zz!ARWI(NwM6X$u29SRTC9OM@M7CFo&S;iB5kG}$E*e=U>kWUFR#U6!^Dg|IO$GL;Q zdG;$z?BZ=E`Hcb|x0vJv&02@&xrVwOhY7LL@4M9>gD@+_--REpnJm3KuU?nF43nuCUR}5|x-@k1XJG+|9FJHqb%=H!GZ? zR#tEVHz}HB3FEjJmo=nuF(+%t;UXt%$l)REk1CR+@t5HZYGfZVddcE%mgiK277p?u!wk{S zAzEYsZHy7*0=xAuo@I(+(gP_7Qy#3UfhsyeG@4rdyKWO=UPVqS?5yQbF5O#T${|nBnhItC? zFF1=Flw0o3d1#irC%G&0*~$$kcvP3oNNI_llhiJ^LB?sGo!SpS+o>}aOfS=2Q0F8q zt~qJL6``gsS~ake<1QEYNahySGrW0t_K3dcEGA}@j%HgVpTR8~wAb;}TE2;#8R z`z-C6s&`RDbb`|jXTj9`8=|}uoGjcWOH->JF()+0IIr>HY<`l&{6P3?=pqOE<(4k< zdY?piYgh6WPm{KJuKhK1fu-4kGWngy>YRGtKIVGA@@{ri7@xs$TRx#_8~oa4KKw75 z>ByfjFL9gDw2fwY*BtgF?Unk_Gq;6pTkmg`l - #3F51B5 - #303F9F - #FF4081 + #ffff6f00 + #ffe46300 + @color/colorPrimary #ff222222 #66000000 #33000000 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 260873966..7d22a2e4e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,10 +2,11 @@ Simple Gallery Share via Not much to do in a gallery without accessing your photos - Remove + Delete Deleting Edit Undo + Share Rename file Rename folder Could not rename the file