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"> + - 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"> + + = 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