From 8fd8514cc234ccbbd25489f12270c77003233713 Mon Sep 17 00:00:00 2001
From: Mygod <mygodstudio@gmail.com>
Date: Sat, 12 Mar 2016 11:14:55 +0800
Subject: [PATCH] Refine layout for #598

---
 src/main/res/layout/layout_quick_switch.xml   | 38 +++++++------------
 .../ShadowsocksQuickSwitchActivity.scala      |  9 ++---
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/src/main/res/layout/layout_quick_switch.xml b/src/main/res/layout/layout_quick_switch.xml
index b461f18d..954a7e56 100644
--- a/src/main/res/layout/layout_quick_switch.xml
+++ b/src/main/res/layout/layout_quick_switch.xml
@@ -1,34 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:orientation="vertical"
-              android:clickable="true"
-              android:foreground="@android:color/transparent"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <android.support.v7.widget.CardView
-        android:layout_height="260dp"
-        android:layout_width="match_parent"
+<android.support.v7.widget.CardView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
         android:layout_margin="8dp"
         android:layout_gravity="center_vertical"
-        android:clickable="true"
         app:cardElevation="5dp"
-        app:cardBackgroundColor="#EEEEEE"
-        >
+        app:cardBackgroundColor="#EEEEEE">
 
-        <LinearLayout
+    <LinearLayout
             android:orientation="vertical"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content">
 
-            <include layout="@layout/toolbar_light_dark"/>
+        <include layout="@layout/toolbar_light_dark"/>
 
-            <android.support.v7.widget.RecyclerView
+        <android.support.v7.widget.RecyclerView
                 android:id="@+id/profilesList"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
-        </LinearLayout>
-    </android.support.v7.widget.CardView>
-
-</LinearLayout>
\ No newline at end of file
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+    </LinearLayout>
+</android.support.v7.widget.CardView>
diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksQuickSwitchActivity.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksQuickSwitchActivity.scala
index 90519940..4467428a 100644
--- a/src/main/scala/com/github/shadowsocks/ShadowsocksQuickSwitchActivity.scala
+++ b/src/main/scala/com/github/shadowsocks/ShadowsocksQuickSwitchActivity.scala
@@ -27,11 +27,7 @@ class ShadowsocksQuickSwitchActivity extends AppCompatActivity {
     def bind(item: Profile) {
       this.item = item
       text.setText(item.name)
-      if (item.id == ShadowsocksApplication.profileId) {
-        text.setChecked(true)
-      } else {
-        text.setChecked(false)
-      }
+      text.setChecked(item.id == ShadowsocksApplication.profileId)
     }
 
     def onClick(v: View) {
@@ -74,5 +70,8 @@ class ShadowsocksQuickSwitchActivity extends AppCompatActivity {
     profilesList.setLayoutManager(lm)
     profilesList.setItemAnimator(new DefaultItemAnimator)
     profilesList.setAdapter(profilesAdapter)
+    if (ShadowsocksApplication.profileId >= 0) lm.scrollToPosition(profilesAdapter.profiles.zipWithIndex.collectFirst {
+      case (profile, i) if profile.id == ShadowsocksApplication.profileId => i + 1
+    }.getOrElse(0))
   }
 }