From 3f201eb29bdc7d3b42a4daf24d940137581d34f1 Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Thu, 9 Jun 2016 21:16:02 +0800
Subject: [PATCH] Fix connection test button too small

---
 src/main/res/drawable-v21/background_stat.xml           | 6 ++++++
 src/main/res/drawable/background_stat.xml               | 2 ++
 src/main/res/layout-w400dp/layout_main_stat_title.xml   | 1 -
 src/main/res/layout/layout_main.xml                     | 4 ++--
 src/main/res/layout/layout_main_stat_title.xml          | 1 -
 src/main/scala/com/github/shadowsocks/Shadowsocks.scala | 6 +++---
 6 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 src/main/res/drawable-v21/background_stat.xml
 create mode 100644 src/main/res/drawable/background_stat.xml

diff --git a/src/main/res/drawable-v21/background_stat.xml b/src/main/res/drawable-v21/background_stat.xml
new file mode 100644
index 00000000..baf76d50
--- /dev/null
+++ b/src/main/res/drawable-v21/background_stat.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
+    <item>
+        <color android:color="@color/material_accent_300"/>
+    </item>
+</ripple>
diff --git a/src/main/res/drawable/background_stat.xml b/src/main/res/drawable/background_stat.xml
new file mode 100644
index 00000000..cda31441
--- /dev/null
+++ b/src/main/res/drawable/background_stat.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<color xmlns:android="http://schemas.android.com/apk/res/android" android:color="@color/material_accent_300"/>
diff --git a/src/main/res/layout-w400dp/layout_main_stat_title.xml b/src/main/res/layout-w400dp/layout_main_stat_title.xml
index 03370531..703e08f8 100644
--- a/src/main/res/layout-w400dp/layout_main_stat_title.xml
+++ b/src/main/res/layout-w400dp/layout_main_stat_title.xml
@@ -6,6 +6,5 @@
               android:layout_width="wrap_content" android:layout_height="wrap_content"/>
     <TextView android:id="@+id/connection_test" android:gravity="end"
               android:textSize="14sp" android:textColor="?android:attr/textColorSecondary"
-              android:background="?attr/selectableItemBackgroundBorderless"
               android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1"/>
 </LinearLayout>
diff --git a/src/main/res/layout/layout_main.xml b/src/main/res/layout/layout_main.xml
index 4f8bf0cb..07bba7a1 100644
--- a/src/main/res/layout/layout_main.xml
+++ b/src/main/res/layout/layout_main.xml
@@ -10,10 +10,10 @@
         <LinearLayout android:id="@+id/stat" android:elevation="4dp" android:visibility="gone"
                       android:layout_width="match_parent" android:layout_height="wrap_content"
                       android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical"
-                      android:paddingStart="16dip" android:paddingEnd="88dip"
+                      android:paddingStart="16dip" android:paddingEnd="88dip" android:focusable="true"
                       android:paddingLeft="16dip" android:paddingRight="88dip"
                       android:paddingTop="16dip" android:paddingBottom="16dip"
-                      android:background="@color/material_accent_300" android:orientation="vertical">
+                      android:background="@drawable/background_stat" android:orientation="vertical">
             <include layout="@layout/layout_main_stat_title"/>
             <android.support.v7.widget.GridLayout android:layout_width="match_parent"
                                                   android:layout_height="wrap_content" app:columnCount="4">
diff --git a/src/main/res/layout/layout_main_stat_title.xml b/src/main/res/layout/layout_main_stat_title.xml
index 2e74c093..13d0d5e0 100644
--- a/src/main/res/layout/layout_main_stat_title.xml
+++ b/src/main/res/layout/layout_main_stat_title.xml
@@ -6,6 +6,5 @@
               android:layout_width="match_parent" android:layout_height="wrap_content"/>
     <TextView android:id="@+id/connection_test"
               android:textSize="14sp" android:textColor="?android:attr/textColorSecondary"
-              android:background="?attr/selectableItemBackgroundBorderless"
               android:layout_width="match_parent" android:layout_height="wrap_content"/>
 </LinearLayout>
diff --git a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
index f046eecf..9d02b59d 100644
--- a/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+++ b/src/main/scala/com/github/shadowsocks/Shadowsocks.scala
@@ -221,7 +221,7 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
   }
 
   private var testCount: Int = _
-  private lazy val stat = findViewById(R.id.stat)
+  private var stat: View = _
   private var connectionTestText: TextView = _
   private var txText: TextView = _
   private var rxText: TextView = _
@@ -370,13 +370,13 @@ class Shadowsocks extends AppCompatActivity with ServiceBoundContext {
     val tf = Typefaces.get(this, "fonts/Iceland.ttf")
     if (tf != null) title.setTypeface(tf)
 
+    stat = findViewById(R.id.stat)
     connectionTestText = findViewById(R.id.connection_test).asInstanceOf[TextView]
     txText = findViewById(R.id.tx).asInstanceOf[TextView]
     txRateText = findViewById(R.id.txRate).asInstanceOf[TextView]
     rxText = findViewById(R.id.rx).asInstanceOf[TextView]
     rxRateText = findViewById(R.id.rxRate).asInstanceOf[TextView]
-    connectionTestText.setFocusable(true)
-    connectionTestText.setOnClickListener(_ => {
+    stat.setOnClickListener(_ => {
       val id = synchronized {
         testCount += 1
         handler.post(() => connectionTestText.setText(R.string.connection_test_testing))