From 9041404f4270fdf4b0ae542a81912a1bacd98685 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Thu, 30 Apr 2015 16:44:27 +0800
Subject: [PATCH] add partial material design

---
 build.sbt                                     |   4 +-
 src/main/res/drawable-hdpi-v21/ic_drawer.png  | Bin 0 -> 2864 bytes
 src/main/res/drawable-mdpi-v21/ic_drawer.png  | Bin 0 -> 2853 bytes
 src/main/res/drawable-xhdpi-v21/ic_drawer.png | Bin 0 -> 2908 bytes
 .../res/drawable-xxhdpi-v21/ic_drawer.png     | Bin 0 -> 2955 bytes
 src/main/res/layout/layout_switch.xml         |   2 +-
 src/main/res/values-v21/styles_shadow.xml     |  82 ++++++++++++++++++
 src/main/res/values/styles_shadow.xml         |   2 +-
 .../com/github/shadowsocks/AppManager.scala   |   1 +
 .../com/github/shadowsocks/Shadowsocks.scala  |   9 +-
 10 files changed, 94 insertions(+), 6 deletions(-)
 create mode 100755 src/main/res/drawable-hdpi-v21/ic_drawer.png
 create mode 100755 src/main/res/drawable-mdpi-v21/ic_drawer.png
 create mode 100755 src/main/res/drawable-xhdpi-v21/ic_drawer.png
 create mode 100755 src/main/res/drawable-xxhdpi-v21/ic_drawer.png
 create mode 100644 src/main/res/values-v21/styles_shadow.xml

diff --git a/build.sbt b/build.sbt
index e632d518..7ac5d3e4 100644
--- a/build.sbt
+++ b/build.sbt
@@ -18,10 +18,8 @@ typedResources in Android := false
 
 resolvers += "JRAF" at "http://JRAF.org/static/maven/2"
 
