From 5ff56140fef0ae24793b3d4f0c644017bddbf25e Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Sun, 1 Mar 2015 15:08:48 +0800
Subject: [PATCH] Add state save for CategoryTable

---
 .../hippo/ehviewer/widget/CategoryTable.java  | 52 +++++++++++++++----
 .../main/res/layout/widget_category_table.xml | 10 ----
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/widget/CategoryTable.java b/app/src/main/java/com/hippo/ehviewer/widget/CategoryTable.java
index 64e2c130a..da9acda4d 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/CategoryTable.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/CategoryTable.java
@@ -16,8 +16,11 @@
 package com.hippo.ehviewer.widget;
 
 import android.content.Context;
+import android.os.Bundle;
+import android.os.Parcelable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
+import android.view.ViewGroup;
 import android.widget.TableLayout;
 
 import com.hippo.ehviewer.R;
@@ -27,6 +30,9 @@ import com.hippo.widget.CheckTextView;
 
 public class CategoryTable extends TableLayout {
 
+    private static final String STATE_KEY_SUPER = "super";
+    private static final String STATE_KEY_CATEGORY = "category";
+
     private CheckTextView mDoujinshi;
     private CheckTextView mManga;
     private CheckTextView mArtistCG;
@@ -52,16 +58,25 @@ public class CategoryTable extends TableLayout {
         LayoutInflater inflater = LayoutInflater.from(getContext());
         inflater.inflate(R.layout.widget_category_table, this);
 
-        mDoujinshi = (CheckTextView)findViewById(R.id.button_doujinshi);
-        mManga = (CheckTextView)findViewById(R.id.button_manga);
-        mArtistCG = (CheckTextView)findViewById(R.id.button_artistcg);
-        mGameCG = (CheckTextView)findViewById(R.id.button_gamecg);
-        mWestern = (CheckTextView)findViewById(R.id.button_western);
-        mNonH = (CheckTextView)findViewById(R.id.button_non_h);
-        mImageSets = (CheckTextView)findViewById(R.id.button_imageset);
-        mCosplay = (CheckTextView)findViewById(R.id.button_cosplay);
-        mAsianPorn = (CheckTextView)findViewById(R.id.button_asianporn);
-        mMisc = (CheckTextView)findViewById(R.id.button_misc);
+        ViewGroup row0 = (ViewGroup) getChildAt(0);
+        mDoujinshi = (CheckTextView) row0.getChildAt(0);
+        mManga = (CheckTextView) row0.getChildAt(1);
+
+        ViewGroup row1 = (ViewGroup) getChildAt(1);
+        mArtistCG = (CheckTextView) row1.getChildAt(0);
+        mGameCG = (CheckTextView) row1.getChildAt(1);
+
+        ViewGroup row2 = (ViewGroup) getChildAt(2);
+        mWestern = (CheckTextView) row2.getChildAt(0);
+        mNonH = (CheckTextView) row2.getChildAt(1);
+
+        ViewGroup row3 = (ViewGroup) getChildAt(3);
+        mImageSets = (CheckTextView) row3.getChildAt(0);
+        mCosplay = (CheckTextView) row3.getChildAt(1);
+
+        ViewGroup row4 = (ViewGroup) getChildAt(4);
+        mAsianPorn = (CheckTextView) row4.getChildAt(0);
+        mMisc = (CheckTextView) row4.getChildAt(1);
     }
 
     /**
@@ -100,4 +115,21 @@ public class CategoryTable extends TableLayout {
         if (!mMisc.isChecked()) category |= EhUtils.MISC;
         return category;
     }
+
+    @Override
+    public Parcelable onSaveInstanceState() {
+        final Bundle state = new Bundle();
+        state.putParcelable(STATE_KEY_SUPER, super.onSaveInstanceState());
+        state.putInt(STATE_KEY_CATEGORY, getCategory());
+        return state;
+    }
+
+    @Override
+    public void onRestoreInstanceState(Parcelable state) {
+        if (state instanceof Bundle) {
+            final Bundle savedState = (Bundle) state;
+            super.onRestoreInstanceState(savedState.getParcelable(STATE_KEY_SUPER));
+            setCategory(savedState.getInt(STATE_KEY_CATEGORY));
+        }
+    }
 }
diff --git a/app/src/main/res/layout/widget_category_table.xml b/app/src/main/res/layout/widget_category_table.xml
index 2b3ac04cc..d7787d07e 100644
--- a/app/src/main/res/layout/widget_category_table.xml
+++ b/app/src/main/res/layout/widget_category_table.xml
@@ -18,7 +18,6 @@
 
     <TableRow>
         <com.hippo.widget.CheckTextView
-            android:id="@+id/button_doujinshi"
             style="@style/CategoryText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -30,7 +29,6 @@
             android:text="@string/doujinshi" />
 
         <com.hippo.widget.CheckTextView
-            android:id="@+id/button_manga"
             style="@style/CategoryText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -44,7 +42,6 @@
 
     <TableRow>
         <com.hippo.widget.CheckTextView
-            android:id="@+id/button_artistcg"
             style="@style/CategoryText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -57,7 +54,6 @@
             android:text="@string/artist_cg" />
 
         <com.hippo.widget.CheckTextView
-            android:id="@+id/button_gamecg"
             style="@style/CategoryText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -72,7 +68,6 @@
 
     <TableRow>
         <com.hippo.widget.CheckTextView
-            android:id="@+id/button_western"
             style="@style/CategoryText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -85,7 +80,6 @@
             android:text="@string/western" />
 
         <com.hippo.widget.CheckTextView
-            android:id="@+id/button_non_h"
             style="@style/CategoryText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -100,7 +94,6 @@
 
     <TableRow>
         <com.hippo.widget.CheckTextView
-            android:id="@+id/button_imageset"
             style="@style/CategoryText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -113,7 +106,6 @@
             android:text="@string/image_set" />
 
         <com.hippo.widget.CheckTextView
-            android:id="@+id/button_cosplay"
             style="@style/CategoryText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -128,7 +120,6 @@
 
     <TableRow>
         <com.hippo.widget.CheckTextView
-            android:id="@+id/button_asianporn"
             style="@style/CategoryText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
@@ -140,7 +131,6 @@
             android:text="@string/asian_porn" />
 
         <com.hippo.widget.CheckTextView
-            android:id="@+id/button_misc"
             style="@style/CategoryText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"