From 5c936ce900240cdf418332e31b3e404915beeb7c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 11 Jun 2015 10:39:58 +0300
Subject: save selected tab when switching activities

---
 .../main/java/org/fox/ttcomics2/ComicListFragment.java  | 17 +----------------
 .../src/main/java/org/fox/ttcomics2/MainActivity.java   |  3 ++-
 2 files changed, 3 insertions(+), 17 deletions(-)

(limited to 'org.fox.ttcomics')

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 f9a3ccc..362719c 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
@@ -11,7 +11,6 @@ import android.provider.BaseColumns;
 import android.support.v4.app.Fragment;
 import android.support.v4.widget.SimpleCursorAdapter;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
@@ -63,9 +62,7 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 	}
 
 	public void setBaseDirectory(String baseDirectory) {
-		Log.d(TAG, "setBaseDirectory=" + baseDirectory);
-
-		m_baseDirectory = baseDirectory;		
+		m_baseDirectory = baseDirectory;
 	}
 	
 	public void setMode(int mode) {
@@ -235,25 +232,15 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 			return convertView;
 		}
 	}
-	
-	public int dpToPx(int dp) {
-	    DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
-	    int px = Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));       
-	    return px;
-	}
 
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {    	
 		
 		View view = inflater.inflate(R.layout.fragment_comics_grid, container, false);
 
-		Log.d(TAG, "onCreateView SIS=" + savedInstanceState);
-
 		if (savedInstanceState != null) {
 			m_mode = savedInstanceState.getInt("mode");
 			m_baseDirectory = savedInstanceState.getString("baseDir");
-		} else {
-
 		}
 
 		m_swipeLayout = (SwipeRefreshLayout) view.findViewById(R.id.comics_swipe_container);
@@ -485,8 +472,6 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 
 		out.putInt("mode", m_mode);
 		out.putString("baseDir", m_baseDirectory);
-
-		Log.d(TAG, "onSaveInstanceState out=" + out);
 	}
 	
 }
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
index 023fd2d..37eb53b 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
@@ -73,7 +73,7 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
 		tabHost = (MaterialTabHost) this.findViewById(R.id.materialTabHost);
 
     	if (savedInstanceState == null) {
-			m_selectedTab = 0; //getIntent().getIntExtra("selectedTab", 0);
+			m_selectedTab = getIntent().getIntExtra("selectedTab", 0);
 
 			//Log.d(TAG, "selTab=" + m_selectedTab);
 
@@ -254,6 +254,7 @@ public class MainActivity extends CommonActivity implements MaterialTabListener
 			Intent intent = new Intent(MainActivity.this,
 					MainActivity.class);
 
+			intent.putExtra("selectedTab", m_selectedTab);
 			intent.putExtra("baseDir", fileName);
 
 			startActivity(intent);
-- 
cgit v1.2.3