1 files changed, 8 insertions, 22 deletions
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
index 85e7537..a514bd0 100644..100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicFragment.java
@@ -20,17 +20,18 @@ import org.fox.ttcomics2.archive.ComicArchive;
 
 import java.io.IOException;
 
+import icepick.State;
 import it.sephiroth.android.library.imagezoom.ImageViewTouch;
 
 public class ComicFragment extends Fragment implements GestureDetector.OnDoubleTapListener {
 	private final String TAG = this.getClass().getSimpleName();
 	
 	private SharedPreferences m_prefs;
-	private int m_page;
+	@State protected int m_page;
 	private ViewComicActivity m_activity;
 	private GestureDetector m_detector;
-	private boolean m_thumbnail = false;
-    private ComicArchive m_archive;
+	@State protected boolean m_thumbnail = false;
+    @State protected ComicArchive m_archive;
 	
 	public ComicFragment() {
 		super();
@@ -50,14 +51,7 @@ public class ComicFragment extends Fragment implements GestureDetector.OnDoubleT
 		
 		View view = inflater.inflate(R.layout.fragment_comic, container, false);
 		
-		final ImageViewTouch image = (ImageViewTouch) view.findViewById(R.id.comic_image);
-		
-		if (savedInstanceState != null) {
-			m_page = savedInstanceState.getInt("page");
-			m_thumbnail = savedInstanceState.getBoolean("thumbnail");
-            m_archive = savedInstanceState.getParcelable("archive");
-		}
-
+		final ImageViewTouch image = view.findViewById(R.id.comic_image);
         image.setFitToScreen(true);
 
         ImageLoader imageLoader = ImageLoader.getInstance();
@@ -110,7 +104,7 @@ public class ComicFragment extends Fragment implements GestureDetector.OnDoubleT
 	}
 	
 	private void onLeftSideTapped() {
-		ImageViewTouch image = (ImageViewTouch) getView().findViewById(R.id.comic_image);
+		ImageViewTouch image = getView().findViewById(R.id.comic_image);
 		
 		if (image != null) {
 			boolean atLeftEdge = !image.canScroll(1);
@@ -122,7 +116,7 @@ public class ComicFragment extends Fragment implements GestureDetector.OnDoubleT
 	}
 	
 	public boolean canScroll(int direction) {
-		ImageViewTouch image = (ImageViewTouch) getView().findViewById(R.id.comic_image);
+		ImageViewTouch image = getView().findViewById(R.id.comic_image);
 		
 		if (image != null) {
 			return image.canScroll(direction);
@@ -132,7 +126,7 @@ public class ComicFragment extends Fragment implements GestureDetector.OnDoubleT
 	}
 	
 	private void onRightSideTapped() {
-		ImageViewTouch image = (ImageViewTouch) getView().findViewById(R.id.comic_image);
+		ImageViewTouch image = getView().findViewById(R.id.comic_image);
 		
 		if (image != null) {
 			boolean atRightEdge = !image.canScroll(-1);
@@ -202,14 +196,6 @@ public class ComicFragment extends Fragment implements GestureDetector.OnDoubleT
 	}
 	
 	@Override
-	public void onSaveInstanceState(Bundle out) {
-		super.onSaveInstanceState(out);
-		out.putInt("page", m_page);
-		out.putBoolean("thumbnail", m_thumbnail);
-        out.putParcelable("archive", m_archive);
-	}
-
-	@Override
 	public boolean onDoubleTap(MotionEvent e) {
 		// TODO Auto-generated method stub
 		return false;