From 2852309183ef8a0601f9d33fe0f379ae612b8ae0 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Mon, 26 Dec 2016 12:52:13 +0800
Subject: [PATCH] Move snackbar to the bottom

---
 src/main/res/layout/layout_global_settings.xml             | 4 ----
 src/main/res/layout/layout_main.xml                        | 7 ++++++-
 src/main/res/layout/layout_profile_config.xml              | 4 ----
 src/main/res/layout/layout_profiles.xml                    | 4 ----
 .../scala/com/github/shadowsocks/ProfilesFragment.scala    | 2 +-
 5 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/main/res/layout/layout_global_settings.xml b/src/main/res/layout/layout_global_settings.xml
index 9a44c366..38261be2 100644
--- a/src/main/res/layout/layout_global_settings.xml
+++ b/src/main/res/layout/layout_global_settings.xml
@@ -4,10 +4,6 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
     <include layout="@layout/toolbar_light_dark" />
-    <android.support.design.widget.CoordinatorLayout
-        android:id="@+id/snackbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
     <fragment android:id="@+id/content"
               class="com.github.shadowsocks.GlobalConfigFragment"
               android:layout_width="match_parent"
diff --git a/src/main/res/layout/layout_main.xml b/src/main/res/layout/layout_main.xml
index ce4dca64..c9ebbb4b 100644
--- a/src/main/res/layout/layout_main.xml
+++ b/src/main/res/layout/layout_main.xml
@@ -19,7 +19,7 @@
                   android:background="@drawable/background_stat"
                   android:orientation="vertical"
                   android:nextFocusRight="@+id/fab"
-                  android:layout_alignParentBottom="true">
+                  android:layout_above="@+id/snackbar">
         <TextView android:id="@+id/status"
                   android:textSize="16sp"
                   android:textColor="?android:attr/textColorPrimary"
@@ -81,4 +81,9 @@
                                                             app:srcCompat="@drawable/ic_start_idle"
                                                             app:pressedTranslationZ="6dp" app:borderWidth="0dp" />
     </com.github.jorgecastilloprz.FABProgressCircle>
+    <android.support.design.widget.CoordinatorLayout
+        android:id="@+id/snackbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true" />
 </RelativeLayout>
diff --git a/src/main/res/layout/layout_profile_config.xml b/src/main/res/layout/layout_profile_config.xml
index c4980567..62b2ba58 100644
--- a/src/main/res/layout/layout_profile_config.xml
+++ b/src/main/res/layout/layout_profile_config.xml
@@ -4,10 +4,6 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent">
     <include layout="@layout/toolbar_light_dark" />
-    <android.support.design.widget.CoordinatorLayout
-        android:id="@+id/snackbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
     <fragment android:id="@+id/content"
               class="com.github.shadowsocks.ProfileConfigFragment"
               android:layout_width="match_parent"
diff --git a/src/main/res/layout/layout_profiles.xml b/src/main/res/layout/layout_profiles.xml
index d3a9fe71..4e90d3bb 100644
--- a/src/main/res/layout/layout_profiles.xml
+++ b/src/main/res/layout/layout_profiles.xml
@@ -4,10 +4,6 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
     <include layout="@layout/toolbar_light_dark"/>
-    <android.support.design.widget.CoordinatorLayout
-        android:id="@+id/snackbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
     <android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
                                             android:id="@+id/profilesList"
                                             android:layout_width="match_parent"
diff --git a/src/main/scala/com/github/shadowsocks/ProfilesFragment.scala b/src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
index 154b58a2..b8f6bda2 100644
--- a/src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
+++ b/src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
@@ -252,7 +252,7 @@ final class ProfilesFragment extends ToolbarFragment with Toolbar.OnMenuItemClic
     layoutManager.scrollToPosition(profilesAdapter.profiles.zipWithIndex.collectFirst {
       case (profile, i) if profile.id == app.profileId => i
     }.getOrElse(-1))
-    undoManager = new UndoSnackbarManager[Profile](view.findViewById(R.id.snackbar), profilesAdapter.undo, profilesAdapter.commit)
+    undoManager = new UndoSnackbarManager[Profile](getActivity.findViewById(R.id.snackbar), profilesAdapter.undo, profilesAdapter.commit)
     new ItemTouchHelper(new SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN,
       ItemTouchHelper.START | ItemTouchHelper.END) {
       def onSwiped(viewHolder: ViewHolder, direction: Int) {