Add up react to SnackBar

app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java

@@ -67,6 +67,7 @@ import com.hippo.ehviewer.ui.scene.SelectSiteScene;
 import com.hippo.ehviewer.ui.scene.SignInScene;
 import com.hippo.ehviewer.ui.scene.WarningScene;
 import com.hippo.ehviewer.ui.scene.WebViewSignInScene;
+import com.hippo.ehviewer.widget.EhDrawerLayout;
 import com.hippo.io.UniFileInputStreamPipe;
 import com.hippo.scene.Announcer;
 import com.hippo.scene.SceneFragment;
@@ -110,7 +111,7 @@ public final class MainActivity extends StageActivity
      Whole life cycle
      ---------------*/
     @Nullable
-    private DrawerLayout mDrawerLayout;
+    private EhDrawerLayout mDrawerLayout;
     @Nullable
     private NavigationView mNavView;
     @Nullable
@@ -358,7 +359,7 @@ public final class MainActivity extends StageActivity
     protected void onCreate2(@Nullable Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
 
-        mDrawerLayout = (DrawerLayout) ViewUtils.$$(this, R.id.draw_view);
+        mDrawerLayout = (EhDrawerLayout) ViewUtils.$$(this, R.id.draw_view);
         mNavView = (NavigationView) ViewUtils.$$(this, R.id.nav_view);
         mRightDrawer = (FrameLayout) ViewUtils.$$(this, R.id.right_drawer);
         View headerLayout = mNavView.getHeaderView(0);
@@ -493,6 +494,18 @@ public final class MainActivity extends StageActivity
         mDisplayName.setText(displayName);
     }
 
+    public void addAboveSnackView(View view) {
+        if (mDrawerLayout != null) {
+            mDrawerLayout.addAboveSnackView(view);
+        }
+    }
+
+    public void removeAboveSnackView(View view) {
+        if (mDrawerLayout != null) {
+            mDrawerLayout.removeAboveSnackView(view);
+        }
+    }
+
     public int getDrawerLockMode(int edgeGravity) {
         if (mDrawerLayout != null) {
             return mDrawerLayout.getDrawerLockMode(edgeGravity);

app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java

@@ -49,6 +49,20 @@ public abstract class BaseScene extends SceneFragment {
         }
     }
 
+    public void addAboveSnackView(View view) {
+        FragmentActivity activity = getActivity();
+        if (activity instanceof MainActivity) {
+            ((MainActivity) activity).addAboveSnackView(view);
+        }
+    }
+
+    public void removeAboveSnackView(View view) {
+        FragmentActivity activity = getActivity();
+        if (activity instanceof MainActivity) {
+            ((MainActivity) activity).removeAboveSnackView(view);
+        }
+    }
+
     public void setDrawerLockMode(int lockMode, int edgeGravity) {
         FragmentActivity activity = getActivity();
         if (activity instanceof MainActivity) {

app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java

@@ -327,6 +327,7 @@ public class DownloadsScene extends ToolbarScene
         mFabLayout.setHidePrimaryFab(true);
         mFabLayout.setAutoCancel(false);
         mFabLayout.setOnClickFabListener(this);
+        addAboveSnackView(mFabLayout);
 
         updateView();
 
@@ -437,9 +438,12 @@ public class DownloadsScene extends ToolbarScene
             mRecyclerView.stopScroll();
             mRecyclerView = null;
         }
+        if (null != mFabLayout) {
+            removeAboveSnackView(mFabLayout);
+            mFabLayout = null;
+        }
 
         mRecyclerView = null;
-        mFabLayout = null;
         mViewTransition = null;
         mAdapter = null;
         mLayoutManager = null;

app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java

@@ -278,6 +278,7 @@ public class FavoritesScene extends BaseScene implements
         mFabLayout.setAutoCancel(false);
         mFabLayout.setHidePrimaryFab(true);
         mFabLayout.setOnClickFabListener(this);
+        addAboveSnackView(mFabLayout);
 
         // Restore search mode
         if (mSearchMode) {
@@ -393,11 +394,14 @@ public class FavoritesScene extends BaseScene implements
             mRecyclerView.stopScroll();
             mRecyclerView = null;
         }
+        if (null != mFabLayout) {
+            removeAboveSnackView(mFabLayout);
+            mFabLayout = null;
+        }
 
         mAdapter = null;
 
         mSearchBar = null;
-        mFabLayout = null;
 
         mSearchBarMover = null;
         mLeftDrawable = null;

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java

@@ -72,6 +72,7 @@ import com.hippo.util.DrawableManager;
 import com.hippo.util.ReadableTime;
 import com.hippo.util.TextUrl;
 import com.hippo.view.ViewTransition;
+import com.hippo.widget.FabLayout;
 import com.hippo.widget.LinkifyTextView;
 import com.hippo.yorozuya.AnimationUtils;
 import com.hippo.yorozuya.AssertUtils;
@@ -107,6 +108,8 @@ public final class GalleryCommentsScene extends ToolbarScene
     @Nullable
     private EasyRecyclerView mRecyclerView;
     @Nullable
+    private FabLayout mFabLayout;
+    @Nullable
     private FloatingActionButton mFab;
     @Nullable
     private View mEditPanel;
@@ -182,6 +185,7 @@ public final class GalleryCommentsScene extends ToolbarScene
         mEditPanel = ViewUtils.$$(view, R.id.edit_panel);
         mSendImage = (ImageView) ViewUtils.$$(mEditPanel, R.id.send);
         mEditText = (EditText) ViewUtils.$$(mEditPanel, R.id.edit_text);
+        mFabLayout = (FabLayout) ViewUtils.$$(view, R.id.fab_layout);
         mFab = (FloatingActionButton) ViewUtils.$$(view, R.id.fab);
 
         Context context = getContext2();
@@ -216,6 +220,9 @@ public final class GalleryCommentsScene extends ToolbarScene
         mSendImage.setOnClickListener(this);
         mFab.setOnClickListener(this);
 
+        addAboveSnackView(mEditPanel);
+        addAboveSnackView(mFabLayout);
+
         mViewTransition = new ViewTransition(mRecyclerView, tip);
 
         updateView(false);
@@ -231,9 +238,16 @@ public final class GalleryCommentsScene extends ToolbarScene
             mRecyclerView.stopScroll();
             mRecyclerView = null;
         }
+        if (null != mEditPanel) {
+            removeAboveSnackView(mEditPanel);
+            mEditPanel = null;
+        }
+        if (null != mFabLayout) {
+            removeAboveSnackView(mFabLayout);
+            mFabLayout = null;
+        }
 
         mFab = null;
-        mEditPanel = null;
         mSendImage = null;
         mEditText = null;
         mAdapter = null;

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java

@@ -442,6 +442,7 @@ public final class GalleryListScene extends BaseScene
         mFabLayout.setHidePrimaryFab(false);
         mFabLayout.setOnClickFabListener(this);
         mFabLayout.setOnExpandListener(this);
+        addAboveSnackView(mFabLayout);
 
         mActionFabDrawable = new AddDeleteDrawable(context);
         mActionFabDrawable.setColor(resources.getColor(R.color.primary_drawable_dark));
@@ -521,11 +522,14 @@ public final class GalleryListScene extends BaseScene
             mRecyclerView.stopScroll();
             mRecyclerView = null;
         }
+        if (null != mFabLayout) {
+            removeAboveSnackView(mFabLayout);
+            mFabLayout = null;
+        }
 
         mAdapter = null;
         mSearchLayout = null;
         mSearchBar = null;
-        mFabLayout = null;
         mSearchFab = null;
         mViewTransition = null;
         mLeftDrawable = null;