From 62e2d636baccb61512b8050e0f2f68c19f83755e Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Mon, 26 Dec 2016 12:15:41 +0800
Subject: [PATCH] Avoid overlapping snackbar

---
 src/main/res/layout/layout_global_settings.xml              | 4 ++++
 src/main/res/layout/layout_main.xml                         | 2 +-
 src/main/res/layout/layout_profile_config.xml               | 4 ++++
 src/main/res/layout/layout_profiles.xml                     | 4 ++++
 .../scala/com/github/shadowsocks/GlobalConfigFragment.scala | 2 +-
 src/main/scala/com/github/shadowsocks/MainActivity.scala    | 6 +++---
 .../scala/com/github/shadowsocks/ProfilesFragment.scala     | 2 +-
 .../com/github/shadowsocks/widget/UndoSnackbarManager.scala | 1 +
 8 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/res/layout/layout_global_settings.xml b/src/main/res/layout/layout_global_settings.xml
index 38261be2..9a44c366 100644
--- a/src/main/res/layout/layout_global_settings.xml
+++ b/src/main/res/layout/layout_global_settings.xml
@@ -4,6 +4,10 @@
               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 20b37318..ce4dca64 100644
--- a/src/main/res/layout/layout_main.xml
+++ b/src/main/res/layout/layout_main.xml
@@ -3,7 +3,7 @@
                 xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent" android:layout_height="match_parent"
                 tools:ignore="UnknownIdInLayout" android:clipChildren="false">
-    <FrameLayout android:id="@+id/content"
+    <android.support.design.widget.CoordinatorLayout android:id="@+id/content"
                  android:layout_width="match_parent"
                  android:layout_height="match_parent"
                  android:layout_above="@+id/stat"/>
diff --git a/src/main/res/layout/layout_profile_config.xml b/src/main/res/layout/layout_profile_config.xml
index 62b2ba58..c4980567 100644
--- a/src/main/res/layout/layout_profile_config.xml
+++ b/src/main/res/layout/layout_profile_config.xml
@@ -4,6 +4,10 @@
               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 4e90d3bb..d3a9fe71 100644
--- a/src/main/res/layout/layout_profiles.xml
+++ b/src/main/res/layout/layout_profiles.xml
@@ -4,6 +4,10 @@
               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/GlobalConfigFragment.scala b/src/main/scala/com/github/shadowsocks/GlobalConfigFragment.scala
index 0a85cf2f..35836357 100644
--- a/src/main/scala/com/github/shadowsocks/GlobalConfigFragment.scala
+++ b/src/main/scala/com/github/shadowsocks/GlobalConfigFragment.scala
@@ -46,7 +46,7 @@ class GlobalConfigFragment extends PreferenceFragment {
       val value = v.asInstanceOf[Boolean]
       val result = TcpFastOpen.enabled(value)
       if (result != null && result != "Success.")
-        Snackbar.make(getActivity.findViewById(android.R.id.content), result, Snackbar.LENGTH_LONG).show()
+        Snackbar.make(getActivity.findViewById(R.id.snackbar), result, Snackbar.LENGTH_LONG).show()
       value == TcpFastOpen.sendEnabled
     })
     if (!TcpFastOpen.supported) {
diff --git a/src/main/scala/com/github/shadowsocks/MainActivity.scala b/src/main/scala/com/github/shadowsocks/MainActivity.scala
index 8b3a64c3..33c276b7 100644
--- a/src/main/scala/com/github/shadowsocks/MainActivity.scala
+++ b/src/main/scala/com/github/shadowsocks/MainActivity.scala
@@ -105,7 +105,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
             fab.setEnabled(true)
             changeSwitch(checked = false)
             if (m != null) {
-              val snackbar = Snackbar.make(findViewById(android.R.id.content),
+              val snackbar = Snackbar.make(findViewById(R.id.snackbar),
                 getString(R.string.vpn_error).formatLocal(Locale.ENGLISH, m), Snackbar.LENGTH_LONG)
               if (m == getString(R.string.nat_no_root)) addDisableNatToSnackbar(snackbar)
               snackbar.show()
@@ -143,7 +143,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
     if (fab != null) fab.setEnabled(true)
     updateState()
     if (Build.VERSION.SDK_INT >= 21 && app.isNatEnabled) {
-      val snackbar = Snackbar.make(findViewById(android.R.id.content), R.string.nat_deprecated, Snackbar.LENGTH_LONG)
+      val snackbar = Snackbar.make(findViewById(R.id.snackbar), R.string.nat_deprecated, Snackbar.LENGTH_LONG)
       addDisableNatToSnackbar(snackbar)
       snackbar.show()
     }
@@ -276,7 +276,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
             synchronized(if (serviceStarted && testCount == id && app.isVpnEnabled) handler.post(() =>
               if (success) statusText.setText(result) else {
                 statusText.setText(R.string.connection_test_fail)
-                Snackbar.make(findViewById(android.R.id.content), result, Snackbar.LENGTH_LONG).show()
+                Snackbar.make(findViewById(R.id.snackbar), result, Snackbar.LENGTH_LONG).show()
               }))
           }
         }
diff --git a/src/main/scala/com/github/shadowsocks/ProfilesFragment.scala b/src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
index d04ab1f8..154b58a2 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](profilesList, profilesAdapter.undo, profilesAdapter.commit)
+    undoManager = new UndoSnackbarManager[Profile](view.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) {
diff --git a/src/main/scala/com/github/shadowsocks/widget/UndoSnackbarManager.scala b/src/main/scala/com/github/shadowsocks/widget/UndoSnackbarManager.scala
index e3e68922..64ce7fc4 100644
--- a/src/main/scala/com/github/shadowsocks/widget/UndoSnackbarManager.scala
+++ b/src/main/scala/com/github/shadowsocks/widget/UndoSnackbarManager.scala
@@ -22,6 +22,7 @@ package com.github.shadowsocks.widget
 
 import android.support.design.widget.Snackbar
 import android.view.View
+
 import com.github.shadowsocks.R
 
 import scala.collection.mutable.ArrayBuffer