From 2e902a110998e018a88cf2d0a256974b63efba9d Mon Sep 17 00:00:00 2001 From: Mygod Date: Sat, 24 Dec 2016 13:53:46 +0800 Subject: [PATCH] Refine drawer icons --- .../drawable-anydpi-v21/ic_action_settings.xml | 9 --------- .../res/drawable-hdpi/ic_action_settings.png | Bin 460 -> 0 bytes .../res/drawable-mdpi/ic_action_settings.png | Bin 326 -> 0 bytes .../res/drawable-xhdpi/ic_action_settings.png | Bin 562 -> 0 bytes .../res/drawable-xxhdpi/ic_action_settings.png | Bin 843 -> 0 bytes .../res/drawable-xxxhdpi/ic_action_settings.png | Bin 1074 -> 0 bytes ...{ic_copyright.xml => ic_action_copyright.xml} | 0 .../{ic_folder.xml => ic_action_description.xml} | 2 +- .../{ic_settings.xml => ic_action_settings.xml} | 0 .../com/github/shadowsocks/MainActivity.scala | 6 +++--- 10 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 src/main/res/drawable-anydpi-v21/ic_action_settings.xml delete mode 100644 src/main/res/drawable-hdpi/ic_action_settings.png delete mode 100644 src/main/res/drawable-mdpi/ic_action_settings.png delete mode 100644 src/main/res/drawable-xhdpi/ic_action_settings.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_action_settings.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_action_settings.png rename src/main/res/drawable/{ic_copyright.xml => ic_action_copyright.xml} (100%) rename src/main/res/drawable/{ic_folder.xml => ic_action_description.xml} (58%) rename src/main/res/drawable/{ic_settings.xml => ic_action_settings.xml} (100%) diff --git a/src/main/res/drawable-anydpi-v21/ic_action_settings.xml b/src/main/res/drawable-anydpi-v21/ic_action_settings.xml deleted file mode 100644 index ce997a72..00000000 --- a/src/main/res/drawable-anydpi-v21/ic_action_settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/src/main/res/drawable-hdpi/ic_action_settings.png b/src/main/res/drawable-hdpi/ic_action_settings.png deleted file mode 100644 index 97ded33b5558a0efbd7812296a52325b4170076e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 460 zcmV;-0W=4>kIV21T<&3Kg>clSSXlU}7 zNsTbZb7CDT8exhj%*e(#KY#)6xy}u?uzckjH(4PAzEPEh1-w0q?BPAtVVvU+$MuUd zim^-?Z*&k19JY)eT?W{4>I$)hC8bSG`$%Zf$FisplYAzY(o}#3ePW-OP>dHiLTyE8 z5z6Vv#(lhunj$1*cz0EVJ9s@A*ucB3BFy1+WndHUmWuEIZ$P35H8Q+=vQXg_LqaV@ zm?z|TsTk9IA=am%09Qzftuv(%OIZ4}NVJa{^Q2f76=H@QTgC>PWY~7OsDpS*8Lt)N zEWbIfpG@m8p5YBC;_%wCP~|(2vdmRx>0#;8WR`dQ1-2NIjXDoGtr048h%M+pCV0dp z9SxU>omUy0Vn}G0s>)%9(6-8A4Tr6%Lb0000>O6 zS70QgNAU8v+(?*#6#o9*V@~mgC;x#Rf^DRK!rxsIH1Y+{1W$v50*~CV#54`Q2vW|N zVwqbWh7Wvdgwql&RGT?0V4Y7)9ZgCcW4f$baDbN(6Vt-m zvtW!jvUC`+K-kE98fAa!hlpy;7r2s24Mgk2IZK^^iBh`hXFsLp$Hi^-XdC|o$nN|w}JYolv9aiaA3)AHJ#jL^+Vnw!iASI;~WiKXmD0RMEHO!?-j&6;kHOKLX;?@ zWGE7DPJUcs54$WqYC|tM?Dm*a5EB$J%My_f5ptOQ;JnO8utv}pJu;w=5<;?v>&>8 zhF?Y&EaUf-F4>V}ouDGUG9XTwpfwUQW0DePIU@2QLIJZP6AEI68g@DQ)P^_(>}pKO zkE?_$vBVfLVvMs)nQ&JW#5%6Ll?i8P;6j~onehS_p38;=e>tq*49Si(?RM$JF6|Z- zhLe1y=@Yj&%{<$LDKkeuxA{!dCfy3hWwyzZQVXYeKoyfe+#{|QF7lc(Gdc+Jm}KP& zE12AuD=c7gL#~j*pF diff --git a/src/main/res/drawable-xxhdpi/ic_action_settings.png b/src/main/res/drawable-xxhdpi/ic_action_settings.png deleted file mode 100644 index eabb0a2ba41bbe0e109263ee9b0d6ada40a6e792..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 843 zcmV-R1GM~!P)RPWZAHfP!)RVB2S(!`lt|Um(uYf2_cGfFjG~?QJ_SKM>Hu7Qz_%` zC^KY0j^p?%F-hrI#t?oEkx>e=^x$WZC9-20$8bAJMiyi_f!j|s$&C!#uq!e{4&*3d z*U4D<;$4cQ>yQUJNq3uf6oz@6$E?Ckd0-Y5%+4`a;aG`TuRL)UvsTrDjhJ=G6Wy3? zP%Zcjv%EY}z-*IhK|5x7d7^;XCe?zCn03h$-I#4qEm(P<#_c#+Sul>1xE*7f>{!k} z_~{|56pZ6*{0y;7>1g5}{!WmS0WF-w-(4mv4bw>oQKFMsszM7}DHGx$QauHt_cw57G zmNrf?VwFPCz(EGt%|eYrmJb-fVG|Z VF?y~eTbBR;002ovPDHLkV1i=jh>-vQ diff --git a/src/main/res/drawable-xxxhdpi/ic_action_settings.png b/src/main/res/drawable-xxxhdpi/ic_action_settings.png deleted file mode 100644 index 507c5edd44bfb5efe41327d5cef511a108d35f13..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1074 zcmV-21kL-2P)+t)}?IPi4`?n-BcG{I5ur- z(S>O`4876<#~6}k=`>Up4hWM~CUltm-)|Ri1Ni>m=Xw7B>2vXZK2lazR#sM4OxVB` zGWm@sMM^ z-;l({UGfbz*r=0l*o=*rbn~#1)BM5?7AY+r;d^YHV6D>PUbfT6IjR&Lx6#YE6o*+) zuBKoO-MHxHK}|s}>p4WgxIShmD&AzWe%_@-6DZ+pqS#BZCQ!mV^fOt5qM?`(rW@k` zYsq0Fe-hOnJV_2~IlvgxjZ&g0_?+}E6PL@R*DQCeAjPd$B{wAK#0SSo$OW75#b()K zHUs$LSLVnT+wsWmw*M;;$z=L|Dth}oRO&PU|Q78@DG)EG-;f#n348sTZV zVF~9kvs0GXg_$1ilRM_pLS`uz%MxXz$ZS8iD;g5KO+dIKazGp50^T5@IM7A7EpotC z!W~mwxJ0;WIiQwsy^0H?ge#H*l7zdexR6PK98gHOKye|H0y&_NaDn2&2;t_-0ZGDL zRb044xEeWN72z%_E_4yDUJlqsxMPX~IW&?Y+)+88op1pSBoqyIaEQ!Ol*$riq{ys= zxpK!+dNI=^OYFwX1(wJSoA?`3V^qijl?0d?Wut77&!^Zq%PbjU4n5fUgnXH!m=5f< zk}m_~a~ON=BxQz5hH%r$Y-PY44&!E!3Yp*}?#{7XA*iGWcbzi9S)vHoMVW4ZGIkRX z#g8(<%S4r;jjhy@q>w_AtYRDOq=;&>OpwD#d~}?I%ut7qs$`Bm_@-GlSja#4WRw!w z;XQoPAY06$A7At_L-u$UUpyrjB^DU#RVFRX2UE@R5j!x|C?D|xrk<0JScR#T@)5nxBvhE diff --git a/src/main/res/drawable/ic_copyright.xml b/src/main/res/drawable/ic_action_copyright.xml similarity index 100% rename from src/main/res/drawable/ic_copyright.xml rename to src/main/res/drawable/ic_action_copyright.xml diff --git a/src/main/res/drawable/ic_folder.xml b/src/main/res/drawable/ic_action_description.xml similarity index 58% rename from src/main/res/drawable/ic_folder.xml rename to src/main/res/drawable/ic_action_description.xml index d7c6145c..38c33351 100644 --- a/src/main/res/drawable/ic_folder.xml +++ b/src/main/res/drawable/ic_action_description.xml @@ -5,5 +5,5 @@ android:viewportHeight="24.0"> + android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/> diff --git a/src/main/res/drawable/ic_settings.xml b/src/main/res/drawable/ic_action_settings.xml similarity index 100% rename from src/main/res/drawable/ic_settings.xml rename to src/main/res/drawable/ic_action_settings.xml diff --git a/src/main/scala/com/github/shadowsocks/MainActivity.scala b/src/main/scala/com/github/shadowsocks/MainActivity.scala index 7e719987..00e2c371 100644 --- a/src/main/scala/com/github/shadowsocks/MainActivity.scala +++ b/src/main/scala/com/github/shadowsocks/MainActivity.scala @@ -215,17 +215,17 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe new PrimaryDrawerItem() .withIdentifier(DRAWER_PROFILES) .withName(R.string.profiles) - .withIcon(getResources.getDrawable(R.drawable.ic_folder)) + .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_action_description)) ) .addStickyDrawerItems( new SecondaryDrawerItem() .withIdentifier(DRAWER_GLOBAL_SETTINGS) .withName(R.string.settings) - .withIcon(getResources.getDrawable(R.drawable.ic_settings)), + .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_action_settings)), new SecondaryDrawerItem() .withIdentifier(DRAWER_ABOUT) .withName(R.string.about) - .withIcon(getResources.getDrawable(R.drawable.ic_copyright)) + .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_action_copyright)) .withSelectable(false) ) .withOnDrawerItemClickListener(this)