From 2a7e905bac98a3b37e981a315750ef25837bd351 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Tue, 27 Jan 2015 10:42:31 +0800
Subject: [PATCH] Improve scene

---
 .idea/copyright/Apache.xml                    |  2 +-
 app/build.gradle                              |  1 +
 app/src/main/AndroidManifest.xml              |  7 +++
 .../hippo/ehviewer/ui/ContentActivity.java    | 43 +++++++++++++++++++
 .../com/hippo/ehviewer/ui/StartActivity.java  |  5 ++-
 .../ehviewer/ui/scene/GalleryDetailScene.java | 42 ++++++++++++++++++
 .../ehviewer/ui/scene/GalleryListScene.java   | 42 ++++++++++++++++++
 app/src/main/java/com/hippo/scene/Scene.java  | 16 ++++---
 .../java/com/hippo/scene/StageActivity.java   | 15 +++++--
 app/src/main/res/layout/activity_content.xml  | 25 +++++++++++
 .../main/res/layout/scene_gallery_detail.xml  | 21 +++++++++
 .../main/res/layout/scene_gallery_list.xml    | 21 +++++++++
 12 files changed, 228 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/java/com/hippo/ehviewer/ui/ContentActivity.java
 create mode 100644 app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
 create mode 100644 app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
 create mode 100644 app/src/main/res/layout/activity_content.xml
 create mode 100644 app/src/main/res/layout/scene_gallery_detail.xml
 create mode 100644 app/src/main/res/layout/scene_gallery_list.xml

diff --git a/.idea/copyright/Apache.xml b/.idea/copyright/Apache.xml
index ba8d8714a..3bbf1c12f 100644
--- a/.idea/copyright/Apache.xml
+++ b/.idea/copyright/Apache.xml
@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
   <copyright>
-    <option name="notice" value="Copyright (C) 2014-2015 Hippo Seven&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;     http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+    <option name="notice" value="Copyright (C) 2015 Hippo Seven&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;     http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
     <option name="keyword" value="Copyright" />
     <option name="allowReplaceKeyword" value="" />
     <option name="myName" value="Apache" />
diff --git a/app/build.gradle b/app/build.gradle
index 5c257bde3..86cf840e9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,6 +24,7 @@ android {
 }
 
 dependencies {
+    compile 'com.android.support:support-v4:21.0.3'
     compile 'com.android.support:appcompat-v7:21.0.3'
     compile 'com.android.support:recyclerview-v7:21.0.3'
     compile 'com.github.japgolly.android:svg-android:2.0.6'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 069d9dc9f..f52334242 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,6 +36,13 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name="com.hippo.ehviewer.ui.ContentActivity"
+            android:configChanges="screenSize|uiMode"
+            android:label="@string/app_name"
+            android:theme="@style/AppTheme">
+        </activity>
+
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/ContentActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/ContentActivity.java
new file mode 100644
index 000000000..69f05e52e
--- /dev/null
+++ b/app/src/main/java/com/hippo/ehviewer/ui/ContentActivity.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2015 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.ehviewer.ui;
+
+import android.os.Bundle;
+import android.widget.FrameLayout;
+
+import com.hippo.ehviewer.R;
+import com.hippo.ehviewer.ui.scene.GalleryListScene;
+import com.hippo.scene.StageActivity;
+
+public class ContentActivity extends StageActivity {
+
+    private FrameLayout mStage;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_content);
+
+        mStage = (FrameLayout) findViewById(R.id.stage);
+
+        startFirstScene(GalleryListScene.class);
+    }
+
+    @Override
+    public FrameLayout getStageView() {
+        return mStage;
+    }
+}
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/StartActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/StartActivity.java
index e6051f04b..e97a3feea 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/StartActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/StartActivity.java
@@ -15,6 +15,7 @@
 
 package com.hippo.ehviewer.ui;
 
