Merge remote-tracking branch 'shadowsocks/master' into noad

kaneawk · Dec 9, 2017 · f964b5e · f964b5e
2 parents 06397b8 + 040a6a2
commit f964b5e
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 6 deletions.
diff --git a/.github/faq.md b/.github/faq.md
@@ -3,9 +3,8 @@
 Cannot connect to server:
 
 1. Stop battery saver if it's active;
-2. If an upgrade breaks anything, do a manual reset first by pressing Reset at the end of the list;
-3. Check your config;
-4. Wipe app data.
+2. Check your config;
+3. Wipe app data.
 
 Crash: [Submit an issue](https://github.com/shadowsocks/shadowsocks-android/issues/new) with logcat attached, or submit a crash report to Google Play. Then, try wiping app data.
 

diff --git a/mobile/build.sbt b/mobile/build.sbt
@@ -4,8 +4,8 @@ enablePlugins(AndroidGms)
 android.useSupportVectors
 
 name := "shadowsocks"
-version := "4.3.2"
-versionCode := Some(198)
+version := "4.3.3"
+versionCode := Some(199)
 
 proguardOptions ++=
   "-dontwarn com.google.android.gms.internal.**" ::

diff --git a/mobile/src/main/res/drawable-v21/background_profile.xml b/mobile/src/main/res/drawable-v21/background_profile.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/material_primary_300" />
+        </shape>
+    </item>
+    <item>
+        <selector android:enterFadeDuration="@android:integer/config_mediumAnimTime"
+                  android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+            <item android:state_selected="true">
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/material_green_700" />
+                </shape>
+            </item>
+        </selector>
+    </item>
+    <item android:left="8dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+        </shape>
+    </item>
+    <item android:drawable="?android:attr/selectableItemBackground"/>
+</layer-list>
diff --git a/mobile/src/main/res/drawable/background_profile.xml b/mobile/src/main/res/drawable/background_profile.xml
@@ -20,5 +20,13 @@
             <solid android:color="@android:color/white" />
         </shape>
     </item>
-    <item android:drawable="?android:attr/selectableItemBackground"/>
+    <item>
+        <selector>
+            <item android:state_pressed="true">
+                <shape android:shape="rectangle">
+                    <solid android:color="#12000000" />
+                </shape>
+            </item>
+        </selector>
+    </item>
 </layer-list>