From eaac0980277c3bdf8ee67daf1c3cce17f7595d2d Mon Sep 17 00:00:00 2001 From: Mygod Date: Sun, 7 Feb 2016 00:58:47 +0800 Subject: [PATCH 1/2] Update dependencies --- build.sbt | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index fe107f7f..a1aece97 100644 --- a/build.sbt +++ b/build.sbt @@ -30,7 +30,7 @@ libraryDependencies ++= Seq( "dnsjava" % "dnsjava" % "2.1.7", "com.github.kevinsawicki" % "http-request" % "6.0", "commons-net" % "commons-net" % "3.4", - "eu.chainfire" % "libsuperuser" % "1.0.0.201510071325", + "eu.chainfire" % "libsuperuser" % "1.0.0.201602011018", "com.google.zxing" % "android-integration" % "3.2.1", "net.glxn.qrgen" % "android" % "2.0", "com.google.android.gms" % "play-services-base" % "8.4.0", diff --git a/project/plugins.sbt b/project/plugins.sbt index 230e595f..3cd0661b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ resolvers += Resolver.url("scalasbt releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-snapshots"))(Resolver.ivyStylePatterns) -addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.5.15") +addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.5.16") resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/" From c7dd9aeeca362640cc6987bb6ce80e3c2fd8e5cd Mon Sep 17 00:00:00 2001 From: Mygod Date: Sun, 7 Feb 2016 02:00:15 +0800 Subject: [PATCH 2/2] Replace placeholder with brand new icon --- .../res/drawable-anydpi-v21/ic_start_busy.xml | 14 ++++++++++ .../ic_start_connected.xml | 14 ++++++++++ .../res/drawable-anydpi-v21/ic_start_idle.xml | 25 ++++++++++++++++++ src/main/res/drawable-hdpi/ic_cloud.png | Bin 297 -> 0 bytes src/main/res/drawable-hdpi/ic_cloud_off.png | Bin 462 -> 0 bytes src/main/res/drawable-hdpi/ic_cloud_queue.png | Bin 425 -> 0 bytes src/main/res/drawable-hdpi/ic_start_busy.png | Bin 0 -> 430 bytes .../res/drawable-hdpi/ic_start_connected.png | Bin 0 -> 387 bytes src/main/res/drawable-hdpi/ic_start_idle.png | Bin 0 -> 468 bytes src/main/res/drawable-mdpi/ic_cloud.png | Bin 209 -> 0 bytes src/main/res/drawable-mdpi/ic_cloud_off.png | Bin 330 -> 0 bytes src/main/res/drawable-mdpi/ic_cloud_queue.png | Bin 276 -> 0 bytes src/main/res/drawable-mdpi/ic_start_busy.png | Bin 0 -> 343 bytes .../res/drawable-mdpi/ic_start_connected.png | Bin 0 -> 312 bytes src/main/res/drawable-mdpi/ic_start_idle.png | Bin 0 -> 359 bytes src/main/res/drawable-xhdpi/ic_cloud.png | Bin 354 -> 0 bytes src/main/res/drawable-xhdpi/ic_cloud_off.png | Bin 593 -> 0 bytes .../res/drawable-xhdpi/ic_cloud_queue.png | Bin 537 -> 0 bytes src/main/res/drawable-xhdpi/ic_start_busy.png | Bin 0 -> 571 bytes .../res/drawable-xhdpi/ic_start_connected.png | Bin 0 -> 518 bytes src/main/res/drawable-xhdpi/ic_start_idle.png | Bin 0 -> 605 bytes src/main/res/drawable-xxhdpi/ic_cloud.png | Bin 517 -> 0 bytes src/main/res/drawable-xxhdpi/ic_cloud_off.png | Bin 859 -> 0 bytes .../res/drawable-xxhdpi/ic_cloud_queue.png | Bin 785 -> 0 bytes .../res/drawable-xxhdpi/ic_start_busy.png | Bin 0 -> 825 bytes .../drawable-xxhdpi/ic_start_connected.png | Bin 0 -> 789 bytes .../res/drawable-xxhdpi/ic_start_idle.png | Bin 0 -> 835 bytes src/main/res/drawable-xxxhdpi/ic_cloud.png | Bin 660 -> 0 bytes .../res/drawable-xxxhdpi/ic_cloud_off.png | Bin 1126 -> 0 bytes .../res/drawable-xxxhdpi/ic_cloud_queue.png | Bin 1035 -> 0 bytes .../res/drawable-xxxhdpi/ic_start_busy.png | Bin 0 -> 1135 bytes .../drawable-xxxhdpi/ic_start_connected.png | Bin 0 -> 1027 bytes .../res/drawable-xxxhdpi/ic_start_idle.png | Bin 0 -> 1068 bytes src/main/res/layout/layout_main.xml | 2 +- .../com/github/shadowsocks/Shadowsocks.scala | 14 +++++----- 35 files changed, 61 insertions(+), 8 deletions(-) create mode 100755 src/main/res/drawable-anydpi-v21/ic_start_busy.xml create mode 100755 src/main/res/drawable-anydpi-v21/ic_start_connected.xml create mode 100755 src/main/res/drawable-anydpi-v21/ic_start_idle.xml delete mode 100644 src/main/res/drawable-hdpi/ic_cloud.png delete mode 100644 src/main/res/drawable-hdpi/ic_cloud_off.png delete mode 100644 src/main/res/drawable-hdpi/ic_cloud_queue.png create mode 100755 src/main/res/drawable-hdpi/ic_start_busy.png create mode 100755 src/main/res/drawable-hdpi/ic_start_connected.png create mode 100755 src/main/res/drawable-hdpi/ic_start_idle.png delete mode 100644 src/main/res/drawable-mdpi/ic_cloud.png delete mode 100644 src/main/res/drawable-mdpi/ic_cloud_off.png delete mode 100644 src/main/res/drawable-mdpi/ic_cloud_queue.png create mode 100755 src/main/res/drawable-mdpi/ic_start_busy.png create mode 100755 src/main/res/drawable-mdpi/ic_start_connected.png create mode 100755 src/main/res/drawable-mdpi/ic_start_idle.png delete mode 100644 src/main/res/drawable-xhdpi/ic_cloud.png delete mode 100644 src/main/res/drawable-xhdpi/ic_cloud_off.png delete mode 100644 src/main/res/drawable-xhdpi/ic_cloud_queue.png create mode 100755 src/main/res/drawable-xhdpi/ic_start_busy.png create mode 100755 src/main/res/drawable-xhdpi/ic_start_connected.png create mode 100755 src/main/res/drawable-xhdpi/ic_start_idle.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_cloud.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_cloud_off.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_cloud_queue.png create mode 100755 src/main/res/drawable-xxhdpi/ic_start_busy.png create mode 100755 src/main/res/drawable-xxhdpi/ic_start_connected.png create mode 100755 src/main/res/drawable-xxhdpi/ic_start_idle.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_cloud.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_cloud_off.png delete mode 100644 src/main/res/drawable-xxxhdpi/ic_cloud_queue.png create mode 100755 src/main/res/drawable-xxxhdpi/ic_start_busy.png create mode 100755 src/main/res/drawable-xxxhdpi/ic_start_connected.png create mode 100755 src/main/res/drawable-xxxhdpi/ic_start_idle.png diff --git a/src/main/res/drawable-anydpi-v21/ic_start_busy.xml b/src/main/res/drawable-anydpi-v21/ic_start_busy.xml new file mode 100755 index 00000000..80d33108 --- /dev/null +++ b/src/main/res/drawable-anydpi-v21/ic_start_busy.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/src/main/res/drawable-anydpi-v21/ic_start_connected.xml b/src/main/res/drawable-anydpi-v21/ic_start_connected.xml new file mode 100755 index 00000000..9df136c9 --- /dev/null +++ b/src/main/res/drawable-anydpi-v21/ic_start_connected.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/src/main/res/drawable-anydpi-v21/ic_start_idle.xml b/src/main/res/drawable-anydpi-v21/ic_start_idle.xml new file mode 100755 index 00000000..01e14cb4 --- /dev/null +++ b/src/main/res/drawable-anydpi-v21/ic_start_idle.xml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/drawable-hdpi/ic_cloud.png b/src/main/res/drawable-hdpi/ic_cloud.png deleted file mode 100644 index 77ba43c2002ede9c12eea9ef07662b5c56e0b78e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 297 zcmV+^0oMMBP)BQ`1&4+>H((ziDU=PR1R90E zaB$GF^Pcm*OX2fKOaBUK_BiK(As=+OWS_L+BE(svZ;6IWaF*knKwUC!8LRZ|4mxF(|s zO4xeDm&7slLOjvJg{pYNg$wbH3(w*X7e2)aF7(6>E;J=^g}sU-vJ9{j;%R~+eUf{^ v*A!U-k_quOi!wEC7-42ik0up7E&W+v&yhG5+eP5-00000NkvXXu0mjfOelBj diff --git a/src/main/res/drawable-hdpi/ic_cloud_off.png b/src/main/res/drawable-hdpi/ic_cloud_off.png deleted file mode 100644 index e30de1c25bae6de8d2f243f65c1eb825596d6382..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 462 zcmV;<0WtoGP){h-W=ewg9T8cp6O8eCbYn^ zZF#61wcjT&T?CzW%NuP9sWI?N9JpsVH5h21UkaaP|)O`T(-fj`5!ITgMRPNpAv(qKt z!BhQV5i~_PD%DKX+3*7lh>Fx@Fq0sgL`7;CtcKU%kf=!YgP-9hxF#x6yTED~18eqH zq^^LO5FUZ0byEvE)KM9j2w~J0ux8R>n@dnTw7|St2;rEPa!ZtPnRkXeXJpjFiqr|i z-G}X@8(zsuQmIf>iQgWoQ+!bGK-H;x8lpOs?=OXZ1CWby=5c;LnE(I)07*qoM6N<$ Ef&d!SW&i*H diff --git a/src/main/res/drawable-hdpi/ic_cloud_queue.png b/src/main/res/drawable-hdpi/ic_cloud_queue.png deleted file mode 100644 index aae45eba5cce6f8298507e5d728b3f3651f2af17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 425 zcmV;a0apHrP)&kP8uqE*ByW&C^8mzhDd^%?U-OWvM^$@eUDg6Pzj5 zWl4gdub6y-hyfyku#TfW9*c-g-rE^M>0j$;CH_r861 zt+B}}P(Ty4QNfz9ecl=4;eiMT>OlKa9iyD|M0`MJY*ag9SsQ3o^0NWi@ly>saQ#9B z`8&db%^U7?RE6^SBS6O(hR#y$k9&ww15qG_eAQLdy9-?(I$*0J8bPM~+;HkmCk7{H zPXH9_LgZ4DP`F+Kca1MW-yR+wQLY(D*;{fNH=vS0La)GaKrj8#mk^CX_~0IJdOH1;A+7ad$}hnak^7IfI=Bl>T-z^W9C4`W=ExHYL;yYl&LQhJZlZmU>d+o=|P$66ae&RY-$OT zf*Ngsp&P)np%sW}d`F;WP+tVh-?spnY#l`i-xz@0YC|(yV~@znfl$J`U$Zwv+hM9B z6szmg+~^U}p~V)Id5=Bm2%hF#3-X238d2DOH=x2rr}x_(Bl31Op|T zW_;j4Rn!xm9InFI+nS{rjq~M{?-mXSX-(Zn;C5ChczQ#BaDC0hfF$?VObSS)4ofyD zN-DtuMNPE64powdvKzex)R`No>$>N0xgO>5Yd^`{OudEdCBOhz7!16I#-(on0000< KMNUMnLSTZKroycN literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-mdpi/ic_cloud.png b/src/main/res/drawable-mdpi/ic_cloud.png deleted file mode 100644 index a503ce8f29a20c291361d2d9652dc2e724d3fa0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i8J;eVAr^vn4;u0v3}86^aR16V zj!BbtG(>x_&yF@I**rs{^JpqhzIqGG-gcXnWj{JQmQ1pH8~wXBi1%W$ug|H;(%QRz zwX+!;eF|DulAM`s7rh;?o=viNpe({^ z*W>Xa@u-}9n9qkqmjg3jIeBie3_R;3&(d@ANZ)2XrHYr>mdK II;Vst0P(g{Gynhq diff --git a/src/main/res/drawable-mdpi/ic_cloud_off.png b/src/main/res/drawable-mdpi/ic_cloud_off.png deleted file mode 100644 index 92faccb173eaeafcc5197020a10de3d1e34110ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmV-Q0k!^#P)sVfg`y%;7uHMC!%Jqdj^e-_#~;3v9s?> z{vp#2-FebhcVH^N(P!JUPEWSdog=(DHK(Xx)`=JF=VzAjXdxZUd&E+{Qn2aDGgk7A zRotbMNi`oD`tywe4b0?|A-AY0DdtCxaqmni?`)!GG+o*8X*Y>Wl=26o*0fNL7K-VC zbyTB;;q<^5nsI@0dSD#Q*g)M_{-lCx47x$xqLFlETtyq@Bqm(z&0anjRB`S>cTH90 a{1b1(A{#CnJi;6R0000bI>^e2VJ@)ceyMuILfc>y~}a5<;h1$vg|LW5JCZF!K%H$LwKv) z3moNBfJ?AWfJxUB;5oH>fk|~LuvVUsD&h$56=yC*DSG^KNF8%#*MJ9H^8#jsvx2=h z8eEGwLK{)%SBJ7SkMNqEDW;;oh)88724SA9RrtMK++Y}WC*TC?wNk{3rSh#E0fuG@ zX86&uc!o-5wsvqUvXD|I=wYFc*qx6&&rk3?f}O!`Y=4Bk`<4tGyOUBWrQJF`-E1Qz p7|-tO7?{w~I~cLF5R;Q#;s0zljV#0Io7 z`2BwfP@t8;AaI`=1}gyZd^Ce$U_CVq#s>;$WiSjlP|IL!!SkP5E(RHX9*g*XY6Qi3 zXv)C`8Ym58keUQM@&VWkCpPlHITTmeLxBJ;*Y|@m2%hjxfM%-ucnrT!OymZj`RF~Y zT)`2kD8WZ+5s&~YQ=mR11QICC!36|-fwcr>BGL{}?tH+=$Y=W%FOHejYT6*rsn~|tcJntu14B!C7#=!?@xQ{>p5MTiRWADP+J^V2M0000< KMNUMnLSTZ)_jeco literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-mdpi/ic_start_idle.png b/src/main/res/drawable-mdpi/ic_start_idle.png new file mode 100755 index 0000000000000000000000000000000000000000..eeebda9ac6da10b0124dad9ebedf6e7a38bc11b4 GIT binary patch literal 359 zcmV-t0hs=YP)F!UAxjQg-X0RevU4=vX1nYa*$RVUeXRB7~ZdsLGS>v zo|q@CUIJW;3!eeDyDnSxC?p6PT7tmnVX3Jlx|Y_k7f^4YDGG@KHK$xo zI=wT#6qsd?HiI1KniMU8Y&m)cRB)v9z*Y8@RSZh|O95gY_5h{ag{071O{0V)nz z3z5=E6cjH_)t1)5O7v92*WrP@oIIT7)x2ZAzp3TGC+EDmNV|6J8Y4%E-AKc-9Oo`& zmZ`DIBGVKZCWACz{LdV3fcY5F&2_$EgGH{f`QLyNKm+lVq!c-cKR}*}A+}Iv?WS1o z3kbUsh$U`wm>lcKu#F=WS;F-snGh^7XNXO7n(Ml_Ocl`X_yfXDKE;US?cp7uo$v>Q z9o|GwomgO_575g+o>Ad9c;7`8?P@cim;3y|UU82RQgNW46|^d65I1k4k9cnx#sNG;t8xG_^C7a> zCg@P0pBkEd_5OqnZYnU2HiIB75PBzr+~OA+j3B}bv;xvHq1#IZ?IUU7Gg=-AM(iU( zJ0+~5WsrcxB-&#Ogdz5$y%*-u^zu+dCtBnV`79EU*x-P1v{^a=5<~70xerB0= diff --git a/src/main/res/drawable-xhdpi/ic_cloud_queue.png b/src/main/res/drawable-xhdpi/ic_cloud_queue.png deleted file mode 100644 index 6ef11bb1b4c927e0fd1db2cafd0a321a7f11e8fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)TM_`n(_N56JKA34ml zs-uS#1xnph4Y-3@p;eVJPL}O{(XJZMK?ZY9m2iulo~uSAF$tB&7)A5M>BUnWxPbBb z%qxb8suVqBF*zpG06N+33qvX*g~@S74WW&l9um-xSU}Ilaj<6%m!!W1Oxb(QAu=>#cU8Kq9!rGGG+-+TewEi z0yj88n;JljL1yp?j3~fO+9 bC{*GfFr^hdp^68Y00000NkvXXu0mjf&bH|D diff --git a/src/main/res/drawable-xhdpi/ic_start_busy.png b/src/main/res/drawable-xhdpi/ic_start_busy.png new file mode 100755 index 0000000000000000000000000000000000000000..2183c2b216f29c2c181bef96995fa7ed6f5e7cf0 GIT binary patch literal 571 zcmV-B0>u4^P)FbsuGkP$jUM#u<^ zklTQ6z)ipi8G#Y#O~7ry2y_DuPL4!T42BeNq&z7qY6y8wpFg-s5)l!>9(~{6hoM|^ zw*ZKn;j$fu4DG~C{|*%@@qYwM98iZ!+@jz{ToH*|WSofC{dR~@iH~SQC2nCtC2pZP z6YmK3NUkT|!dNtrt5ghe-D(26`4As2$Fa3WdBEp<-OF+B4=3jw^{!z!oz?N3;u2Lx z@)Dkdk=GwD;5HDi79vVBW>PSq!{WT7v}k;YYa;P+(`+G{7$7ge5Y$N>^W|RREkOi&k z;NUbX&zhx~o*KxDRNFWtR{6Xk7VpJ0AmV5(!9I_VY9U)1cHV|2V$X~vBn5uR6Dl=K``L0;v}pWm+Bue;P95nk^j&< z(lq@I>0cG)T}?7EpgmK|M@Z;vkj^Vq1HK3H&mEMWiu002ov JPDHLkV1kD^^waQG8ytr(^P_q zTlWqL2$#@QU{z{wTu#@BRE7VMtZ<}HRrt)AnsDJLeC9|=ct82WQx&dJsS2NwsS2N| zDGMJRep69>;|lGegH%IBI`(_IfF0Hdho&~)J<18MF8#hJO->!}HJU4eN>j;VRGq)EeXVQ5Uel!ml3gx$873UBwRpg^%XS z3GHT+4IF-fF2H0hjWLfa#_HCbkeUVI)R}ws1sTVt36Vl8jNfNMq}7iHm`@_~3Vbib z>KJn>_948%v?y-emjM#NJ{1VhJx;I+M6l9gQ4}9=c>#L|`(82Bg-QiNCxLdsgyxJI z=*-z+g702|Q25p>heR-ts6bc_*k|7MQAk)>ZQBZjg9HC(0muG)*Z9BVK=hJG%ztQ3 zkXkP+6|67NvD7deP+P`wj1YQ-(D_N#fj1EU$ugPDX8Z~;0Gs^vQXC;9j{pDw07*qo IM6N<$g2$}krvLx| literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xhdpi/ic_start_idle.png b/src/main/res/drawable-xhdpi/ic_start_idle.png new file mode 100755 index 0000000000000000000000000000000000000000..24e37f84ba0f6689b93517aa48f424fe08fcbddc GIT binary patch literal 605 zcmV-j0;2tiP)H}#g9r(SSf~Y^6#^mL z#Kh@J$su$;BZZrIaa(H=2oS#P@zJK34`c|2a2+b;kc)y~3Qv=|6o^E^O$<5gh8F@l z%Z3z(`M*AwX9_{|2yx0|WBvi=HhxqHiA=F2$ME4ojGh^=u?AS8t`dUKXMp1@R>x!F zTf#9AJzU2peuy@38T+`5z4vgW)yfe*AcgBUoe1f4DN-%idi|R!Tp@b5gns|JX_q00 z)p#8Jmo>m5gioh89k?}NrK%krR{V-JRr+ha@$ehPJ2}!&QBr4SdX^R7DBj7gx0!Q? zG$PW;j`{4_1L@`KPM2YqYT`3G7R;fml;Ph}_$Q5pq^Io|l|q z2M}{pA|l#qbsIq2db}f>K%EO^NCzxT-CJ>hnQjVP){s7CTK9-XP}M@&MI=K|l!O@`#Zi)!0ND(B1h*fZLsYMW% z8n9Z3I5gG4kHKmq6~*bMk)IR^ew64)bAfxj;4>{&_{4Lj zInO>eD_LYXz%)%d37MiqN=YEaD6fg)6-P-aUhLu--KeosaUtLgExOg>6n!#}0q(F~ zx7i@G*u)IIctF3*A;W!ob(f4x;VLFvk{OI(%6|2ZK|W$igS>i01(PPUUTo($lhpW% zNh|D7w@5R>EOEK4?oeQXIDKKGqGEsw@jIkw*vcG9m{b%DQYRU2^>_61gyhtj;w-!A zQzulg;Uy=@YAp)b^M-g@0vpB&)Cqf-CrOKx z^k)PdWQHU(7$c`>*v2T=nd1W?W`!(KrA(2uJkRqy@1OGxB43}RqfCs`00000NkvXX Hu0mjfi{|AH diff --git a/src/main/res/drawable-xxhdpi/ic_cloud_off.png b/src/main/res/drawable-xxhdpi/ic_cloud_off.png deleted file mode 100644 index 071088b61885aca0a54ce1d31aab422c503f3d56..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 859 zcmV-h1El%btYMG!+_S@|+~B_b<`s5UKw2y$VJM3;(?YEj(l zec>Xs(i9>$THz4srV$s8N{Qtl1b5Rob-%6T`Ok6YG&BFsIZ@~P+n&W|bjny~@lpOq)H( zzjKfV!kPnrV$bd(a?99;9A=qM82S4Pq7`A4o7u$_^wv)exz~ z=Ztd?Hxnbtt=!8Coac~}Ezw~I5}u^&Nt!219I3G+XZZnlUy`r`2~T*Eycc7f64iZZ z3lat_NJ1CORF|~_*^^StVs^k8TafU$6)DafX49>M?&4KuSf|8ws3HwFMM|@YR-w0f zki!@&xUwMi@h93x&4M!gh%0N-G}<*zHx6p&6KZ5lx`W@*&Nd3VjXZ!aq>E^m8w1@= z0l+6xKiXa+pbql5+hURooh0>fvQ%0kbx=mzV4evcAXXprDb*Fp;vhO}Ql66)d7buJ zphv0h0;dr7EJ-ueZkK*HsEtj`a!Bo2k{ug>Er=sUC`rx0IA zZ{yv2$Dkg}o<Dm(bopLLep4D#9yh+c+VRdeD9qx-lC?0w+C>_N^eSpzUxvaMIUk9|*!2 zW*3ovoHT;e-9wo53xdN2X72__x`iUzJ_$h(GE{eow67%PtYY@2{^Wm5b-Rq=_)L0` zZOncqt)O=DxZ5GeBiu>KC(_;QVK#s$NH{|Qzw;tZA;%ykt%gSWj9Bes!*nR5+%ZQ% zx`!zQOiKU#!D^J{;7E<1^j>C$?{FCz(Ik}ii2GD)+$GtM+Wo_Pl9dA+1SAP@)yzFW*;9s9Y$ zzr1Cd54>TRUjAe)KgeH%X{DDbGD&ig7AoZjD%s8`xp>AlDpgvnKhd-Dm zU(@_Xg}g@%=P1-!qVg6o`bhVRV{By^a|sb)9xK?&aVAN3ooac9FxN=+fL6kq1rav# zkW`ll%PSnkZGtvsMFs6l;C4vfU^8wvsaFnINFQ$NRXpbN8rvDd$`Mh{VjHJU#iASA zc`B6$LR`Ssr9!ckUpUPGA2EigRi213jPZd+<%>-=uIGVw2j1g*766_|s1NwpnY^^FeA~euOFR9k)Gk(Q*iX-2! zl0j_$6PLu_7<=U_VqC}eyCfcAG|6Yg7{nMSEG9APHp5e%MG-A9I4cIowceG>lOX3#B zD7Eq#S1~#zu?gEr`HEH8nkC^dgl)fkL!4oZaYFixCfrUDlMje<1KTdm;0SJGY{F4V zv5H}A&xvaWRoo@jC>^X}F;RJnD2=ppl~gUVQO6+VbWo|N;|}HW5027NMHl685J#D? znnC>ZoEBw=!v^~B!#KN$D>p1*J3ZWIf+XHb@{)c!X(psVAP@)yzB!)&{TJ-X;+Ry^ P00000NkvXXu0mjf(%D+n diff --git a/src/main/res/drawable-xxhdpi/ic_start_busy.png b/src/main/res/drawable-xxhdpi/ic_start_busy.png new file mode 100755 index 0000000000000000000000000000000000000000..d6c523aabab03d276dacfa479bc997f6ac1c6835 GIT binary patch literal 825 zcmV-91IGM`P)8E%B_p^<8Agrv2 z84QE&UyBXK(tSB5J|SXM8Y`F#-fWMwFc}VWscQ`9cTs{tW}Zp4qJ~0S8jNX!?_jJ2 z2Ch~4>@a{k+G13un0L4xjFrKp2>19CjHR&{cg!`7{PhdOgnUvZIK5Z%Ku zSZL?tl8S3}u0egv#+X<2ib&@ivwi~Wj{7SvFv(halcnW+=HQ|nUPS5OjjuoFOdNgZPDlP5TA=W zfR|CpkpWKN+4|2I zB;w8onT*MLk0z`la5CMujKn>3|Zj zf?x+)L9l|D3Mc_PARQPhz*Imwzz)dX%#yi~69sPJ4))LNkjdyBK91eJU3B5F8ns{q z42S_SAO^&Mj8s{c9xnkkm;me~jA^LBR5~yfHJC~vgHeO2v|=!~l`)uRB@CunTL#lC zf68FO9$YCz;ta5zIeqnD_}4UVlWyL#N|YNOp`vX0W>g} zO6NJplnHHZYYl_7vxm>Anbk7S0m)NkcdBMbT;lVfPXw3E5Cbw;KLQK@y&?V@ TMY?BU00000NkvXXu0mjfUxQsk literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxhdpi/ic_start_idle.png b/src/main/res/drawable-xxhdpi/ic_start_idle.png new file mode 100755 index 0000000000000000000000000000000000000000..be36519a0470b0509124708d9af47ba53944f6c4 GIT binary patch literal 835 zcmV-J1HAl+P)pae@u z36zi$?7$Kz!4gseC0K$bc;cC5hH)Y;kL4vhlYd6^y9+FEa=WfYixw?1iGAPs_cJ$% zYaA7#iCp762I>2bgDXzeNZE;lY32?^u(9wj1K!l>Xr4Hkjq2&01eHl8igG5dJH9I=IZkgSlPs9kse zSVBHja-@JT_yVy6Bmx)}BgMaBG$cZp|Da5DQY2~^=K?V`QY07^bBx&}2og-!v0&^L zs5v0r>_wrv3*s5hF?6vaG1A)sXH8Mn#zxxUdYQC9%oJ&bwief{OSy2QMmjR4KV~6B zhS4lgJ%Nsg7ry&2rV|!KmPr#}N|?!Vz_dY{v<$t=98>rElmKIk#MSu~qMh;Plx8Xg z#jXd4Gi2-Ln>mZ;%WRM>47uFc z;m9WRrrU?CK!ieUinMtpD0U`eo?wiS5gP#xC)$~0QBN?mv4ne`VCvm)ylCegVBls+ z7pR_HaJ`yEEXFL?Vp4XoL+gUrJ>%Yxp=;n0fJZ;UKy*Rr_%f2B1UMn_E{A|FIBOa4 zzPVmd)=3)D(B&3)RV#8(4pMP{Le7i=?gXBux3XSmR#vZ%Zx~zY^AZ%p#-eL_+KiydI5o12j8~O?4p| zfTZL7>O#5z+I$w4RUusf@c{R&1L+5l2zc-EkxoD|^dA)zk8}cJL~WFdqyfE&+bI(X zfR;#Ym4^f?^gd#H)&IW$4Jjj}xgnX6c=z-$AT=BVQo}JI8FBsu7yvDlKK^{o(7ylx N002ovPDHLkV1nAwaBKho literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxxhdpi/ic_cloud.png b/src/main/res/drawable-xxxhdpi/ic_cloud.png deleted file mode 100644 index d9534a993fe66107a1b18d770f71eafe2a77e25d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 660 zcmV;F0&D$=P)Qg@=Ly z5iE+)i?NP*NIZnBQrZ@q%za{nX!(+E`)~gr{GLa$EX%Si%d#xX$`Q&rM-RgUnIl4y zB^H?D4G-zzEPLf%9OgQ&NwSqBQ(VR;x1ourEVErnp3o?_;0!@B@rqL_G<-ZJ8za=J zaOhx>Z2h23g+Lki$(2D$m0wgcMJ`QHuKb~zPvqJ(2b3RF62b}ZD3|jnV+yBCQY@$O z04EK|S#;pE3vv#JSj1^zYUC8g$%kP%gGTb@gmMWV9SkzT0{QY%xj{A8cuygmRJQOj z#4ieEOxd86n?xz3B(=&E^-NQEUCInC#BhU2WrA)}xI>&>+9|qllhfK6nn~d%Uzy|{ z7dfKspq>bB72+!Uv=vJDfV)Mw#U5>j9!xMxlQx2vC}v2}i%0)r2$MXbSZlGL7-kv4 zqg7nNJh!!qASODmKd8e@^HeB}c1+c;Gy<3^POT(fV6I+C%wVoBc*FuGJ1&+mnO`hn zvN7=;lZC_#Ci^CyW3q%8z+?&0j>*E}ASMe*;w|PHmBb~?<(EViF-+B+ zadvAf9Az5!3Q(l~p@bVmai4iwwOx4WCx&~(8K6QtLlxZwNl|FC^x;*esG*HJJmWKA u668yQFd;_q(||{oWm%SGS(as4>-+}SUVfiti#^r=0000Y9 diff --git a/src/main/res/drawable-xxxhdpi/ic_cloud_off.png b/src/main/res/drawable-xxxhdpi/ic_cloud_off.png deleted file mode 100644 index 2d78efc84e7a418c3fc6b95a73546a87914624b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1126 zcmV-s1eyDZP)b&$Hw9eA`br@6X+?elOTL{LYxf z#l^+N#l^+N#l^*?imkMfKq7B38+d~*j`BN`cwFKiPV)opyv|w{A(@?!ep~T?k0KGO zXy6b@(v{>}UZKhwppQ=k!fL)`il`;|oHe!pef;!RAH5x%C#0w8=i3&J=(G_js#6p|p15|*=(MtT_| zb;l^P00c3O*yeK5{Go!k&nP=vzZS zVYS)-gqDmG3TY>-$87*YbH)im6T!|>ZUYeBHz3p#Y`+yic+Y^agJ5@O7H}h*c!wT- z<_|C+wBzqkrT`16;~SEw3?AnJ{M|cuKnc4zhsunw7JuDy17z{4I=nrh8(or$*#mCj zM|Adtm3Zi0m@QxfBLuT297NYQJHS&U0p@{FgYE(a*A93F4`5yh1&pJ+?^*#5a+&Z( z>7bTsN_}5W3HD`>@D;i<^s$dxZjA<5#wcN(WD5%rH5RI1VEyU?#h!3GGd0Bh;eblU@b?o-5H)K;88hdxlSB}(2Y>y6v)$_g!j-D zz)kquf*{6(=*wa=!vy=2;%UGW=+3bKaf%=m(n+x9X+SHw4g_(IAhh7`0u@N`22zVS zNl4IzznzHiE4pgLQNkilqdP@H7(rKxI7@gEe|HL((B&b{60#XW*Juf_AnZohE&PqH z3~`w70J;;xpvgmQMYtK=UpB8%J3>CXi$W{9PQ+nCF1pLYW^|+6;4q;I-ALGF?pefH z!g_SS2*MF`1LV3%2!D+VFXL|;;v^xPVRTJ`P|5_lNme*Xcp87zsXpolDR+)g%x~z1 zNC<+klyUqWcZ`t57x;S%5vJEjut8QjL&)Y6{GF%rKR_`^2(Mo zMp%Q?vT$ArMGO<{48T$kRV{1FopYs z{bZ#A2#+x8IH5!TaW}ZzIOZ&2g17b0Q{B3^G43RxEc(A1RMO0ZdxV()dZoO`VLX=! z!ptkDh8B7m;4BwiBMA00z2*tmIYGES2yONNOM=Jq_5eGAM?GQ>up)Rohu8zG2p)Ba sJ-~|aF?EPNz3E5Cg3CFS3=@q;0ueEC2ui07*qoM6N<$g8p*>-~a#s diff --git a/src/main/res/drawable-xxxhdpi/ic_cloud_queue.png b/src/main/res/drawable-xxxhdpi/ic_cloud_queue.png deleted file mode 100644 index 6f0210dcc0db4f8b2e48dc7b4195267ef4fff378..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1035 zcmV+m1oZofP)5LjC4S&pWgAs|K`PF&UfDwvw@KAsG$zN;f{k%Mj0L8K`9tFYQV%n(%Up0xc7TbmHZ8r4QBI#wo@Dtq||yHcq+Hh4VPY zXi*Ai!R?IFgIe5Ll_Cz}_O$#&6-}JrG7~tRk`L&_>3jKuGWPK+@eENQA5h2;PR}S+ zRB@6S64@r7upOs!N(Es)AWCAN%SW8UG|zgi6gBj-lo&Pg5u1r&+M|`Bo@ti$t$fBe zn679g*h`FLyegm3fN7RhS}yjGoGAJ78LNn5dS1)JPGWeQN`ySF;x@xRa+M*xLLyUqNTK4P4YxryDuZ~OrHrsc zUZ^07(^blpQIxW@7>5YSiIX@DQl<v)=T0$OwFiE`Sn92c!c! z2-g9rAaoE?0qMXckPdvQ0H*@31Ka@-7ct{wjHM?D9um7V8vhsx_DTDm7L9#400000 z00000004lm==(kwtpyWI#P|QvfDs%FvLUrhy+aW5I>*;TRg;%sHtO| zK=Whb#m5iPV&bKL!QQ$veu@+<@(}+HFv&!`%?9kWSKNn#PWL7@dg2o+B)uTh}{@rq=7SJrlvpbe)RygdQIO#FwLNvwFf@vW9lt_Yp@ zi@|AyZdw)&a$-`^$nh85fNh!h%%D#1rX?ZKW|#&}C0SL7#HTV@wg$;Ip4=Oy;;AOr zCK}gdK@l(e%?!MmdTNGg5;$8*Y6dUnAU@U5Ml$gRGj>)6G>JKL6()aO8zJn9IU?qb4>hbfE6L81!6_X~%mZSlmL^7jP9!ogZ{pfIqVHGf0T@t$aYRZY#E?WQy5h#`lgH%$6hvJQ z0E+|#lOTOu0fXecAOL~sJ_4YJUxNHsh%`?Q2=ectd|3fO>AsHv_=cAvd=i8|Mq>;> z(}(t}gdR!IO-j!V0f5y20000000000;0*r+7yt<>`6F(wQq2GW002ovPDHLkV1oD( B^waFc8Kej{)cgbOX8p z8`PPgWP-9m$OP^N?gotDWCA-ABpcujRLMQwbEyH@NID6=-+OxelOXY(bUK{`jv@d6 z00000001CVgb<}HA5elxc=4A56yXuRV+Un;gzqS!5RdR3Ih5iNUeQ7=9^pHhTkA+5 z^L63ndTx7sp8_iK2!94jG6_Ft0hX*)_&a_47_TtExag_8RI>b(CACn+ z8+^)u@Uqk@Mi+L;pf->2VonA$fvYjXarFjZ5`MP-Par&B1f+-|{Cr}`YDR!h!q4sf zK^ee9;f=)q34}jKF!{{?M;w0#>b_e8_emlA9f>na#I+m=I4@lgE#*~$taPwwdX!~v zz@;6R(Bm_8ltZ{-Mae`9g!es>OkWZ(F}&@ST(u=v`; z(Z1{trjhYUkriJr<_XbFw#jU+QhXA=S{#la8WyrHk3XF1Fj9B z{BLF02iKY%fD`{tKp1dQtaUkEp`{3-kLhfF8dFUd{jx=72^1JX9znU{QWQL<2lwQ-se2;fK)}4R8=k x`zm2TF6czA=L7>F)c^nh000000LJ(uzyKt{@UmO06(s-w002ovPDHLkV1hge%LV`d literal 0 HcmV?d00001 diff --git a/src/main/res/drawable-xxxhdpi/ic_start_idle.png b/src/main/res/drawable-xxxhdpi/ic_start_idle.png new file mode 100755 index 0000000000000000000000000000000000000000..a4017bc6122e6079c6aed3047e4b617aa60f4c9f GIT binary patch literal 1068 zcmV+{1k?M8P)w14?iSl#mi!LQ0?n-*IQpWSEfHvMkB5^mo_TyblZM;oYv&(9qD((9n<*&bdKV z;1hpx|HG&neBwKWz%RZ+5FoxnNZ0X+ExtmC6yED(QwLiY9}3}Gc$h|i2iz0_itr&O z$ORQbzVIP>=*1O6p72NPxf3Y_nD8Msj7gh^01!UJg0+AqA!G<2V!&KXGY}Aj{}&|| z_R|osgarR}Y`$+)<E{Qq}-HB-6ThgMX4IjE^8d z7^Zaq=WokX?vX&J|B@37;B4g0P#6j!AHW&Lpb+=~JfZIhg@6N~&zwggWB^zY`v--P z2;hM{pF&6gu$MR>r4Zr)3mIO zZ~|bM*U}z@7Xa1?_^*V`LGS=}C+I*_QxH6WS>U>~L{$hH3ZYU6gQ~^{VN$jDAgK6^ m5LA3d2r51!glO^q2rvMl)0000 literal 0 HcmV?d00001 diff --git a/src/main/res/layout/layout_main.xml b/src/main/res/layout/layout_main.xml index 09de0e81..14858f5c 100644 --- a/src/main/res/layout/layout_main.xml +++ b/src/main/res/layout/layout_main.xml @@ -19,7 +19,7 @@ diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala index 25995430..a9fa9092 100644 --- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala +++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala @@ -119,7 +119,7 @@ class Shadowsocks s match { case State.CONNECTING => fab.setBackgroundTintList(greyTint) - fab.setImageResource(R.drawable.ic_cloud_queue) + fab.setImageResource(R.drawable.ic_start_busy) fab.setEnabled(false) fabProgressCircle.show() preferences.setEnabled(false) @@ -149,7 +149,7 @@ class Shadowsocks preferences.setEnabled(true) case State.STOPPING => fab.setBackgroundTintList(greyTint) - fab.setImageResource(R.drawable.ic_cloud_queue) + fab.setImageResource(R.drawable.ic_start_busy) fab.setEnabled(false) if (state == State.CONNECTED) fabProgressCircle.show() // ignore for stopped preferences.setEnabled(false) @@ -226,7 +226,7 @@ class Shadowsocks private def changeSwitch(checked: Boolean) { serviceStarted = checked - fab.setImageResource(if (checked) R.drawable.ic_cloud else R.drawable.ic_cloud_off) + fab.setImageResource(if (checked) R.drawable.ic_start_connected else R.drawable.ic_start_idle) if (fab.isEnabled) { fab.setEnabled(false) handler.postDelayed(() => fab.setEnabled(true), 1000) @@ -428,25 +428,25 @@ class Shadowsocks case State.CONNECTING => fab.setBackgroundTintList(greyTint) serviceStarted = false - fab.setImageResource(R.drawable.ic_cloud_queue) + fab.setImageResource(R.drawable.ic_start_busy) preferences.setEnabled(false) fabProgressCircle.show() case State.CONNECTED => fab.setBackgroundTintList(greenTint) serviceStarted = true - fab.setImageResource(R.drawable.ic_cloud) + fab.setImageResource(R.drawable.ic_start_connected) preferences.setEnabled(false) fabProgressCircle.postDelayed(hideCircle, 100) case State.STOPPING => fab.setBackgroundTintList(greyTint) serviceStarted = false - fab.setImageResource(R.drawable.ic_cloud_queue) + fab.setImageResource(R.drawable.ic_start_busy) preferences.setEnabled(false) fabProgressCircle.show() case _ => fab.setBackgroundTintList(greyTint) serviceStarted = false - fab.setImageResource(R.drawable.ic_cloud_off) + fab.setImageResource(R.drawable.ic_start_idle) preferences.setEnabled(true) fabProgressCircle.postDelayed(hideCircle, 100) }