From 406661e346af26865d76764fc5209d8022290fcd Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Tue, 20 Dec 2016 13:54:17 +0800
Subject: [PATCH] Refine the layout

---
 src/main/res/layout/layout_profiles_item.xml                | 6 +++---
 .../scala/com/github/shadowsocks/GlobalConfigFragment.scala | 1 +
 src/main/scala/com/github/shadowsocks/MainActivity.scala    | 6 +++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/res/layout/layout_profiles_item.xml b/src/main/res/layout/layout_profiles_item.xml
index 1fb051b6..1046d900 100644
--- a/src/main/res/layout/layout_profiles_item.xml
+++ b/src/main/res/layout/layout_profiles_item.xml
@@ -44,7 +44,7 @@
         <LinearLayout android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="4dp"
             android:id="@+id/details">
             <TextView android:id="@+id/address"
                 android:layout_width="match_parent"
@@ -54,7 +54,7 @@
                 android:layout_weight="1"
                 android:maxLines="1"
                 android:ellipsize="end"
-                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="?android:attr/textColorSecondary"/>
             <TextView android:id="@+id/traffic"
                 android:layout_width="match_parent"
@@ -64,7 +64,7 @@
                 android:layout_weight="1"
                 android:maxLines="1"
                 android:ellipsize="end"
-                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="?android:attr/textColorSecondary"/>
         </LinearLayout>
     </LinearLayout>
diff --git a/src/main/scala/com/github/shadowsocks/GlobalConfigFragment.scala b/src/main/scala/com/github/shadowsocks/GlobalConfigFragment.scala
index 6cd64e1c..9654989a 100644
--- a/src/main/scala/com/github/shadowsocks/GlobalConfigFragment.scala
+++ b/src/main/scala/com/github/shadowsocks/GlobalConfigFragment.scala
@@ -66,4 +66,5 @@ class GlobalConfigFragment extends PreferenceFragment {
       progressDialog = null
     }
   }
+
 }
diff --git a/src/main/scala/com/github/shadowsocks/MainActivity.scala b/src/main/scala/com/github/shadowsocks/MainActivity.scala
index 0162dc84..0281b8cf 100644
--- a/src/main/scala/com/github/shadowsocks/MainActivity.scala
+++ b/src/main/scala/com/github/shadowsocks/MainActivity.scala
@@ -335,7 +335,11 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
   }
 
   private def displayFragment(fragment: ToolbarFragment) {
-    getFragmentManager.beginTransaction().replace(R.id.content, fragment).commitAllowingStateLoss()
+    val transaction = getFragmentManager.beginTransaction().replace(R.id.content, fragment)
+    if (fragment != profilesFragment)
+      transaction.addToBackStack(null).commitAllowingStateLoss()
+    else
+      transaction.commitAllowingStateLoss()
     drawer.closeDrawer()
   }