-resolvers += "madeye private releases" at "http://madeye-maven-repository.googlecode.com/git/"
-
 libraryDependencies ++= Seq(
-  "dnsjava" % "dnsjava" % "2.1.5",
+  "dnsjava" % "dnsjava" % "2.1.7",
   "com.github.kevinsawicki" % "http-request" % "5.6",
   "commons-net" % "commons-net" % "3.3",
   "com.google.zxing" % "android-integration" % "3.1.0"
diff --git a/src/main/res/drawable-hdpi-v21/ic_drawer.png b/src/main/res/drawable-hdpi-v21/ic_drawer.png
new file mode 100755
index 0000000000000000000000000000000000000000..5c2c7f1eaa119c8f67e98b3100afb0e136614a6b
GIT binary patch
literal 2864
zcmV-03(xe4P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000XU
z000XU0RWnu7ytkYPiaF#P*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)XH-+^7Crag
z^g>IBfRsybQWXdwQbLP>6p<z>Aqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uh<iVD~V
z<RPMtgQJLw%KPDaqifc@_vX$1wbwr9tn;0-&j-K=43<bUQ8j=JsX`tR;Dg7+#^K~H
zK!FM*Z~zbpvt%K2{UZSY_<lS*D<Z%Lz5oGu(+dayz)hRLFdT>f59&ghTmgWD0l;*T
zI7<kC6aYYajzXpYKt=(8otP$50H6c_V9R4-;{Z@C0AMG7=F<Rxo%or10RUT+Ar%3j
zkpLhQWr#!oXgdI`&sK^>09Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p
z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-<?i
z0%4j!F2Z@488U%158(66005wo6%pWr^Zj_v4zAA5HjcIqUoGmt2LB>rV&neh&#Q1i
z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_<lS*MWK+n+1cgf
z<k(8YLR(?VSAG6x!e78w{cQPuJpA|d;J)G{fihizM+Erb!p!tcr5w+a34~(Y=8s4G
zw+sLL9n&JjNn*KJDiq^U5^;`1nvC-@r6P$!k}1U{(*I=Q-z@tBKHoI}uxdU5dyy@u
zU1J0GOD7Ombim^G008p4Z^6_k2m^p<gW=D2|L;HjN1!DDfM!XOaR2~bL?kX$%CkSm
z2mk;?pn)o|K^yeJ7%adB9Ki+L!3+FgHiSYX#KJ-lLJDMn9CBbOtb#%)hRv`YDqt_v
zKpix|QD}yfa1JiQRk#j4a1Z)n2%f<xynzV>LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW
zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifq<Ex{*7`05XF7hP+2Hl!3BQJ=6@fL%FCo
z8iYoo3(#bAF`ADSpqtQgv>H8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X
zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ<AYmRsNLWl*PS{AOARHt#5!wki2?K;t
z!Y3k=s7tgax)J%r7-BLphge7~Bi0g+6E6^Zh(p9TBoc{3GAFr^0!gu?RMHaCM$&Fl
zBk3%un>0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4
z<uv66WtcKSRim0x-Ke2d5jBrmLam{;Qm;{ms1r1GnmNsb7D-E`t)i9F8fX`2_i3-_
zbh;7Ul^#x)&{xvS=|||7=mYe33=M`AgU5(xC>fg=2N-7=cNnjjOr{yriy6mMFgG#l
znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U
zt5vF<Q0r40Q)j6=sE4X&sBct1q<&fbi3VB2Ov6t@q*0);U*o*SAPZv|vv@2aYYnT0
zb%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KOarm5cP6_8Ir<e17iry6O
zDdH&`rZh~sF=bq9s+O0QSgS~@QL9Jmy*94xr=6y~MY~!1fet~(N+(<=M`w@D1)b+p
z*;C!83a1uLJv#NSE~;y#8=<>IcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya?
z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y
zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB
zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt
z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a<fJbF^|4I#xQ~n$Dc=
zKYhjYmgz5NSkDm8*fZm{6U!;YX`NG>(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C
z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB
zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe
zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0
z?2xS?_ve_-k<Mujg;0Lz*3buG=3$G&ehepthlN*$KaOySSQ^nWmo<0M+(UEUMEXRQ
zMBbZcF;6+KElM>iKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$
z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4
z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu
zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu
z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E
ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw
zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX
z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&
z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01
z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R
z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw
zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD
zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3|
zawq-H%e&ckC+@AhPrP6BK<z=<L*0kfKU@CX*zeqbYQT4(^U>T#_XdT7&;F71j}Joy
zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z
zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot<a{81DF0~rvGr5Xr~8u`lav1h
z1DNytV>2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F}
z00016Nkl<Zc-rjLNdW*L3<NQ%8YF<~BBLBx1)I-AX11Fb00000000000Ph1Tl>q>7
z06>KReh2izk4uFB4gkzTz)&Fo02KlNP$2*S000000DuPp8vp?R{{sLwTb!YUCH?pS
O0000<MNUMnLSTZD?>_<n

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-mdpi-v21/ic_drawer.png b/src/main/res/drawable-mdpi-v21/ic_drawer.png
new file mode 100755
index 0000000000000000000000000000000000000000..c912125793233a6cb0d41595716907fe28bb48a1
GIT binary patch
literal 2853
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
DW(-0?

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xhdpi-v21/ic_drawer.png b/src/main/res/drawable-xhdpi-v21/ic_drawer.png
new file mode 100755
index 0000000000000000000000000000000000000000..56f01f3ea78f42ca506d7ade1cd5e2fd034c9fd9
GIT binary patch
literal 2908
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

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxhdpi-v21/ic_drawer.png b/src/main/res/drawable-xxhdpi-v21/ic_drawer.png
new file mode 100755
index 0000000000000000000000000000000000000000..1fc1d9c012ecbc202e8c461141b22e1c26b6f84b
GIT binary patch
literal 2955
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
G5&s2lBtxbE

literal 0
HcmV?d00001

diff --git a/src/main/res/layout/layout_switch.xml b/src/main/res/layout/layout_switch.xml
index b6acfd57..11bdecc9 100644
--- a/src/main/res/layout/layout_switch.xml
+++ b/src/main/res/layout/layout_switch.xml
@@ -9,7 +9,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:gravity="center_vertical"
-      android:textSize="24sp"
+      android:textSize="26sp"
       android:textColor="@color/title"
       android:text="@string/screen_name"
       android:layout_alignParentLeft="true"
diff --git a/src/main/res/values-v21/styles_shadow.xml b/src/main/res/values-v21/styles_shadow.xml
new file mode 100644
index 00000000..813763c4
--- /dev/null
+++ b/src/main/res/values-v21/styles_shadow.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- File created by the Android Action Bar Style Generator
+
+     Copyright (C) 2011 The Android Open Source Project
+     Copyright (C) 2012 readyState Software Ltd
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+
+    <style name="Theme.Shadow" parent="@android:style/Theme.Material.Light.DarkActionBar">
+        <item name="android:actionBarItemBackground">@drawable/selectable_background_shadow</item>
+        <item name="android:popupMenuStyle">@style/PopupMenu.Shadow</item>
+        <item name="android:dropDownListViewStyle">@style/DropDownListView.Shadow</item>
+        <item name="android:actionBarTabStyle">@style/ActionBarTabStyle.Shadow</item>
+        <item name="android:actionDropDownStyle">@style/DropDownNav.Shadow</item>
+        <item name="android:actionBarStyle">@style/ActionBar.Solid.Shadow</item>
+        <item name="android:actionModeBackground">@drawable/cab_background_top_shadow</item>
+        <item name="android:actionModeSplitBackground">@drawable/cab_background_bottom_shadow</item>
+        <!-- Light.DarkActionBar specific -->
+        <item name="android:actionBarWidgetTheme">@style/Theme.Shadow.Widget</item>
+        <item name="android:textAppearanceLargePopupMenu">@style/m_textAppearanceLargePopupMenu</item>
+        <item name="android:textAppearanceSmallPopupMenu" >@style/m_textAppearanceSmallPopupMenu</item>
+    </style>
+
+    <style name="ActionBar.Solid.Shadow" parent="@android:style/Widget.Material.ActionBar">
+        <item name="android:background">@drawable/ab_background_textured_shadow</item>
+        <item name="android:backgroundStacked">@drawable/ab_stacked_solid_shadow</item>
+        <item name="android:backgroundSplit">@drawable/ab_background_textured_shadow</item>
+    </style>
+
+    <style name="ActionBar.Transparent.Shadow" parent="@android:style/Widget.Material.ActionBar">
+        <item name="android:background">@drawable/ab_transparent_shadow</item>
+    </style>
+
+    <style name="PopupMenu.Shadow" parent="@android:style/Widget.Material.ListPopupWindow">
+        <item name="android:popupBackground">@drawable/menu_dropdown_panel_shadow</item>	
+    </style>
+
+    <style name="m_textAppearanceSmallPopupMenu" parent="@android:style/TextAppearance.Material.Widget.PopupMenu.Small">
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+
+    <style name="m_textAppearanceLargePopupMenu" parent="@android:style/TextAppearance.Material.Widget.PopupMenu.Large">
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+
+    <style name="DropDownListView.Shadow" parent="@android:style/Widget.Material.ListView.DropDown">
+        <item name="android:listSelector">@drawable/selectable_background_shadow</item>
+    </style>
+
+    <style name="ActionBarTabStyle.Shadow" parent="@android:style/Widget.Material.ActionBar.TabView">
+        <item name="android:background">@drawable/tab_indicator_ab_shadow</item>
+    </style>
+
+    <style name="DropDownNav.Shadow" parent="@android:style/Widget.Material.Spinner">
+        <item name="android:background">@drawable/spinner_background_ab_shadow</item>
+        <item name="android:popupBackground">@drawable/menu_dropdown_panel_shadow</item>
+        <item name="android:dropDownSelector">@drawable/selectable_background_shadow</item>
+    </style>
+    
+    <!-- this style is only referenced in a Light.DarkActionBar based theme -->
+    <style name="Theme.Shadow.Widget" parent="@android:style/Theme.Material">
+        <item name="android:popupMenuStyle">@style/PopupMenu.Shadow</item>
+        <item name="android:dropDownListViewStyle">@style/DropDownListView.Shadow</item>
+        <item name="android:textColor">@android:color/white</item>
+        <item name="android:textAppearanceLargePopupMenu">@style/m_textAppearanceLargePopupMenu</item>
+        <item name="android:textAppearanceSmallPopupMenu" >@style/m_textAppearanceSmallPopupMenu</item>
+    </style>
+
+</resources>
diff --git a/src/main/res/values/styles_shadow.xml b/src/main/res/values/styles_shadow.xml
index b76e2abe..eff9822a 100644
--- a/src/main/res/values/styles_shadow.xml
+++ b/src/main/res/values/styles_shadow.xml
@@ -35,7 +35,7 @@
         <item name="android:textAppearanceSmallPopupMenu" >@style/m_textAppearanceSmallPopupMenu</item>
     </style>
 
-    <style name="ActionBar.Solid.Shadow" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
+    <style name="ActionBar.Solid.Shadow" parent="@android:style/Widget.Holo.ActionBar">
         <item name="android:background">@drawable/ab_background_textured_shadow</item>
         <item name="android:backgroundStacked">@drawable/ab_stacked_solid_shadow</item>
         <item name="android:backgroundSplit">@drawable/ab_background_textured_shadow</item>
diff --git a/src/main/scala/com/github/shadowsocks/AppManager.scala b/src/main/scala/com/github/shadowsocks/AppManager.scala
index ea5427db..f9b70944 100644
--- a/src/main/scala/com/github/shadowsocks/AppManager.scala
+++ b/src/main/scala/com/github/shadowsocks/AppManager.scala
@@ -280,6 +280,7 @@ class AppManager extends Activity with OnCheckedChangeListener with OnClickListe
     val actionBar = getActionBar()
     actionBar.setTitle(R.string.proxied_help)
     actionBar.setDisplayHomeAsUpEnabled(true)
+    actionBar.setDisplayShowHomeEnabled(false)
     this.setContentView(R.layout.layout_apps)
     this.overlay = View.inflate(this, R.layout.overlay, null).asInstanceOf[TextView]
     getWindowManager.addView(overlay, new
diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index da698610..be00be98 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -514,7 +514,14 @@ class Shadowsocks
     getActionBar.setCustomView(switchLayout)
     getActionBar.setDisplayShowTitleEnabled(false)
     getActionBar.setDisplayShowCustomEnabled(true)
-    getActionBar.setIcon(R.drawable.ic_stat_shadowsocks)
+    if (Utils.isLollipopOrAbove) {
+      getWindow.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+      getWindow.setStatusBarColor(getResources().getColor(R.color.grey3));
+      getActionBar.setDisplayHomeAsUpEnabled(true)
+      getActionBar.setDisplayShowHomeEnabled(false)
+    } else {
+      getActionBar.setIcon(R.drawable.ic_stat_shadowsocks)
+    }
     title.setOnLongClickListener(new OnLongClickListener {
       override def onLongClick(v: View): Boolean = {
         if (Utils.isLollipopOrAbove && bgService != null