From b1ae94824cbb3a2e0ca70e4b6aa2d9aebcfa9d08 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Sat, 5 Mar 2016 17:44:40 +0800
Subject: [PATCH] Fix search bar show and hide

---
 .../ehviewer/ui/scene/GalleryListScene.java   | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
index f4a49d9c1..fd1839435 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
@@ -142,6 +142,15 @@ public final class GalleryListScene extends BaseScene
 
     private int mNavCheckedId = 0;
 
+    private final Runnable mReturnSearchBarRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (mSearchBarMover != null) {
+                mSearchBarMover.returnSearchBarPosition();
+            }
+        }
+    };
+
     private void handleArgs(Bundle args) {
         if (args == null) {
             return;
@@ -826,15 +835,11 @@ public final class GalleryListScene extends BaseScene
         }
 
         @Override
-        protected void onScrollToPosition() {
-            super.onScrollToPosition();
-
-            SimpleHandler.getInstance().post(new Runnable() {
-                @Override
-                public void run() {
-                    mSearchBarMover.returnSearchBarPosition();
-                }
-            });
+        protected void onHideRecyclerView() {
+            super.onHideRecyclerView();
+            if (mSearchBarMover != null) {
+                mSearchBarMover.showSearchBar();
+            }
         }
     }
 
@@ -843,7 +848,7 @@ public final class GalleryListScene extends BaseScene
                 mHelper.isCurrentTask(taskId) && isViewCreated()) {
             mHelper.setPages(taskId, result.pages);
             mHelper.onGetPageData(taskId, result.galleryInfos);
-            mSearchBarMover.returnSearchBarPosition();
+            SimpleHandler.getInstance().post(mReturnSearchBarRunnable);
         }
     }
 
@@ -851,7 +856,6 @@ public final class GalleryListScene extends BaseScene
         if (mHelper != null && mSearchBarMover != null &&
                 mHelper.isCurrentTask(taskId) && isViewCreated()) {
             mHelper.onGetExpection(taskId, e);
-            mSearchBarMover.returnSearchBarPosition();
         }
     }