From 333ff40621f372fde653d53cab8d86d0a5d5a864 Mon Sep 17 00:00:00 2001 From: Mygod Date: Fri, 1 Jul 2016 12:42:26 +0800 Subject: [PATCH] Fix #737 by using support vector drawables --- build.sbt | 8 ++++---- project/plugins.sbt | 2 ++ .../ic_action_settings.xml | 0 .../ic_navigation_close.xml | 0 src/main/res/drawable-hdpi/ic_action_settings.png | Bin 0 -> 610 bytes .../res/drawable-hdpi/ic_navigation_close.png | Bin 0 -> 251 bytes src/main/res/drawable-mdpi/ic_action_settings.png | Bin 0 -> 480 bytes .../res/drawable-mdpi/ic_navigation_close.png | Bin 0 -> 226 bytes .../res/drawable-xhdpi/ic_action_settings.png | Bin 0 -> 719 bytes .../res/drawable-xhdpi/ic_navigation_close.png | Bin 0 -> 301 bytes .../res/drawable-xxhdpi/ic_action_settings.png | Bin 0 -> 950 bytes .../res/drawable-xxhdpi/ic_navigation_close.png | Bin 0 -> 373 bytes src/main/res/layout/layout_main.xml | 2 +- src/main/res/layout/layout_profiles.xml | 4 ---- src/main/res/layout/layout_profiles_item.xml | 3 ++- .../shadowsocks/ProfileManagerActivity.scala | 7 ++++++- .../shadowsocks/ShadowsocksApplication.scala | 2 ++ 17 files changed, 17 insertions(+), 11 deletions(-) rename src/main/res/{drawable => drawable-anydpi-v21}/ic_action_settings.xml (100%) rename src/main/res/{drawable => drawable-anydpi-v21}/ic_navigation_close.xml (100%) create mode 100644 src/main/res/drawable-hdpi/ic_action_settings.png create mode 100644 src/main/res/drawable-hdpi/ic_navigation_close.png create mode 100644 src/main/res/drawable-mdpi/ic_action_settings.png create mode 100644 src/main/res/drawable-mdpi/ic_navigation_close.png create mode 100644 src/main/res/drawable-xhdpi/ic_action_settings.png create mode 100644 src/main/res/drawable-xhdpi/ic_navigation_close.png create mode 100644 src/main/res/drawable-xxhdpi/ic_action_settings.png create mode 100644 src/main/res/drawable-xxhdpi/ic_navigation_close.png diff --git a/build.sbt b/build.sbt index 1cceb2e5..eaa0bbc3 100644 --- a/build.sbt +++ b/build.sbt @@ -26,19 +26,19 @@ resolvers += Resolver.jcenterRepo resolvers += "JRAF" at "http://JRAF.org/static/maven/2" +useSupportVectors + libraryDependencies ++= Seq( "dnsjava" % "dnsjava" % "2.1.7", "com.github.kevinsawicki" % "http-request" % "6.0", "eu.chainfire" % "libsuperuser" % "1.0.0.201602271131", "net.glxn.qrgen" % "android" % "2.0", - "com.google.android.gms" % "play-services-base" % "9.0.2", - "com.google.android.gms" % "play-services-ads" % "9.0.2", - "com.google.android.gms" % "play-services-analytics" % "9.0.2", + "com.google.android.gms" % "play-services-ads" % "9.2.0", + "com.google.android.gms" % "play-services-analytics" % "9.2.0", "com.android.support" % "design" % "24.0.0", "com.android.support" % "gridlayout-v7" % "24.0.0", "com.android.support" % "cardview-v7" % "24.0.0", "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01", - "com.j256.ormlite" % "ormlite-core" % "4.48", "com.j256.ormlite" % "ormlite-android" % "4.48", "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2", "com.github.clans" % "fab" % "1.6.4", diff --git a/project/plugins.sbt b/project/plugins.sbt index cbd39814..b214e4ef 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,5 @@ addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.5") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10") + +addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2") diff --git a/src/main/res/drawable/ic_action_settings.xml b/src/main/res/drawable-anydpi-v21/ic_action_settings.xml similarity index 100% rename from src/main/res/drawable/ic_action_settings.xml rename to src/main/res/drawable-anydpi-v21/ic_action_settings.xml diff --git a/src/main/res/drawable/ic_navigation_close.xml b/src/main/res/drawable-anydpi-v21/ic_navigation_close.xml similarity index 100% rename from src/main/res/drawable/ic_navigation_close.xml rename to src/main/res/drawable-anydpi-v21/ic_navigation_close.xml diff --git a/src/main/res/drawable-hdpi/ic_action_settings.png b/src/main/res/drawable-hdpi/ic_action_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..a78cfe5f32b86b8c4f00b9329a1949ee2944061a GIT binary patch literal 610 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZRs{HjxB}__LjfpXx6K8*)uJTG zFPNeIfA;Is0`E;k99Z)GIh=W}KdzV2*uT1a_wVnYZ%;2bxGym|{J8h#;%b#(h4|>_ z=a)Ap&$n=2Tzz$gCIbVbp{I*uh{frnQ*MSGG7xCX)G6tl=4I}?)}e5v1FPegzxRD+ zpGkQ*;f|5H?a$ApMn9KdzW8F+LqR!nzZ2pYZXEStab^-1VRBjIy*tpS{kX1E`C+Y@ z%dDK=pVT?sJ?X@XPmd0&_gft?-Y_fU;}WAoiHsXvCVRY?8Ijy~rs?IT{U(07jI*?R zQ-A({soh(}xT4l|DPQX+wVCBFnU02Ahd3n2?_!_(g6-(nC8CpW}Y?A zeE-8kw;HMfx7+B6t~=u9`5>gwE_dH0H22M7J=t^R{_-7xyB{C*KYGq>^^5jBSDf4Y)2q+u z^Pc5gc+Id}u&)1{VSDEd>xJ=*vg>|b|HXX!yWr73&vmPS5y0T->gTe~DWM4fp7U&x literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-hdpi/ic_navigation_close.png b/src/main/res/drawable-hdpi/ic_navigation_close.png new file mode 100644 index 0000000000000000000000000000000000000000..4102501f50b9a7df4c0f29930da60c43fbea7da8 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`Z6a#!hT!Hj|yx_dz>z_bH+$BMN z!3+lZ|NDOjd$X+eKjins7bslk>Eak-ar*6*le`Ry9IOGNGSmNY&$}8Zu#nMmmiR>f zMa8@SeR|ed%*bSWprT+h!wRQ{6Yo#8t~$-&_jbi3-cW7hRa;+r8T-C`7TlJ})%*0$ z-imLF46l5CwrF+vx;3lJb}y^4%Qj8h5oD4c89MFZ;y*RQpWd|AP0iPMdw$_{PR)A8W_ky%NUA?up{{H_zhM9TY((dK6mKUF! z*2rl3_IuQe0B=?Ui3rVxlMSYwImctG>kc?bq5(X@4lk%!aLZOGH;SSU(GgsVTt21qx~@lOJjnVHpv_8 zf5>Aez4ghaeZ>e{==a>8`~-|4@L3b&-3xPMvunjKF_*Y^z) j9wGgTe~DWM4fX{#RN literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-mdpi/ic_navigation_close.png b/src/main/res/drawable-mdpi/ic_navigation_close.png new file mode 100644 index 0000000000000000000000000000000000000000..4fc929330b19c6e74c743aa34717d28bc6cc40e1 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAsR#IkxB}__M1Xa+UY0p60x2xjv*T7k6v`-JD|Y9;;>+k>H!*o?$cD(L< z<8sHP;W7K=ul-X_I;`BzQF!*7o3Ny%a7E!xj|ufcPrVP-yt|$keNK16SG}r&5=&@noB~&UWL2pZ>LsHo8owTRVA@fEF=$y85}Sb4q9e0Ph28HUIzs literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/ic_action_settings.png b/src/main/res/drawable-xhdpi/ic_action_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..cee3e46497d02cd0b9f545964cb09fe468326786 GIT binary patch literal 719 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sTLOGST!Hlep$1-P?^6W2+omMQ zFPNeKf3XUSyGFKm{^rRRIvnpG$IoAV`}lQ%%ZIB!|Nb5=vA9`bdAp6X!Fm~y=REtn z@2BrJ@!vkZ{&jHp=>vaXCNeNE_IbKEhIkymJN0cqE+t;#}U+8@s_xSF%T#J^#^Pfuo|9bQJK(v&+K-@ut+I^dU zE>2QYKc3cLsCl*J@!-%y2%J_w2wV-Zgu!^!<8MwKlM` zal@9b&fcRvTlgC#-f-;8vQ9ErlH>O8^}HMVG2_DYs~dKn@Ci4l{Swe)aI{3Stt z!3-?(ZGyX3|Ns2EKYu^Z;hlHlN`X=fJY5_^JdVG;bX&+lL8SHJgl!`4|L^E=UL2LR z^XNX4|K=;!Ua`MFd)eCy$#?I6bz@W5GF6aSnd!)_?g!--j7hK8hON=~<`DABC*-$_ zK&{G(e@Z9pICj~y-j{#mSkJZZ{(tejq?ON)*4gc`ICpuY(j0qDz3;A_FX}iazHtss z`5i2naKDS`UAkw*4*S^|iZjx7uf!B{$^Sl?Ct`jUVd;ad{ z)dt^9)_*>1aryZ2XovWAh4M4|?#DAQFeQ4rIEF+VemnhU*&+vlwu93e7Cc~^H6t*f zuyawHj@x9PXMg8s9eZj~Qo7Zobmrv$eTVDqX1$8qW%}0rzE4$WYRIx?o?|cDc#JA1 zxUz*-Oz>s1v{~Wx^oqm;KbD;WPXrxHIkE&CRXMV>)Du>}WuM;eC*G9zUN3C@)!oyZ z>;4*Br#+Sk-hN2nD|>r+;_}*xg48(~6-E7j6r_wh*WAdSTPtd7u6C}))AUU5%;y`L zX88n8ILnp2Y)Tzh(X$iR!Z{VLi8-daU1ENsqh=Cd&azVyk>pv z@kxUho(`fP(luYby8bVE-iNytZ2PZOIQl%E5&cy=DKfuxPo1!jwZMs$JCA>MQS%g*w@lBS*}p^4>PN@^J*R)2VBdbaF+-xjIaTj{&itDkiEVGD+pYT&W&b!j zsV(%_hm{I3A!V$^E+b2aluQX}QQD&I3XKk_)(wWOVGx$Wn_PyKHFi7s#sx@95dX4zgG+Q}-u zUUN?LlI#0|9hh~tmLIjO-r}~c)$*ly+?KtI6r6+pb{BtLesY`IU;pA)edo7YbEVd% z6t9{0OVRX;Rn@tdWqt8~igOAsZCuuRwytRA(~D^u39qJ`?s)vp=O0)=ls=(s(AdVQIGgue4v>=boCcH(2TJ Q1WdUMp00i_>zopr0P9^LU;qFB literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_navigation_close.png b/src/main/res/drawable-xxhdpi/ic_navigation_close.png new file mode 100644 index 0000000000000000000000000000000000000000..d0d6235fd5a24893e8675062320035d691d8e52c GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~Zh%jSE0F$AG+5}ddNxo4e@T#E zFhg)R%Y2*P|NB>e-p_M5-!Wm|YoOE%PZ!6Kh{JEMo#bma;Bmbez&4%f@Bj0vT>>f- zDpFodDEq9w&fFi{Pb?l@iDS0_k2HP z($SNuvy1oYFM3>aTbdU%RD4#t3B7s zi-sGoyjd9Fv`cH!1v_q)MW1UrU;WVxtY1^Vs=eK$v{5-R)>r7Q3g`RcDHeWHR-9Y! gEnZ_c|NYyyzh;O=G>IBK1^Su6)78&qol`;+0Q6$AS^xk5 literal 0 HcmV?d00001 diff --git a/src/main/res/layout/layout_main.xml b/src/main/res/layout/layout_main.xml index 07bba7a1..9200de0f 100644 --- a/src/main/res/layout/layout_main.xml +++ b/src/main/res/layout/layout_main.xml @@ -66,7 +66,7 @@ diff --git a/src/main/res/layout/layout_profiles.xml b/src/main/res/layout/layout_profiles.xml index 573c492d..d5f3a7e3 100644 --- a/src/main/res/layout/layout_profiles.xml +++ b/src/main/res/layout/layout_profiles.xml @@ -27,7 +27,6 @@ android:id="@+id/fab_manual_add" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_content_create" app:fab_colorNormal="@color/material_accent_500" app:fab_colorPressed="@color/material_accent_700" app:fab_colorRipple="@android:color/white" @@ -38,7 +37,6 @@ android:id="@+id/fab_qrcode_add" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_image_camera_alt" app:fab_colorNormal="@color/material_accent_500" app:fab_colorPressed="@color/material_accent_700" app:fab_colorRipple="@android:color/white" @@ -49,7 +47,6 @@ android:id="@+id/fab_nfc_add" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_device_nfc" app:fab_colorNormal="@color/material_accent_500" app:fab_colorPressed="@color/material_accent_700" app:fab_colorRipple="@android:color/white" @@ -60,7 +57,6 @@ android:id="@+id/fab_import_add" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_content_paste" app:fab_colorNormal="@color/material_accent_500" app:fab_colorPressed="@color/material_accent_700" app:fab_colorRipple="@android:color/white" diff --git a/src/main/res/layout/layout_profiles_item.xml b/src/main/res/layout/layout_profiles_item.xml index 434cbccb..53b667dd 100644 --- a/src/main/res/layout/layout_profiles_item.xml +++ b/src/main/res/layout/layout_profiles_item.xml @@ -1,6 +1,7 @@