From c969aed4dafb00b2dda895ef98739a97b4971713 Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Mon, 30 Nov 2015 20:50:32 +0800
Subject: [PATCH 1/5] Refine layout

---
 src/main/res/drawable-anydpi-v21/ic_check.xml |   9 +++
 src/main/res/drawable-anydpi-v21/ic_close.xml |   9 +++
 src/main/res/drawable-hdpi/ic_check.png       | Bin 0 -> 181 bytes
 src/main/res/drawable-hdpi/ic_close.png       | Bin 0 -> 221 bytes
 src/main/res/drawable-mdpi/ic_check.png       | Bin 0 -> 137 bytes
 src/main/res/drawable-mdpi/ic_close.png       | Bin 0 -> 175 bytes
 src/main/res/drawable-xhdpi/ic_check.png      | Bin 0 -> 199 bytes
 src/main/res/drawable-xhdpi/ic_close.png      | Bin 0 -> 257 bytes
 src/main/res/drawable-xxhdpi/ic_check.png     | Bin 0 -> 276 bytes
 src/main/res/drawable-xxhdpi/ic_close.png     | Bin 0 -> 347 bytes
 src/main/res/drawable-xxxhdpi/ic_check.png    | Bin 0 -> 308 bytes
 src/main/res/drawable-xxxhdpi/ic_close.png    | Bin 0 -> 436 bytes
 src/main/res/layout/layout_apps.xml           |  58 +++++++-----------
 src/main/res/layout/layout_tasker.xml         |  36 ++++-------
 ...e_methods.xml => profile_manager_menu.xml} |   0
 src/main/res/menu/tasker_menu.xml             |  10 +++
 src/main/res/values/strings.xml               |   4 +-
 src/main/res/values/styles.xml                |   2 +-
 .../shadowsocks/ProfileManagerActivity.scala  |   2 +-
 .../github/shadowsocks/TaskerActivity.scala   |  22 ++++---
 20 files changed, 77 insertions(+), 75 deletions(-)
 create mode 100644 src/main/res/drawable-anydpi-v21/ic_check.xml
 create mode 100644 src/main/res/drawable-anydpi-v21/ic_close.xml
 create mode 100644 src/main/res/drawable-hdpi/ic_check.png
 create mode 100644 src/main/res/drawable-hdpi/ic_close.png
 create mode 100644 src/main/res/drawable-mdpi/ic_check.png
 create mode 100644 src/main/res/drawable-mdpi/ic_close.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_check.png
 create mode 100644 src/main/res/drawable-xhdpi/ic_close.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_check.png
 create mode 100644 src/main/res/drawable-xxhdpi/ic_close.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_check.png
 create mode 100644 src/main/res/drawable-xxxhdpi/ic_close.png
 rename src/main/res/menu/{add_profile_methods.xml => profile_manager_menu.xml} (100%)
 create mode 100644 src/main/res/menu/tasker_menu.xml

