From a76071ee5a73eb31709022b50bc3854637b89158 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 8 Apr 2017 17:58:22 +0200 Subject: [PATCH] renaming or removing some image resources --- app/src/main/AndroidManifest.xml | 2 +- .../draw/activities/MainActivity.java | 6 +----- .../{mipmap-hdpi => drawable-hdpi}/ic_clear.png | Bin .../save.png => drawable-hdpi/ic_save.png} | Bin .../undo_white.png => drawable-hdpi/ic_undo.png} | Bin .../{mipmap-mdpi => drawable-mdpi}/ic_clear.png | Bin .../save.png => drawable-mdpi/ic_save.png} | Bin .../undo_white.png => drawable-mdpi/ic_undo.png} | Bin .../ic_clear.png | Bin .../save.png => drawable-xhdpi/ic_save.png} | Bin .../ic_undo.png} | Bin .../ic_clear.png | Bin .../save.png => drawable-xxhdpi/ic_save.png} | Bin .../ic_undo.png} | Bin .../ic_clear.png | Bin .../save.png => drawable-xxxhdpi/ic_save.png} | Bin .../ic_undo.png} | Bin app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/menu/menu.xml | 6 +++--- .../{launcher.png => ic_launcher.png} | Bin app/src/main/res/mipmap-hdpi/share.png | Bin 397 -> 0 bytes app/src/main/res/mipmap-hdpi/undo_black.png | Bin 473 -> 0 bytes .../{launcher.png => ic_launcher.png} | Bin app/src/main/res/mipmap-mdpi/share.png | Bin 268 -> 0 bytes app/src/main/res/mipmap-mdpi/undo_black.png | Bin 333 -> 0 bytes .../{launcher.png => ic_launcher.png} | Bin app/src/main/res/mipmap-xhdpi/share.png | Bin 496 -> 0 bytes app/src/main/res/mipmap-xhdpi/undo_black.png | Bin 601 -> 0 bytes .../{launcher.png => ic_launcher.png} | Bin app/src/main/res/mipmap-xxhdpi/share.png | Bin 698 -> 0 bytes app/src/main/res/mipmap-xxhdpi/undo_black.png | Bin 862 -> 0 bytes .../{launcher.png => ic_launcher.png} | Bin app/src/main/res/mipmap-xxxhdpi/share.png | Bin 938 -> 0 bytes app/src/main/res/mipmap-xxxhdpi/undo_black.png | Bin 1125 -> 0 bytes 34 files changed, 6 insertions(+), 10 deletions(-) rename app/src/main/res/{mipmap-hdpi => drawable-hdpi}/ic_clear.png (100%) rename app/src/main/res/{mipmap-hdpi/save.png => drawable-hdpi/ic_save.png} (100%) rename app/src/main/res/{mipmap-hdpi/undo_white.png => drawable-hdpi/ic_undo.png} (100%) rename app/src/main/res/{mipmap-mdpi => drawable-mdpi}/ic_clear.png (100%) rename app/src/main/res/{mipmap-mdpi/save.png => drawable-mdpi/ic_save.png} (100%) rename app/src/main/res/{mipmap-mdpi/undo_white.png => drawable-mdpi/ic_undo.png} (100%) rename app/src/main/res/{mipmap-xhdpi => drawable-xhdpi}/ic_clear.png (100%) rename app/src/main/res/{mipmap-xhdpi/save.png => drawable-xhdpi/ic_save.png} (100%) rename app/src/main/res/{mipmap-xhdpi/undo_white.png => drawable-xhdpi/ic_undo.png} (100%) rename app/src/main/res/{mipmap-xxhdpi => drawable-xxhdpi}/ic_clear.png (100%) rename app/src/main/res/{mipmap-xxhdpi/save.png => drawable-xxhdpi/ic_save.png} (100%) rename app/src/main/res/{mipmap-xxhdpi/undo_white.png => drawable-xxhdpi/ic_undo.png} (100%) rename app/src/main/res/{mipmap-xxxhdpi => drawable-xxxhdpi}/ic_clear.png (100%) rename app/src/main/res/{mipmap-xxxhdpi/save.png => drawable-xxxhdpi/ic_save.png} (100%) rename app/src/main/res/{mipmap-xxxhdpi/undo_white.png => drawable-xxxhdpi/ic_undo.png} (100%) rename app/src/main/res/mipmap-hdpi/{launcher.png => ic_launcher.png} (100%) delete mode 100644 app/src/main/res/mipmap-hdpi/share.png delete mode 100644 app/src/main/res/mipmap-hdpi/undo_black.png rename app/src/main/res/mipmap-mdpi/{launcher.png => ic_launcher.png} (100%) delete mode 100644 app/src/main/res/mipmap-mdpi/share.png delete mode 100644 app/src/main/res/mipmap-mdpi/undo_black.png rename app/src/main/res/mipmap-xhdpi/{launcher.png => ic_launcher.png} (100%) delete mode 100644 app/src/main/res/mipmap-xhdpi/share.png delete mode 100644 app/src/main/res/mipmap-xhdpi/undo_black.png rename app/src/main/res/mipmap-xxhdpi/{launcher.png => ic_launcher.png} (100%) delete mode 100644 app/src/main/res/mipmap-xxhdpi/share.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/undo_black.png rename app/src/main/res/mipmap-xxxhdpi/{launcher.png => ic_launcher.png} (100%) delete mode 100644 app/src/main/res/mipmap-xxxhdpi/share.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/undo_black.png diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 01b73c1..b2059fc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/java/com/simplemobiletools/draw/activities/MainActivity.java b/app/src/main/java/com/simplemobiletools/draw/activities/MainActivity.java index a7c3fab..3fea094 100644 --- a/app/src/main/java/com/simplemobiletools/draw/activities/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/draw/activities/MainActivity.java @@ -329,11 +329,7 @@ public class MainActivity extends SimpleActivity implements MyCanvas.PathsChange } private void setBackgroundColor(int pickedColor) { - if (Utils.shouldUseWhite(pickedColor)) { - ((ImageView) mUndoBtn).setImageResource(R.mipmap.undo_white); - } else { - ((ImageView) mUndoBtn).setImageResource(R.mipmap.undo_black); - } + ((ImageView) mUndoBtn).setImageResource(R.drawable.ic_undo); mMyCanvas.setBackgroundColor(pickedColor); } diff --git a/app/src/main/res/mipmap-hdpi/ic_clear.png b/app/src/main/res/drawable-hdpi/ic_clear.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/ic_clear.png rename to app/src/main/res/drawable-hdpi/ic_clear.png diff --git a/app/src/main/res/mipmap-hdpi/save.png b/app/src/main/res/drawable-hdpi/ic_save.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/save.png rename to app/src/main/res/drawable-hdpi/ic_save.png diff --git a/app/src/main/res/mipmap-hdpi/undo_white.png b/app/src/main/res/drawable-hdpi/ic_undo.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/undo_white.png rename to app/src/main/res/drawable-hdpi/ic_undo.png diff --git a/app/src/main/res/mipmap-mdpi/ic_clear.png b/app/src/main/res/drawable-mdpi/ic_clear.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/ic_clear.png rename to app/src/main/res/drawable-mdpi/ic_clear.png diff --git a/app/src/main/res/mipmap-mdpi/save.png b/app/src/main/res/drawable-mdpi/ic_save.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/save.png rename to app/src/main/res/drawable-mdpi/ic_save.png diff --git a/app/src/main/res/mipmap-mdpi/undo_white.png b/app/src/main/res/drawable-mdpi/ic_undo.png similarity index 100% rename from app/src/main/res/mipmap-mdpi/undo_white.png rename to app/src/main/res/drawable-mdpi/ic_undo.png diff --git a/app/src/main/res/mipmap-xhdpi/ic_clear.png b/app/src/main/res/drawable-xhdpi/ic_clear.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/ic_clear.png rename to app/src/main/res/drawable-xhdpi/ic_clear.png diff --git a/app/src/main/res/mipmap-xhdpi/save.png b/app/src/main/res/drawable-xhdpi/ic_save.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/save.png rename to app/src/main/res/drawable-xhdpi/ic_save.png diff --git a/app/src/main/res/mipmap-xhdpi/undo_white.png b/app/src/main/res/drawable-xhdpi/ic_undo.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/undo_white.png rename to app/src/main/res/drawable-xhdpi/ic_undo.png diff --git a/app/src/main/res/mipmap-xxhdpi/ic_clear.png b/app/src/main/res/drawable-xxhdpi/ic_clear.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_clear.png rename to app/src/main/res/drawable-xxhdpi/ic_clear.png diff --git a/app/src/main/res/mipmap-xxhdpi/save.png b/app/src/main/res/drawable-xxhdpi/ic_save.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/save.png rename to app/src/main/res/drawable-xxhdpi/ic_save.png diff --git a/app/src/main/res/mipmap-xxhdpi/undo_white.png b/app/src/main/res/drawable-xxhdpi/ic_undo.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/undo_white.png rename to app/src/main/res/drawable-xxhdpi/ic_undo.png diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_clear.png b/app/src/main/res/drawable-xxxhdpi/ic_clear.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/ic_clear.png rename to app/src/main/res/drawable-xxxhdpi/ic_clear.png diff --git a/app/src/main/res/mipmap-xxxhdpi/save.png b/app/src/main/res/drawable-xxxhdpi/ic_save.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/save.png rename to app/src/main/res/drawable-xxxhdpi/ic_save.png diff --git a/app/src/main/res/mipmap-xxxhdpi/undo_white.png b/app/src/main/res/drawable-xxxhdpi/ic_undo.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/undo_white.png rename to app/src/main/res/drawable-xxxhdpi/ic_undo.png diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5ee3c59..a14fcaa 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -23,7 +23,7 @@ android:layout_alignParentRight="true" android:layout_below="@id/color_picker" android:padding="@dimen/medium_margin" - android:src="@mipmap/undo_black" + android:src="@drawable/ic_undo" android:visibility="gone"/> >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|UmM|r-#`5r!{)_G zNNy}rz-1m#qs=>d{AR!}y6myS8}4&~068}zDNC6K-*J)q#sXzd>Y!-SIqLkxjl3V! zIje*Gq#`X`j16c~)Ied(3Zc*PSQ@r>8B=n(y{U1vrBMeG9=u5p5JS*}vyJr4gm6ebN?<~k{&OL2uJ1MlRn3ryQ zdt3wQq@_c5zH&(e>7>&C=ex{ugEVL$opg*HYLo~_RF-8~mStI%Wm(o=if92|$QBEc|F(1{8;NsTa>qG@_iujyHwlsAj>Z++)DI!b;S=_7qemcr< zIz3%{PI3~kS=$Y2j0F{`>f8QO;senfGalr;t fbP#1(mStIA!!=e4*%@oA00000NkvXXu0mjfyM2`) diff --git a/app/src/main/res/mipmap-xhdpi/launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/launcher.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xhdpi/share.png b/app/src/main/res/mipmap-xhdpi/share.png deleted file mode 100644 index 22a8783e70f01488cb1396f18645fef00c7bb299..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 496 zcmVF8i@ z;dr8?qTnEcf#YSTw1b150_0@p@+*a+28_exGc&aM`@C!DnA6=W1TD^dHLWnpGa); zm^Y+_9MMXOw6rs_bo#mcw{1a9fNu$EQbktO@6)eSG1Bd$7K&U22O zUD$2GA-FbSQSQV^pLba8QCoiYw+Qq1(*KP7_UAqnF)S7F(p)+v2twRla&~i>dcxwoKO=D(>nok0rH6Pf_Y}^3oO9GL+D!4hLU7H|pf!g?n4i=zzT}KN z7pQh{+Kv{Z<}VctmxR9=owK=i=-Cec^}-7{7oITIIrVCah82U9z%~QNCfAs`hDCf0 z42p+Y>yr3Z7tZUeXfQ}rPd!t({)Qa8fZCj8ZIRB8bCM2>%PgLcZ+{tTTm#{Ky z;SmA#8~*c3QzCr%EBOk#R@*!^o|dJ$D~Wm5d)w(Zoi~>iPuw1HdGC_yrwpI(B+7fQ zoF2F;;_%d$$K($%EzU`@Ox<~n)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`^EXade@_mb8_ zTbG#dbczKj-eBIWsWoMZSfW^-lgEh_uC5WW9`BwW+IxLBhqqRcPG+Ls7LMC4TRFwU z>=f=Eox(r)^343(Dl>}H`qK9ufBE?zf82BS=g0LOU4FiKCKCQKrQv#yuu6;L3dmWdLx7EKS!ieUXE?A{Ti@m%PzL`N@An}xgPs>!bE zw@#HFo8X$$W9Idx@s04$j3>O00`xN#q9sqT1uAZz;V6?g?SABPmXzidGyHf|99w@* zSE^N5?eh93KeK0npw)@XY)0x)=Ukr&EM1nV=q!4oWkuWfj-thHf|-mIPd(IoG|4Jr zC6h?&idmjVTx%1it6gwX;?M2i&Q^})%wW72#U?oYntvbD1*Szt#{|XAPl?$oJT%*E zR)4zrkEbx>shbV+Q_if4)H=08QQ>;66y#8Bm?D|ut?bOu|O2@=_b#sMwALpIFNek6a$ z!)I=pb^!nE!X(x|t%8@+tsdDe*dFrmiI=2>l$^WPeQk+$J``E>Nmm=dVZE3&xl87pYIv+xRld;g?I~9tR)mmF!FW zryOTVx+G#}t5Cbh>zUx>bs0=Ag-w;zT2EYNxupK8_z{n%kl@qV`%>6HW&&ldDyx}h z1L>t7WIAuD#Q6esz3uR1j0MtuDp_}T0Zo=R^trbx{54QfsbXOECDu#oTHRH3zizDN zUE*)j@aKw6zlEEbq2HuQE5v>-T>mAYef|zLPtPewO_~HADY}15OrEsF<*m&F1MMG6 mzwNcP5CA9mPxZMhp~!&o=@Zt4CNV{cAZbrmKbLh*2~7Y;hik3? diff --git a/app/src/main/res/mipmap-xxxhdpi/launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/launcher.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxxhdpi/share.png b/app/src/main/res/mipmap-xxxhdpi/share.png deleted file mode 100644 index e351c7beb089e9513ef5ddaa2ac3f1a6638474cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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#3-UbE%*M;4A zpVNERONTrFD!~8^@>P8+x3O-~U69L|%bgMJaGU9t*oEa>ab@qmZ#`wy_xQ)}JEtp) zw#sWZi_@uT;!S<=*=yuQd?zoEcar$(p!KRzgymtD zq2sL7%p<45jtKdu&YgC#NZZ^t@BTdZko(2!e$RPbU0!?d|ABXVEzG5Nue*BToNmrj z%Wpo+Fe?VE2$n;BRH}iZ}ZraD$Ch@>c z>Miq>X$p&`%CY?vEez?~{_<(jZ-zqQ7!UFFAGw8s?|)>P8xqOZ(Y>H6kIk}q%7RF? zoxNK^8NRc;u9%v+Mt|PG3L4=o@SF%8d*U<}H}Ge5RYt3lZxbCm0%> zn?&C{)Oi$WY~w$fk%67%bVaAlqr}R%w4JI9wvML$hTRo+GUb+^;%jJANKzK=X!P4K zZwe;^t7F^Yj)iv1&K5JU9{g$JDQ9@il5NEoF$c#B$F6r=bURtWu|Q$P1Hn%n56@lj zZw+VQYGUJ4y76A1_a1`=ht&^BPY?Tz*SLY^$QOGwS)IO{$`&A?^F&mo@vY)p`-Tn1 z+syxe=h@gTmzS!mtFv^Li6Hlih4a$F3PtaJ`K z>r$ojKQTYrqM!L^Kf{^g8SN3iE``yq^2&3ZWu~UOeqywHSU2raQR$j=`_FxKYNu4h z6DGxO5x739V#;H`eW$c1a~Pb9)lqu4bVnoqM5W)oKARYhy--?IvU^r}mtFRiIU)^@ z@A$dA+}066e7-gy4++0s>l(DImYR7 zQ*1j!qr-2_AI)jg85$S(*0!e1k8W_duyCJ6#as}hb%m8zE0D24IB@GpT?d5~2@-)O zj$1(@E%}13w_}-En#!&k{?^O_u^3%0nq3E)GimXv!_k=_R_Ir$TTkQ^1aiXvKGZDY z72wcQSY9!0_FbT2YY~5=7eFbO9<4m7>$}-GSY*4NR~Ya$IDBY)bl>qPg8+w>sQ<=e zwhjs&hHZb2|9Zs0!6H4O{w>E|6K5HQ#so&;{}nU0wyQC8a4QJdeBS=uivJ_SX-0*( z28RhhPjCOH@O|T&DeRk>4r(+R9RGdC+4-fvJA0F^OoH)Ok&X7Zo0A!VnZ3dB-?hUx fg7;$Ndx$^-15gTe~DWM4fnw#1P