+import android.content.Intent;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.widget.ImageView;
@@ -50,7 +51,9 @@ public class StartActivity extends AbsActionBarActivity {
         postDelayed(new Runnable() {
             @Override
             public void run() {
-                // TODO
+                finish();
+                Intent intent = new Intent(StartActivity.this, ContentActivity.class);
+                startActivity(intent);
             }
         }, 3000);
 
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
new file mode 100644
index 000000000..89b3b05f7
--- /dev/null
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2015 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.ehviewer.ui.scene;
+
+import com.hippo.ehviewer.R;
+import com.hippo.scene.Scene;
+
+public class GalleryDetailScene extends Scene {
+
+    @Override
+    public void onCreate() {
+        setContentView(R.layout.scene_gallery_detail);
+    }
+
+    @Override
+    public void onResume() {
+        // Empty
+    }
+
+    @Override
+    public void onPause() {
+        dispatchRemove();
+    }
+
+    @Override
+    public void onDestroy() {
+        dispatchRemove();
+    }
+}
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
new file mode 100644
index 000000000..5db84fc9d
--- /dev/null
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2014-2015 Hippo Seven
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.hippo.ehviewer.ui.scene;
+
+import com.hippo.ehviewer.R;
+import com.hippo.scene.Scene;
+
+public class GalleryListScene extends Scene {
+
+    @Override
+    public void onCreate() {
+        setContentView(R.layout.scene_gallery_list);
+    }
+
+    @Override
+    public void onResume() {
+        // Empty
+    }
+
+    @Override
+    public void onPause() {
+        dispatchRemove();
+    }
+
+    @Override
+    public void onDestroy() {
+        dispatchRemove();
+    }
+}
diff --git a/app/src/main/java/com/hippo/scene/Scene.java b/app/src/main/java/com/hippo/scene/Scene.java
index f882ce8e9..98ed2914a 100644
--- a/app/src/main/java/com/hippo/scene/Scene.java
+++ b/app/src/main/java/com/hippo/scene/Scene.java
@@ -24,7 +24,7 @@ import com.hippo.util.AssertUtils;
  * {@link com.hippo.scene.Scene} is a {@code Activity} of {@link android.app.Activity}.
  * <p>
  * When start a new {@code Scene}, previous {@code Scene} can stay at screen for
- * a while.
+ * a while. Or retain for a while before destroy.
  */
 public abstract class Scene {
 
@@ -74,12 +74,14 @@ public abstract class Scene {
         mStageActivity.addSceneView(this);
     }
 
-    void pause() {
-        onPause();
-    }
-
     void resume() {
         onResume();
+
+        mStageActivity.addSceneView(this);
+    }
+
+    void pause() {
+        onPause();
     }
 
     void destroy() {
@@ -91,10 +93,10 @@ public abstract class Scene {
      */
     public abstract void onCreate();
 
-    public abstract void onPause();
-
     public abstract void onResume();
 
+    public abstract void onPause();
+
     public abstract void onDestroy();
 
     /**
diff --git a/app/src/main/java/com/hippo/scene/StageActivity.java b/app/src/main/java/com/hippo/scene/StageActivity.java
index db3d42334..633bd902b 100644
--- a/app/src/main/java/com/hippo/scene/StageActivity.java
+++ b/app/src/main/java/com/hippo/scene/StageActivity.java
@@ -49,6 +49,7 @@ public abstract class StageActivity extends AbsActionBarActivity {
 
         Scene lastScene = mCurrentScene;
         mCurrentScene = scene;
+        mCurrentScene.create();
         if (lastScene != null) {
             // It is not the first scense
             mSceneStack.push(lastScene);
@@ -56,7 +57,6 @@ public abstract class StageActivity extends AbsActionBarActivity {
             mRetainedScene = lastScene;
             lastScene.pause();
         }
-        mCurrentScene.create();
     }
 
     private void popScense() {
@@ -67,10 +67,10 @@ public abstract class StageActivity extends AbsActionBarActivity {
         } else {
             Scene previousScene = mCurrentScene;
             mCurrentScene = mSceneStack.pop();
-
             mRetainedScene = previousScene;
-            previousScene.destroy();
+
             mCurrentScene.resume();
+            previousScene.destroy();
         }
     }
 
@@ -109,6 +109,15 @@ public abstract class StageActivity extends AbsActionBarActivity {
         }
     }
 
+    protected void startFirstScene(Class sceneClass) {
+        if (mCurrentScene != null) {
+            throw new IllegalStateException("Only call startFirstScene to start " +
+                    "first scene.");
+        }
+
+        pushScene(sceneClass);
+    }
+
     void startScene(Scene fromScene, Class sceneClass) {
         if (mRetainedScene == null) {
             // No retained scene, no animation
diff --git a/app/src/main/res/layout/activity_content.xml b/app/src/main/res/layout/activity_content.xml
new file mode 100644
index 000000000..bfb436d6c
--- /dev/null
+++ b/app/src/main/res/layout/activity_content.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2014-2015 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/stage"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/scene_gallery_detail.xml b/app/src/main/res/layout/scene_gallery_detail.xml
new file mode 100644
index 000000000..f67f21ba3
--- /dev/null
+++ b/app/src/main/res/layout/scene_gallery_detail.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/scene_gallery_list.xml b/app/src/main/res/layout/scene_gallery_list.xml
new file mode 100644
index 000000000..f67f21ba3
--- /dev/null
+++ b/app/src/main/res/layout/scene_gallery_list.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2015 Hippo Seven
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>