From 69d2bc1ee5a4aa379ee9186052e233e25a435422 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Thu, 5 Jan 2017 21:21:51 +0800
Subject: [PATCH] Set card background using StateListDrawable

---
 src/main/res/drawable/background_profile.xml  | 25 +++++++++++++++++++
 .../res/drawable/background_selectable.xml    | 15 -----------
 src/main/res/drawable/background_selected.xml | 15 -----------
 src/main/res/layout/layout_profile.xml        |  1 -
 .../github/shadowsocks/ProfilesFragment.scala |  7 +++---
 5 files changed, 29 insertions(+), 34 deletions(-)
 create mode 100644 src/main/res/drawable/background_profile.xml
 delete mode 100644 src/main/res/drawable/background_selectable.xml
 delete mode 100644 src/main/res/drawable/background_selected.xml

diff --git a/src/main/res/drawable/background_profile.xml b/src/main/res/drawable/background_profile.xml
new file mode 100644
index 00000000..fcd8889a
--- /dev/null
+++ b/src/main/res/drawable/background_profile.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <selector>
+            <item android:state_selected="true">
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/material_green_700" />
+                    <corners android:radius="4dp"/>
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/material_primary_300" />
+                    <corners android:radius="4dp"/>
+                </shape>
+            </item>
+        </selector>
+    </item>
+    <item android:left="8dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+            <corners android:bottomRightRadius="4dp" android:topRightRadius="4dp"/>
+        </shape>
+    </item>
+</layer-list>
diff --git a/src/main/res/drawable/background_selectable.xml b/src/main/res/drawable/background_selectable.xml
deleted file mode 100644
index e0a0868d..00000000
--- a/src/main/res/drawable/background_selectable.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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" />
-            <corners android:radius="4dp"/>
-        </shape>
-    </item>
-    <item android:left="8dp">
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/white" />
-            <corners android:bottomRightRadius="4dp" android:topRightRadius="4dp"/>
-        </shape>
-    </item>
-</layer-list>
diff --git a/src/main/res/drawable/background_selected.xml b/src/main/res/drawable/background_selected.xml
deleted file mode 100644
index 9d545ede..00000000
--- a/src/main/res/drawable/background_selected.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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_green_700" />
-            <corners android:radius="4dp"/>
-        </shape>
-    </item>
-    <item android:left="8dp">
-        <shape android:shape="rectangle">
-            <solid android:color="@android:color/white" />
-            <corners android:bottomRightRadius="4dp" android:topRightRadius="4dp"/>
-        </shape>
-    </item>
-</layer-list>
diff --git a/src/main/res/layout/layout_profile.xml b/src/main/res/layout/layout_profile.xml
index 6c2f282f..35cd1447 100644
--- a/src/main/res/layout/layout_profile.xml
+++ b/src/main/res/layout/layout_profile.xml
@@ -6,7 +6,6 @@
              android:layout_height="wrap_content">
     <com.github.shadowsocks.widget.BoundedCardView android:layout_width="match_parent"
                                                    android:layout_height="wrap_content"
-                                                   android:background="@drawable/background_selectable"
                                                    android:layout_marginTop="8dp"
                                                    android:layout_marginStart="8dp"
                                                    android:layout_marginEnd="8dp"
diff --git a/src/main/scala/com/github/shadowsocks/ProfilesFragment.scala b/src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
index 640e488b..48788fe7 100644
--- a/src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
+++ b/src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
@@ -79,11 +79,12 @@ final class ProfilesFragment extends ToolbarFragment with Toolbar.OnMenuItemClic
     private val title = itemView.findViewById(R.id.title).asInstanceOf[TextView]
     private val address = itemView.findViewById(R.id.address).asInstanceOf[TextView]
     private val traffic = itemView.findViewById(R.id.traffic).asInstanceOf[TextView]
-    private val indicator = itemView.findViewById(R.id.indicator).asInstanceOf[ViewGroup]
     private val edit = itemView.findViewById(R.id.edit)
     edit.setOnClickListener(_ => startConfig(item.id))
     edit.setOnLongClickListener(cardButtonLongClickListener)
     itemView.setOnClickListener(this)
+    // it will not take effect unless set in code
+    itemView.findViewById(R.id.indicator).setBackgroundResource(R.drawable.background_profile)
 
     private var adView: NativeExpressAdView = _
 
@@ -115,10 +116,10 @@ final class ProfilesFragment extends ToolbarFragment with Toolbar.OnMenuItemClic
         TrafficMonitor.formatTraffic(tx), TrafficMonitor.formatTraffic(rx)))
 
       if (item.id == app.profileId) {
-        indicator.setBackgroundResource(R.drawable.background_selected)
+        itemView.setSelected(true)
         selectedItem = this
       } else {
-        indicator.setBackgroundResource(R.drawable.background_selectable)
+        itemView.setSelected(false)
         if (selectedItem eq this) selectedItem = null
       }