diff --git a/src/main/res/drawable-anydpi-v21/ic_check.xml b/src/main/res/drawable-anydpi-v21/ic_check.xml
new file mode 100644
index 00000000..6541ee3e
--- /dev/null
+++ b/src/main/res/drawable-anydpi-v21/ic_check.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
diff --git a/src/main/res/drawable-anydpi-v21/ic_close.xml b/src/main/res/drawable-anydpi-v21/ic_close.xml
new file mode 100644
index 00000000..d11cc5c9
--- /dev/null
+++ b/src/main/res/drawable-anydpi-v21/ic_close.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/src/main/res/drawable-hdpi/ic_check.png b/src/main/res/drawable-hdpi/ic_check.png
new file mode 100644
index 0000000000000000000000000000000000000000..729f290104788ce25a026cd1842e625ed29469d3
GIT binary patch
literal 181
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8ji-xah{y4_S9bF@81T3TmS5N?
z#C(9Q$LV3`iyt|zzNMK?OD+gTJ2maGvJ86jqI1fWJrY@L@@dRh+8HxyC3MfUOIWFC
zSzj(@_&m4jkH)bAn}wUwn%lHbyQcPAEcKb)b;T<=reaCi=lz``&(3vDxn&&?D<LQt
e{CnyjZS^{VAA0!=HDy3|FnGH9xvX<aXaWH2@<NUP

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-hdpi/ic_close.png b/src/main/res/drawable-hdpi/ic_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..ceb1a1eebf2b2cc9a008f42010e144f4dab968de
GIT binary patch
literal 221
zcmV<303!d1P)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0001_Nkl<ZNXPBe
zOAf;z3`NnvzLLeX&8G5ODmR1D52avmqE5=2A|Dx9cGtDEyoUjkeYXrH%!p%3Q&=_}
zSGgMpkfN|`063v53^Vu4G4*7~^(<0VjHeb~u)GSYneUW}@zm-ISB#p8C_VG>og+*{
z>6z1@lfD*AYSPav7<hhhiWzwai<$J|R5R67ei_2WId<3{l%tn=x)q(;%kPeV%RglY
XS@w-?sj^|900000NkvXXu0mjfa64QO

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-mdpi/ic_check.png b/src/main/res/drawable-mdpi/ic_check.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfcb55d02bd8b9a70b0da278800e74ad3fac1577
GIT binary patch
literal 137
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i08bak5R2aA1PRt12kK)lO>zJK
z|MUJvlc)bXuNjm~`JeuC|Cf3T&Sn4kS-t-Kly_`O{%78>)n(FyvK7-bg!XV<bqYGs
luti|K%&JzAr^?I>3_cwNy;D|IOb43H;OXk;vd$@?2>^BlGsOS^

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-mdpi/ic_close.png b/src/main/res/drawable-mdpi/ic_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..af7f8288da6854204dcc4e6678b9053cd72032c4
GIT binary patch
literal 175
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iGEW!B5R21KC-3Avpdi4K$<+1X
zay^SH!@6{thMdKZi+L1hS^BMZUAdKCT}(HRw{NeWg~AlBHtr3jj>2B5kK^|J))MUC
zlz7ydwCsb8xn}W?^r?}5wtsjdmvX{3=JbT!J9sKPrYmk={m|7^>A|Z*7j^D$`>}ry
Zqi^Z9GQN4ct^!@a;OXk;vd$@?2>?I&LQeny

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xhdpi/ic_check.png b/src/main/res/drawable-xhdpi/ic_check.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b2b65d26291575f2741d223cdf80facb436dc20
GIT binary patch
literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DK2I0Nkcif|mv{3vD2TKsT6rJ;
zxO0YV_Rhw~KO`R95NK`?{Vrkn{Yy<f(?N;3e#@)NB@7FHGB-T^q@ZduPf%ly{FMLt
z`|GE=_e%0kj%QeNzSCykp+|jrFI~RfJsfvjnDYyhf3^3PM}LZ)disUtTF9#(`KhpR
ya^2eL2_HIJOypH0_DoOssCV#5sZ}haHRI)mIl|jd9moc{jKR~@&t;ucLK6Te9#8TB

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xhdpi/ic_close.png b/src/main/res/drawable-xhdpi/ic_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7c7ffd0e795ba76ed3a062566c9016448795f7a
GIT binary patch
literal 257
zcmV+c0sj7pP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002UNkl<ZSi|j>
zOA5m<3<U)_WPYbhYC;cbm@Wz>jYBNi%A&<@ZO?$P9};P4Y5CjG5$M&YXI45J{s}~#
zf|&?x1_gn4B7+hS@X!l}&!voFhmZP^sujifL@~PKMMM~{6xH}^g$q7WOzwCQ5vHTU
z6`v~H@rlA8e;CUh_(b84zg=+ih`wG<)HiJjzSlQx5#CnjMR;A)R^jtaTa9;7<U8lQ
zY2EPWP3wxUP_XL%>rSy)7O%~`cm?ZjXImW?6TYRT<;U^@VKiSj`soFk00000NkvXX
Hu0mjfhD&W|

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxhdpi/ic_check.png b/src/main/res/drawable-xxhdpi/ic_check.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c2ad771f72c8beaa5adbff66526893d8767990d
GIT binary patch
literal 276
zcmV+v0qg#WP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0002nNkl<ZXx{DC
z!41MN5Jb_ffC?av1VZ#j11XI{NP>i*jo}i373|mq*}I4NcaPr1vPBqUj4{So^{}zU
z+2V@M76*V4(wk$0gq_FHCw*~rLF6PjJvrp8;xy!tvzjxILyidcxS;vzge%E8;0~bA
zCza(K@t8(4No6@FJiXx|O)AO}!Fe{GAi-fQe6!HylPYi`B&W#9B~|3)kkD4;1WDtE
zgcdi2M<Pa2;>1XboCryi6C~+>FcwG}oCT5=CqmNX1W4MP8OZ|2BU#~0BugB|7-NjF
ae|iA|xq+-YC!0F}0000<MNUMnLSTZ0hICK>

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxhdpi/ic_close.png b/src/main/res/drawable-xxhdpi/ic_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b717e0dda8649aa3b5f1d6851ba0dd20cc4ea66
GIT binary patch
literal 347
zcmV-h0i^zkP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0003ZNkl<ZXx{DE
z$qj=r5QSk*P#lm(36WTegVW0)mXaWBuxGIk^A}(~iOrs>vMkH8EXyh{JTRapt<YdZ
z%g5OPOz9*vSOM%TB*#HI$#DQ+N5{uWB>iwcq@D(P;=ehLbl?EMKm*m7(@7_siS}}k
zNFtnck{HL4mc!ypcyUoqJV~4rM^fS3C#iAnkyJU3biCmDy`VZLOv=LXld^HVq<kFD
z?a9fxB<XX4q&yriDIcdeP+_;Mu!p*^*Z%aYJkyQ?+?<+r9AM|rPblo1ETro{di-%f
zl%q<zzu!?I#cjXDN%6ZuQBvCGG<+OT=ZKMLTXz8xUbLU)32CH(TIP}7Mjm{kV;p*J
tJagEdX)L^PPO3{9oLiP<S(asS_6B%=VW~4aPyhe`002ovPDHLkV1iG3n$iFO

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxxhdpi/ic_check.png b/src/main/res/drawable-xxxhdpi/ic_check.png
new file mode 100644
index 0000000000000000000000000000000000000000..d670618c7e96225f7756cb4c2743e7ebbf688cf8
GIT binary patch
literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%xcgetWt&hE&{od;P3vlYxj!B3Hnh
z1714EonD+``t$ZU)3IJ|2aboi6~%ilJM7!-={Kv*@R&q$518Ox)_m^XpXp1^&DOu%
zB6r^~@kqJ%j0e`LXFkL-JviL|Ir_(khlktw<?a6Le_;Rc@b|~Bmvon%`?GyXwv8fl
z{KpoZKM781bqa~m|30?sdv5>La#r83bn@|VwIw^gKjzH(>hUq>tlAsh9~)aj{(R+p
z`Qx=v&?j!r?}<)Pb+Jxa|B9Td>MRd7#ru4CATBh=u6rtH<j<*`Gk=P5-u%hU$@j;p
ziMw9yV5j}W2gl@9Ek0FquKSbUWIP|{e&ajrid&SOtArOt0)v6U)78&qol`;+03U&j
AI{*Lx

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxxhdpi/ic_close.png b/src/main/res/drawable-xxxhdpi/ic_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..39641921925f090e33df2767a4ee5e6d5911194f
GIT binary patch
literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0004dNkl<Zc-rln
z(UF5N3<cf5k#Y!~Lj&Z>32ETvhYyB39D^lU%DgQgv&#U%8l^-CA%qY@2qA=!B5=cm
zUgehujQG*l{{`@rPr!f|fEk^>KI9WteE@i<C2aJC6E^yK2|Inkgq^-t0w(-rsZaPv
z9{?u#fF6r{!h!x%<vk~#V5%>lV6HEl&_rJ@p_zU*;T}RirIc{5NocNLm*7JGdV(AM
zYYDFOvk5~8{Z*<k!KHqAf?NHv1lRhX6Wr_P6GG@`uJbF1ekLJ`esO|d{h|cl`X3Yg
z>t_>U=!XvoehUSEh=adIga45oe)B9kGgT}7UT3Cirmr(oHPv^YQ1-p=Hlh5u;xggf
zX{&yw+El-OrrKQJRl@b7x{HLmNkj95`a#LLnW{Veb2C+!`ppt#r)=g4@<T$?1f3bD
zVFE^-v(>?c8RY{yJj~W@W|h^mU4q`i)2y~Rw@J`jIh$1%|In!~{Tb{nMqaxlgb+dq
eA%qY@zJ@mriVM?qfwL0;0000<MNUMnLSTX@Q^zF$

literal 0
HcmV?d00001

diff --git a/src/main/res/layout/layout_apps.xml b/src/main/res/layout/layout_apps.xml
index 25a98750..0fd29a49 100644
--- a/src/main/res/layout/layout_apps.xml
+++ b/src/main/res/layout/layout_apps.xml
@@ -9,48 +9,34 @@
   <include layout="@layout/toolbar_light_dark"/>
   <LinearLayout android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:paddingLeft="48dp"
-                android:paddingStart="48dp"
                 android:elevation="1dp"
                 android:background="@android:color/white"
                 android:orientation="vertical"
                 tools:ignore="RtlSymmetry">
-    <LinearLayout
-            android:layout_width="fill_parent"
+    <Switch android:checked="true"
+            android:id="@+id/onSwitch"
+            android:text="@string/on"
+            android:textSize="18sp"
+            android:textColor="?android:attr/textColorSecondary"
+            android:paddingLeft="60dp"
+            android:paddingRight="8dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp">
-      <TextView
-              android:layout_width="0dp"
-              android:layout_weight="1"
-              android:layout_height="wrap_content"
-              android:padding="4dp"
-              android:gravity="center_vertical"
-              android:textSize="18sp"
-              android:text="@string/on"/>
-      <Switch android:checked="true"
-              android:id="@+id/onSwitch"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"/>
-    </LinearLayout>
-    <LinearLayout
-            android:layout_width="fill_parent"
+            tools:ignore="RtlHardcoded"/>
+    <Switch android:checked="true"
+            android:id="@+id/bypassSwitch"
+            android:text="@string/bypass_apps"
+            android:textSize="18sp"
+            android:textColor="?android:attr/textColorSecondary"
+            android:paddingLeft="60dp"
+            android:paddingRight="8dp"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp">
-      <TextView
-              android:id="@+id/bypassLabel"
-              android:layout_width="0dp"
-              android:layout_weight="1"
-              android:layout_height="wrap_content"
-              android:padding="4dp"
-              android:gravity="center_vertical"
-              android:textSize="18sp"
-              android:text="@string/bypass_apps"/>
-
-      <Switch
-              android:id="@+id/bypassSwitch"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"/>
-    </LinearLayout>
+            tools:ignore="RtlHardcoded"/>
   </LinearLayout>
   <FrameLayout android:layout_width="fill_parent"
                android:layout_height="0dp"
diff --git a/src/main/res/layout/layout_tasker.xml b/src/main/res/layout/layout_tasker.xml
index b534a537..4641264e 100644
--- a/src/main/res/layout/layout_tasker.xml
+++ b/src/main/res/layout/layout_tasker.xml
@@ -1,30 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-    <include layout="@layout/toolbar_light_dark" />
-    <RelativeLayout
-        android:padding="16dp"
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-        <Switch
-            android:layout_width="wrap_content"
+    <include layout="@layout/toolbar_light_dark" />
+    <Switch android:checked="true"
+            android:id="@+id/service_switch"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/toggle_service_state"
-            android:id="@+id/service_switch"
-            android:layout_centerHorizontal="true" />
-
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/save"
-            android:textColor="@android:color/white"
-            android:id="@+id/btn_save"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true" />
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
+            android:textSize="18sp"
+            android:textColor="?android:attr/textColorSecondary"
+            android:padding="16dp"/>
+</LinearLayout>
diff --git a/src/main/res/menu/add_profile_methods.xml b/src/main/res/menu/profile_manager_menu.xml
similarity index 100%
rename from src/main/res/menu/add_profile_methods.xml
rename to src/main/res/menu/profile_manager_menu.xml
diff --git a/src/main/res/menu/tasker_menu.xml b/src/main/res/menu/tasker_menu.xml
new file mode 100644
index 00000000..670f5ce0
--- /dev/null
+++ b/src/main/res/menu/tasker_menu.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:title="@string/save"
+          android:id="@+id/save"
+          android:icon="@drawable/ic_check"
+          android:alphabeticShortcut="s"
+          android:numericShortcut="0"
+          app:showAsAction="always"/>
+</menu>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 81f3df59..b1370ae7 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -106,6 +106,6 @@
   <string name="toggle_service_state">Toggle service state</string>
   <string name="save">Save</string>
   <string name="turn_service_state">Turn service %s</string>
-  <string name="state_on">On</string>
-  <string name="state_off">Off</string>
+  <string name="state_on">on</string>
+  <string name="state_off">off</string>
 </resources>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index dfde6612..302eb395 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -3,7 +3,7 @@
 <resources>
 
     <style name="Toolbar.Logo" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
-            <item name="android:textSize">24sp</item>
+        <item name="android:textSize">24sp</item>
     </style>
     <style name="Theme.Material" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:alertDialogTheme">@style/Theme.Material.Dialog.Alert</item>
diff --git a/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala b/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
index b597dbb6..77aa09ce 100644
--- a/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
+++ b/src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
@@ -148,7 +148,7 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe
       val intent = getParentActivityIntent
       if (intent == null) finish else navigateUpTo(intent)
     })
-    toolbar.inflateMenu(R.menu.add_profile_methods)
+    toolbar.inflateMenu(R.menu.profile_manager_menu)
     toolbar.setOnMenuItemClickListener(this)
 
     ShadowsocksApplication.profileManager.setProfileAddedListener(profilesAdapter.add)
diff --git a/src/main/scala/com/github/shadowsocks/TaskerActivity.scala b/src/main/scala/com/github/shadowsocks/TaskerActivity.scala
index 246cd2b7..b2759d52 100644
--- a/src/main/scala/com/github/shadowsocks/TaskerActivity.scala
+++ b/src/main/scala/com/github/shadowsocks/TaskerActivity.scala
@@ -44,8 +44,7 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.Toolbar
 import android.util.Log
-import android.view.View
-import android.widget.{Button, Switch}
+import android.widget.Switch
 import com.github.shadowsocks.helper.TaskerSettings
 import com.twofortyfouram.locale.api.{Intent => ApiIntent}
 
@@ -56,27 +55,29 @@ class TaskerActivity extends AppCompatActivity {
   var taskerOption: TaskerSettings = _
 
   var switch: Switch = _
-  var btnSave: Button = _
 
   override def onCreate(savedInstanceState: Bundle) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.layout_tasker)
 
     switch = findViewById(R.id.service_switch).asInstanceOf[Switch]
-    btnSave = findViewById(R.id.btn_save).asInstanceOf[Button]
 
     val toolbar = findViewById(R.id.toolbar).asInstanceOf[Toolbar]
     toolbar.setTitle(R.string.screen_name)
-    toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha)
+    toolbar.setNavigationIcon(R.drawable.ic_close)
     toolbar.setNavigationOnClickListener(_ => finish())
-
-    switch.setOnCheckedChangeListener((_, isChecked) => taskerOption.is_start = isChecked)
-    btnSave.setOnClickListener(_ => saveResult())
+    toolbar.inflateMenu(R.menu.tasker_menu)
+    toolbar.setOnMenuItemClickListener(_.getItemId match {
+      case R.id.save =>
+        saveResult()
+        true
+      case _ => false
+    })
 
     loadSettings()
   }
 
-  private def loadSettings(): Unit = {
+  private def loadSettings() {
     val intent: Intent = getIntent
     if (intent.getAction != ApiIntent.ACTION_EDIT_SETTING) {
       Log.w(Shadowsocks.TAG, "unknown tasker action")
@@ -89,7 +90,8 @@ class TaskerActivity extends AppCompatActivity {
     switch.setChecked(taskerOption.is_start)
   }
 
-  private def saveResult(): Unit = {
+  private def saveResult() {
+    taskerOption.is_start = switch.isChecked
     setResult(Activity.RESULT_OK, taskerOption.toIntent(this))
     finish()
   }

From e524ab8d2e2622d38c664eaa316d09cce6c2a647 Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Mon, 30 Nov 2015 20:56:17 +0800
Subject: [PATCH 2/5] Refine TaskerActivity title

---
 src/main/scala/com/github/shadowsocks/TaskerActivity.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/com/github/shadowsocks/TaskerActivity.scala b/src/main/scala/com/github/shadowsocks/TaskerActivity.scala
index b2759d52..6677b08a 100644
--- a/src/main/scala/com/github/shadowsocks/TaskerActivity.scala
+++ b/src/main/scala/com/github/shadowsocks/TaskerActivity.scala
@@ -63,7 +63,7 @@ class TaskerActivity extends AppCompatActivity {
     switch = findViewById(R.id.service_switch).asInstanceOf[Switch]
 
     val toolbar = findViewById(R.id.toolbar).asInstanceOf[Toolbar]
-    toolbar.setTitle(R.string.screen_name)
+    toolbar.setTitle(R.string.app_name)
     toolbar.setNavigationIcon(R.drawable.ic_close)
     toolbar.setNavigationOnClickListener(_ => finish())
     toolbar.inflateMenu(R.menu.tasker_menu)

From 7e8a5ac9df93ec47dd8f5f77a303975c8c618bd0 Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Mon, 30 Nov 2015 21:01:53 +0800
Subject: [PATCH 3/5] Refine AndroidManifest

---
 src/main/AndroidManifest.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index b2562202..49cba2f2 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -80,9 +80,7 @@
                 android:parentActivityName=".Shadowsocks"
                 android:launchMode="singleTask"/>
 
-        <activity android:name=".TaskerActivity"
-            android:icon="@drawable/ic_launcher"
-            android:launchMode="singleTask">
+        <activity android:name=".TaskerActivity">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
             </intent-filter>

From 624ccba55903571dd335d91d8a7df4fdca4059dd Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Mon, 30 Nov 2015 21:08:17 +0800
Subject: [PATCH 4/5] Refine padding

---
 src/main/res/layout/layout_apps.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/res/layout/layout_apps.xml b/src/main/res/layout/layout_apps.xml
index 0fd29a49..1985e184 100644
--- a/src/main/res/layout/layout_apps.xml
+++ b/src/main/res/layout/layout_apps.xml
@@ -20,8 +20,8 @@
             android:textColor="?android:attr/textColorSecondary"
             android:paddingLeft="60dp"
             android:paddingRight="8dp"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:ignore="RtlHardcoded"/>
@@ -32,8 +32,8 @@
             android:textColor="?android:attr/textColorSecondary"
             android:paddingLeft="60dp"
             android:paddingRight="8dp"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp"
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:ignore="RtlHardcoded"/>

From 52eb2607f9d8691331541e963c60902969d5009f Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Mon, 30 Nov 2015 21:10:12 +0800
Subject: [PATCH 5/5] Fix tasker warning

---
 src/main/AndroidManifest.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 49cba2f2..381e81cc 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -80,7 +80,8 @@
                 android:parentActivityName=".Shadowsocks"
                 android:launchMode="singleTask"/>
 
-        <activity android:name=".TaskerActivity">
+        <activity android:name=".TaskerActivity"
+                  android:icon="@drawable/ic_launcher">
             <intent-filter>
                 <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
             </intent-filter>