From c397bd0211970b8e0d7ac29ded8d8f8e213feeb2 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Wed, 13 Jun 2018 15:18:48 +0800
Subject: [PATCH] Close #276, save drawer view state

---
 .../com/hippo/ehviewer/ui/MainActivity.java   |  7 ++-
 .../hippo/ehviewer/ui/scene/BaseScene.java    | 51 ++++++++++++++++++-
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
index 17dc8f9bc..cd247facb 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
@@ -33,6 +33,7 @@ import android.support.design.widget.NavigationView;
 import android.support.design.widget.Snackbar;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.MenuItem;
 import android.view.View;
@@ -412,10 +413,12 @@ public final class MainActivity extends StageActivity
     public void onSceneViewCreated(SceneFragment scene, Bundle savedInstanceState) {
         super.onSceneViewCreated(scene, savedInstanceState);
 
+        Log.d("TAG", "onSceneViewCreated");
+
         if (scene instanceof BaseScene && mRightDrawer != null && mDrawerLayout != null) {
             BaseScene baseScene = (BaseScene) scene;
             mRightDrawer.removeAllViews();
-            View drawerView = baseScene.onCreateDrawerView(
+            View drawerView = baseScene.createDrawerView(
                     baseScene.getLayoutInflater2(), mRightDrawer, savedInstanceState);
             if (drawerView != null) {
                 mRightDrawer.addView(drawerView);
@@ -432,7 +435,7 @@ public final class MainActivity extends StageActivity
 
         if (scene instanceof BaseScene) {
             BaseScene baseScene = (BaseScene) scene;
-            baseScene.onDestroyDrawerView();
+            baseScene.destroyDrawerView();
         }
     }
 
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
index 4734f80ba..c5db36ea5 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
@@ -19,18 +19,20 @@ package com.hippo.ehviewer.ui.scene;
 import android.content.Context;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.support.annotation.IdRes;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.StringRes;
 import android.support.annotation.StyleRes;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.widget.DrawerLayout;
+import android.util.SparseArray;
 import android.view.ContextThemeWrapper;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-
 import com.hippo.ehviewer.ui.MainActivity;
 import com.hippo.scene.SceneFragment;
 import com.hippo.util.AppHelper;
@@ -40,8 +42,16 @@ public abstract class BaseScene extends SceneFragment {
     public static final int LENGTH_SHORT = 0;
     public static final int LENGTH_LONG = 1;
 
+    public static final String KEY_DRAWER_VIEW_STATE =
+        "com.hippo.ehviewer.ui.scene.BaseScene:DRAWER_VIEW_STATE";
+
     private Context mThemeContext;
 
+    @Nullable
+    private View drawerView;
+    @Nullable
+    private SparseArray<Parcelable> drawerViewState;
+
     public void updateAvatar() {
         FragmentActivity activity = getActivity();
         if (activity instanceof MainActivity) {
@@ -132,11 +142,39 @@ public abstract class BaseScene extends SceneFragment {
         return 0;
     }
 
+    public final View createDrawerView(LayoutInflater inflater,
+        @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        drawerView = onCreateDrawerView(inflater, container, savedInstanceState);
+
+        if (drawerView != null) {
+            SparseArray<Parcelable> saved = drawerViewState;
+            if (saved == null && savedInstanceState != null) {
+                saved = savedInstanceState.getSparseParcelableArray(KEY_DRAWER_VIEW_STATE);
+            }
+            if (saved != null) {
+                drawerView.restoreHierarchyState(saved);
+            }
+        }
+
+        return drawerView;
+    }
+
     public View onCreateDrawerView(LayoutInflater inflater,
             @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         return null;
     }
 
+    public final void destroyDrawerView() {
+        if (drawerView != null) {
+            drawerViewState = new SparseArray<>();
+            drawerView.saveHierarchyState(drawerViewState);
+        }
+
+        onDestroyDrawerView();
+
+        drawerView = null;
+    }
+
     public void onDestroyDrawerView() {
     }
 
@@ -222,4 +260,15 @@ public abstract class BaseScene extends SceneFragment {
             AppHelper.showSoftInput(activity, view);
         }
     }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        if (drawerView != null) {
+            drawerViewState = new SparseArray<>();
+            drawerView.saveHierarchyState(drawerViewState);
+            outState.putSparseParcelableArray(KEY_DRAWER_VIEW_STATE, drawerViewState);
+        }
+    }
 }