1 files changed, 10 insertions, 23 deletions

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
index 0e88474..1b8ff04 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
@@ -36,6 +36,7 @@ import com.nostra13.universalimageloader.core.process.BitmapProcessor;
 

 import java.io.File;

 

+import icepick.State;

 import jp.co.recruit_mp.android.widget.HeaderFooterGridView;

 

 public class ComicListFragment extends Fragment implements OnItemClickListener {

@@ -52,8 +53,8 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 	private MainActivity m_activity;

 	private SharedPreferences m_prefs;

 	private ComicsListAdapter m_adapter;

-	private int m_mode = 0;

-	private String m_baseDirectory = "";

+	@State protected int m_mode = 0;

+	@State protected String m_baseDirectory = "";

 	private SwipeRefreshLayout m_swipeLayout;

 	private AnimationAdapter m_animationAdapter;

 	private ImageLoader m_imageLoader = ImageLoader.getInstance();

@@ -90,11 +91,11 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 		ImageView thumbnail;

 

 		public ComicsViewHolder(View v) {

-			name = (TextView) v.findViewById(R.id.file_name);

-			info = (TextView) v.findViewById(R.id.file_progress_info);

-			progressBar = (ProgressBar) v.findViewById(R.id.file_progress_bar);

-			overflow = (ImageView) v.findViewById(R.id.overflow);

-			thumbnail = (ImageView) v.findViewById(R.id.thumbnail);

+			name = v.findViewById(R.id.file_name);

+			info = v.findViewById(R.id.file_progress_info);

+			progressBar = v.findViewById(R.id.file_progress_bar);

+			overflow = v.findViewById(R.id.overflow);

+			thumbnail = v.findViewById(R.id.thumbnail);

 

 		}

 

@@ -266,13 +267,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 		

 		View view = inflater.inflate(R.layout.fragment_comics_grid, container, false);

 

-		if (savedInstanceState != null) {

-			m_mode = savedInstanceState.getInt("mode");

-			m_baseDirectory = savedInstanceState.getString("baseDir");

-		}

-

-		m_swipeLayout = (SwipeRefreshLayout) view.findViewById(R.id.comics_swipe_container);

-		

+		m_swipeLayout = view.findViewById(R.id.comics_swipe_container);

 	    m_swipeLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {

 			@Override

 			public void onRefresh() {

@@ -284,7 +279,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
        			new String[] { "filename" }, new int[] { R.id.file_name }, 0);

 		m_animationAdapter = new ScaleInAnimationAdapter(m_adapter);

 

-		HeaderFooterGridView grid = (HeaderFooterGridView) view.findViewById(R.id.comics_grid);

+		HeaderFooterGridView grid = view.findViewById(R.id.comics_grid);

 

 		if (m_prefs.getBoolean("enable_fab", true)) {

 			View footer = inflater.inflate(R.layout.comics_grid_footer, grid, false);

@@ -482,12 +477,4 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 	}

 

 

-	@Override

-	public void onSaveInstanceState(Bundle out) {

-		super.onSaveInstanceState(out);

-

-		out.putInt("mode", m_mode);

-		out.putString("baseDir", m_baseDirectory);

-	}

-	

 }