From 241eda606261f7b8c2840fa1d6421b45e72f1826 Mon Sep 17 00:00:00 2001
From: whitecat <gmail@c.albert-thompson.com>
Date: Tue, 9 Apr 2013 20:05:41 -0700
Subject: [PATCH 1/3] added a way to show unread comics only.
 https://github.com/applications4android/ComicReader/issues/96

---
 ComicReader/AndroidManifest.xml               |  2 +-
 .../res/layout/main_listview_content.xml      | 36 ++++-------
 ComicReader/res/values/arrays.xml             | 14 +++++
 ComicReader/res/xml/preferences.xml           |  8 +++
 .../comicreader/ActivityComicReader.java      | 60 ++++++++++++++++++-
 .../comicreader/core/Comic.java               | 57 +++++++++++++++++-
 6 files changed, 149 insertions(+), 28 deletions(-)

diff --git a/ComicReader/AndroidManifest.xml b/ComicReader/AndroidManifest.xml
index 4a59878..e265306 100755
--- a/ComicReader/AndroidManifest.xml
+++ b/ComicReader/AndroidManifest.xml
@@ -3,7 +3,7 @@
       package="com.blogspot.applications4android.comicreader"
       android:versionCode="26"
       android:installLocation="auto"
-      android:versionName="2.1.10" >
+      android:versionName="2.1.12" >
     <uses-sdk android:minSdkVersion="7" />
 
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/ComicReader/res/layout/main_listview_content.xml b/ComicReader/res/layout/main_listview_content.xml
index 7779d84..b87a575 100755
--- a/ComicReader/res/layout/main_listview_content.xml
+++ b/ComicReader/res/layout/main_listview_content.xml
@@ -19,28 +19,18 @@
 		android:textStyle="bold"
 		android:textColor="#ffffff"
 		android:gravity="center_vertical|center_horizontal" />
-   	<Button 
-   		android:gravity="center_vertical|center_horizontal"
-		android:id="@+id/comic_item_prev"
-		android:layout_width="45dp"
-		android:layout_height="wrap_content"
-		android:text="Prev"
-		android:background="@drawable/butt"
-		android:lines="3"
-		android:typeface="serif"
-		android:textStyle="bold"
-		android:textColor="#ffffff"
-		android:layout_marginRight="1dp" />
-	<Button 
+
+	<Button
+	    android:id="@+id/comic_item_scb"
+	    android:layout_width="45dp"
+	    android:layout_height="wrap_content"
+	    android:layout_marginRight="1dp"
+	    android:background="@drawable/butt"
 	    android:gravity="center_vertical|center_horizontal"
-		android:id="@+id/comic_item_fav"
-		android:layout_width="45dp"
-		android:layout_height="wrap_content"
-		android:text="Fav"
-		android:background="@drawable/butt"
-		android:lines="3"
-		android:typeface="serif"
-		android:textStyle="bold"
-		android:textColor="#ffffff"
-		android:layout_marginRight="1dp" />
+	    android:lines="3"
+	    android:text="SCut"
+	    android:textColor="#ffffff"
+	    android:textStyle="bold"
+	    android:typeface="serif" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/ComicReader/res/values/arrays.xml b/ComicReader/res/values/arrays.xml
index 5aa8a0f..65f6373 100755
--- a/ComicReader/res/values/arrays.xml
+++ b/ComicReader/res/values/arrays.xml
@@ -15,6 +15,20 @@
         <item>3</item>
     </string-array>
 
+    
+    <string-array name="sc_button">
+		<item>Show Favorites</item>
+        <item>Show Previous</item>
+        <item>Show Unread</item>
+    </string-array>
+   
+    <string-array name="sc_button_values">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>    
+    
+    
     <string-array name="freq">
         <item>1   (every 24 hrs)</item>
         <item>2   (every 12 hrs)</item>
diff --git a/ComicReader/res/xml/preferences.xml b/ComicReader/res/xml/preferences.xml
index b1b8d71..1bd393b 100755
--- a/ComicReader/res/xml/preferences.xml
+++ b/ComicReader/res/xml/preferences.xml
@@ -45,6 +45,14 @@
 		android:entries="@array/sync_type"
 		android:entryValues="@array/sync_type_values"
 		android:dependency="backgroundCacheEnabledPref" />
+	<ListPreference
+		android:key="shortcutButton"
+		android:title="Shortcut Button"
+		android:summary="What the shortcut button will display"
+		android:defaultValue="1"
+		android:entries="@array/sc_button"
+		android:entryValues="@array/sc_button_values"
+		android:dependency="backgroundCacheEnabledPref" />		
 	<CheckBoxPreference
 		android:key="notificationPref"
         android:title="Display Notifications"
diff --git a/ComicReader/src/com/blogspot/applications4android/comicreader/ActivityComicReader.java b/ComicReader/src/com/blogspot/applications4android/comicreader/ActivityComicReader.java
index c94f459..6cb3dd7 100755
--- a/ComicReader/src/com/blogspot/applications4android/comicreader/ActivityComicReader.java
+++ b/ComicReader/src/com/blogspot/applications4android/comicreader/ActivityComicReader.java
@@ -68,6 +68,8 @@ public class ActivityComicReader extends ComicActivity {
 	protected static FavoriteLauncher mFL = null;
 	/** prev-session activity */
 	protected static PrevSessionLauncher mPL = null;
+	/** unread activity */
+	protected static UnreadLauncher mUL = null;
 	/** web page display activity */
 	protected static ComicMainWebPageDisplay mWP = null;
 	
@@ -114,6 +116,19 @@ public class ActivityComicReader extends ComicActivity {
 		}
 	}
 
+	/** to launch the strip viewer activity in unread strips mode */
+	private class UnreadLauncher implements OnClickListener {
+		@Override
+		public void onClick(View v) {
+			Log.d(TAG, "UnreadLauncher getting triggered...");
+			Intent i = new Intent();
+			i.setClass(ActivityComicReader.this, ComicStripViewer.class);
+			i.putExtra("title", (String)v.getTag());
+			i.putExtra("mode", Comic.TYPE_UNREAD);
+			startActivityForResult(i, 0);
+		}
+	}
+	
 	/** to launch the alertdialog for opening the comic in a web page */
 	private class ComicMainWebPageDisplay implements OnLongClickListener {
 		public boolean onLongClick(View v) {
@@ -154,9 +169,11 @@ public class ActivityComicReader extends ComicActivity {
 	private static class EfficientAdapter extends BaseAdapter {
 		/** Used to inflate the layout */
 		private LayoutInflater mInflater;
-
+		private Context ctx;
+		
 		public EfficientAdapter(Context context) {
 			mInflater = LayoutInflater.from(context);
+			this.ctx =context;  
 		}
 		@Override
 		public int getCount() {
@@ -173,16 +190,33 @@ public class ActivityComicReader extends ComicActivity {
 		@Override
 		public View getView(int position, View convertView, ViewGroup parent) {
 			final ViewHolder holder;
+			SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(ctx);
+	    	int mscType = Integer.parseInt(sp.getString("shortcutButton", Integer.toString(1)));
+			
 			if (convertView == null) {
 				convertView = mInflater.inflate(R.layout.main_listview_content, null);
 				holder = new ViewHolder();
 				holder.latest = (Button) convertView.findViewById(R.id.comic_item_latest);
 				holder.latest.setOnClickListener(mLL);
 				holder.latest.setOnLongClickListener(mWP);
-				holder.favorite = (Button) convertView.findViewById(R.id.comic_item_fav);
+				switch(mscType){
+				case 1:
+				holder.favorite = (Button) convertView.findViewById(R.id.comic_item_scb);
+				holder.favorite.setText("FAV");
 				holder.favorite.setOnClickListener(mFL);
-				holder.previous = (Button) convertView.findViewById(R.id.comic_item_prev);
+				break;
+				case 2:
+				holder.previous = (Button) convertView.findViewById(R.id.comic_item_scb);
+				holder.previous.setText("PREV");
 				holder.previous.setOnClickListener(mPL);
+				break;
+				case 3:
+				holder.unread = (Button) convertView.findViewById(R.id.comic_item_scb);
+				holder.unread.setText("UnR");
+				holder.unread.setOnClickListener(mUL);	
+				break;
+				}
+								
 				convertView.setTag(holder);
 				convertView.setBackgroundColor(mColor1);
 			}
@@ -197,8 +231,21 @@ public class ActivityComicReader extends ComicActivity {
 				}
 				holder.latest.setText(txt);
 				holder.latest.setTag(cls.mName);
+				
+				switch(mscType){
+				case 1:
 				holder.favorite.setTag(cls.mName);
+				break;
+				case 2:
 				holder.previous.setTag(cls.mName);
+				break;
+				case 3:
+				holder.unread.setTag(cls.mName);
+				break;
+				}
+				
+				
+				
 			}
 			catch(ComicNotFoundException e) { // This should never occur!
 				e.printStackTrace();
@@ -216,6 +263,8 @@ public class ActivityComicReader extends ComicActivity {
 			public Button favorite;
 			/** Latest button*/
 			public Button latest;
+			/** Unread button */
+			public Button unread;
 		}
 	}
 
@@ -232,6 +281,9 @@ public class ActivityComicReader extends ComicActivity {
 		if(mPL == null) {
 			mPL = new PrevSessionLauncher();
 		}
+		if(mUL == null) {
+			mUL = new UnreadLauncher();
+		}
 		if(mWP == null) {
 			mWP = new ComicMainWebPageDisplay();
 		}
@@ -239,6 +291,8 @@ public class ActivityComicReader extends ComicActivity {
 		get_task.execute((Void[])null);
 	}
 
+
+
 	@Override
 	protected void onPause() {
 		ListView l1 = (ListView) findViewById(R.id.main_list_view);
diff --git a/ComicReader/src/com/blogspot/applications4android/comicreader/core/Comic.java b/ComicReader/src/com/blogspot/applications4android/comicreader/core/Comic.java
index c98b871..7b2f7cb 100755
--- a/ComicReader/src/com/blogspot/applications4android/comicreader/core/Comic.java
+++ b/ComicReader/src/com/blogspot/applications4android/comicreader/core/Comic.java
@@ -41,6 +41,8 @@ public abstract class Comic extends ComicParser {
 	public static final int TYPE_PREVIEW = 4;
 	/** background caching */
 	public static final int TYPE_CACHING = 5;
+	/** unread comics */
+	public static final int TYPE_UNREAD = 6;
 
 	/** navigate to latest strip */
 	public static final int NAV_LATEST = 11;
@@ -90,8 +92,12 @@ public abstract class Comic extends ComicParser {
 	private int mType;
 	/** favorites array */
 	private ArrayList<String> mFavs;
+	/** favorites array */
+	private ArrayList<String> mUnr;
 	/** for traversing on favorites array */
 	private int mFavIdx;
+	/** for traversing on unread array */
+	private int mUnrIdx;
 	/** background caching enabled */
 	private boolean mCacheEnabled;
 
@@ -110,6 +116,7 @@ public abstract class Comic extends ComicParser {
 		mStrips = new HashMap<String, Strip>();
 		mType = TYPE_LATEST;
 		mFavs = new ArrayList<String>();
+		mUnr = new ArrayList<String>();
 		mFavIdx = 0;
 		mCacheEnabled = true;
 	}
@@ -240,6 +247,17 @@ public abstract class Comic extends ComicParser {
 				}
 			}
 		}
+		if (root.has("mStrips")) {
+			JSONArray arr = root.getJSONArray("mStrips");
+			int len = arr.length();
+			for (int i = 0; i < len; ++i) {
+				Strip s = Strip.readFromJsonObject(arr.getJSONObject(i));
+				mStrips.put(s.uid(), s);
+				if (!s.isRead()) {
+					mUnr.add(s.uid());
+				}
+			}
+		}
 		Log.d(TAG, "Successfully read comic properties ...");
 	}
 
@@ -382,7 +400,7 @@ public abstract class Comic extends ComicParser {
 			}
 		}
 	}
-
+	
 	/**
 	 * Whether the current comic is favorite or not
 	 * 
@@ -395,6 +413,7 @@ public abstract class Comic extends ComicParser {
 		return mCurrent.isFavorite();
 	}
 
+
 	/**
 	 * Whether the current comic has image text or not
 	 * 
@@ -476,6 +495,32 @@ public abstract class Comic extends ComicParser {
 				throw ce;
 			}
 		}
+		if (mType == TYPE_UNREAD) {
+			switch (type) {
+			case NAV_LATEST:
+				mUnrIdx = mUnr.size() - 1;
+				return _getUnreadStrip();
+			case NAV_FIRST:
+				mUnrIdx = 0;
+				return _getUnreadStrip();
+			case NAV_NEXT:
+				++mUnrIdx;
+				mUnrIdx = (mUnrIdx >= mUnr.size()) ? 0 : mUnrIdx;
+				return _getUnreadStrip();
+			case NAV_PREVIOUS:
+				--mUnrIdx;
+				mUnrIdx = (mUnrIdx < 0) ? mUnr.size() - 1 : mUnrIdx;
+				return _getUnreadStrip();
+			case NAV_RANDOM:
+				mUnrIdx = RandUtils.getPositiveInt(mUnr.size(), 0);
+				return _getUnreadStrip();
+			case NAV_CURRENT:
+				return mCurrent;
+			default:
+				ComicException ce = new ComicException("Bad navigation-type passed: " + type);
+				throw ce;
+			}
+		}
 		switch (type) {
 		case NAV_LATEST:
 			return getLatestStrip();
@@ -790,6 +835,16 @@ public abstract class Comic extends ComicParser {
 		return _querySetCurrentUid(uid);
 	}
 
+	/**
+	 * Returns the current favorite strip
+	 * 
+	 * @return strip
+	 */
+	private Strip _getUnreadStrip() {
+		String uid = mUnr.get(mUnrIdx);
+		return _querySetCurrentUid(uid);
+	}
+	
 	/**
 	 * Helper function to return the properties json file associated with this
 	 * comic

From b066f43baea3c7609d595fe789eb37d4cddb1717 Mon Sep 17 00:00:00 2001
From: whitecat <gmail@c.albert-thompson.com>
Date: Tue, 9 Apr 2013 20:49:44 -0700
Subject: [PATCH 2/3] Added comments to code Needed to do a small hack by
 changing mFavIdx to an int[] which passes by reference, so I could simplify
 the code and combine repetitive code. and added the method
 _specialViewNavigation

---
 .../comicreader/ActivityComicReader.java      |   4 +
 .../comicreader/core/Comic.java               | 124 ++++++++----------
 2 files changed, 60 insertions(+), 68 deletions(-)

diff --git a/ComicReader/src/com/blogspot/applications4android/comicreader/ActivityComicReader.java b/ComicReader/src/com/blogspot/applications4android/comicreader/ActivityComicReader.java
index 6cb3dd7..77b1091 100755
--- a/ComicReader/src/com/blogspot/applications4android/comicreader/ActivityComicReader.java
+++ b/ComicReader/src/com/blogspot/applications4android/comicreader/ActivityComicReader.java
@@ -190,6 +190,8 @@ public class ActivityComicReader extends ComicActivity {
 		@Override
 		public View getView(int position, View convertView, ViewGroup parent) {
 			final ViewHolder holder;
+			
+			//Added a way to get button from settings menu
 			SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(ctx);
 	    	int mscType = Integer.parseInt(sp.getString("shortcutButton", Integer.toString(1)));
 			
@@ -199,6 +201,7 @@ public class ActivityComicReader extends ComicActivity {
 				holder.latest = (Button) convertView.findViewById(R.id.comic_item_latest);
 				holder.latest.setOnClickListener(mLL);
 				holder.latest.setOnLongClickListener(mWP);
+				//Switch what shortcut button is to be shown according to the settings. 
 				switch(mscType){
 				case 1:
 				holder.favorite = (Button) convertView.findViewById(R.id.comic_item_scb);
@@ -232,6 +235,7 @@ public class ActivityComicReader extends ComicActivity {
 				holder.latest.setText(txt);
 				holder.latest.setTag(cls.mName);
 				
+				//TODO: I don't know what this does but it has to be set correctly or android crashes
 				switch(mscType){
 				case 1:
 				holder.favorite.setTag(cls.mName);
diff --git a/ComicReader/src/com/blogspot/applications4android/comicreader/core/Comic.java b/ComicReader/src/com/blogspot/applications4android/comicreader/core/Comic.java
index 7b2f7cb..24dd663 100755
--- a/ComicReader/src/com/blogspot/applications4android/comicreader/core/Comic.java
+++ b/ComicReader/src/com/blogspot/applications4android/comicreader/core/Comic.java
@@ -94,10 +94,10 @@ public abstract class Comic extends ComicParser {
 	private ArrayList<String> mFavs;
 	/** favorites array */
 	private ArrayList<String> mUnr;
-	/** for traversing on favorites array */
-	private int mFavIdx;
-	/** for traversing on unread array */
-	private int mUnrIdx;
+	/** for traversing on favorites array Also a hack to all pass by reference */
+	private int[] mFavIdx;
+	/** for traversing on unread array Also a hack to all pass by reference*/
+	private int[] mUnrIdx;
 	/** background caching enabled */
 	private boolean mCacheEnabled;
 
@@ -117,7 +117,8 @@ public abstract class Comic extends ComicParser {
 		mType = TYPE_LATEST;
 		mFavs = new ArrayList<String>();
 		mUnr = new ArrayList<String>();
-		mFavIdx = 0;
+		mFavIdx = new int[] {0};
+		mUnrIdx = new int[] {0};	
 		mCacheEnabled = true;
 	}
 
@@ -247,6 +248,7 @@ public abstract class Comic extends ComicParser {
 				}
 			}
 		}
+		// Find and add all unread comics to the array list.
 		if (root.has("mStrips")) {
 			JSONArray arr = root.getJSONArray("mStrips");
 			int len = arr.length();
@@ -469,57 +471,11 @@ public abstract class Comic extends ComicParser {
 	 */
 	public Strip navigateStrip(int type) throws ComicException {
 		mCache.makeSpace();
+		// If the comic view type is favorite navigate using mFavs array.
 		if (mType == TYPE_FAVORITE) {
-			switch (type) {
-			case NAV_LATEST:
-				mFavIdx = mFavs.size() - 1;
-				return _getFavoriteStrip();
-			case NAV_FIRST:
-				mFavIdx = 0;
-				return _getFavoriteStrip();
-			case NAV_NEXT:
-				++mFavIdx;
-				mFavIdx = (mFavIdx >= mFavs.size()) ? 0 : mFavIdx;
-				return _getFavoriteStrip();
-			case NAV_PREVIOUS:
-				--mFavIdx;
-				mFavIdx = (mFavIdx < 0) ? mFavs.size() - 1 : mFavIdx;
-				return _getFavoriteStrip();
-			case NAV_RANDOM:
-				mFavIdx = RandUtils.getPositiveInt(mFavs.size(), 0);
-				return _getFavoriteStrip();
-			case NAV_CURRENT:
-				return mCurrent;
-			default:
-				ComicException ce = new ComicException("Bad navigation-type passed: " + type);
-				throw ce;
-			}
-		}
-		if (mType == TYPE_UNREAD) {
-			switch (type) {
-			case NAV_LATEST:
-				mUnrIdx = mUnr.size() - 1;
-				return _getUnreadStrip();
-			case NAV_FIRST:
-				mUnrIdx = 0;
-				return _getUnreadStrip();
-			case NAV_NEXT:
-				++mUnrIdx;
-				mUnrIdx = (mUnrIdx >= mUnr.size()) ? 0 : mUnrIdx;
-				return _getUnreadStrip();
-			case NAV_PREVIOUS:
-				--mUnrIdx;
-				mUnrIdx = (mUnrIdx < 0) ? mUnr.size() - 1 : mUnrIdx;
-				return _getUnreadStrip();
-			case NAV_RANDOM:
-				mUnrIdx = RandUtils.getPositiveInt(mUnr.size(), 0);
-				return _getUnreadStrip();
-			case NAV_CURRENT:
-				return mCurrent;
-			default:
-				ComicException ce = new ComicException("Bad navigation-type passed: " + type);
-				throw ce;
-			}
+			return _specialViewNavigation(type, mFavIdx, mFavs);
+		}else if (mType == TYPE_UNREAD) {
+			return _specialViewNavigation(type, mUnrIdx, mUnr);
 		}
 		switch (type) {
 		case NAV_LATEST:
@@ -544,6 +500,7 @@ public abstract class Comic extends ComicParser {
 		}
 	}
 
+
 	/**
 	 * Gets latest strip
 	 * 
@@ -809,6 +766,44 @@ public abstract class Comic extends ComicParser {
 	// //// protected methods //////
 
 	// //// private methods //////
+	
+	/**
+	 * 
+	 * Provides a way to navigate menu for Favorites and Unread comics
+	 * 
+	 * @param type The type of comic being looked for
+	 * @param idx index of array of strips
+	 * @param mArr the array of strips
+	 * @return strip
+	 * @throws ComicException
+	 */
+	private Strip _specialViewNavigation(int type, int[] idx, ArrayList<String> mArr) throws ComicException {
+		switch (type) {
+		case NAV_LATEST:
+			idx[0] = mArr.size() - 1;
+			return _getStrip( idx[0],  mArr);
+		case NAV_FIRST:
+			idx[0] = 0;
+			return _getStrip( idx[0],  mArr);
+		case NAV_NEXT:
+			++idx[0];
+			idx[0] = (idx[0] >= mArr.size()) ? 0 : idx[0];
+			return _getStrip( idx[0],  mArr);
+		case NAV_PREVIOUS:
+			--idx[0];
+			idx[0] = (idx[0] < 0) ? mArr.size() - 1 : idx[0];
+			return _getStrip( idx[0],  mArr);
+		case NAV_RANDOM:
+			idx[0] = RandUtils.getPositiveInt(mArr.size(), 0);
+			return _getStrip( idx[0],  mArr);
+		case NAV_CURRENT:
+			return mCurrent;
+		default:
+			ComicException ce = new ComicException("Bad navigation-type passed: " + type);
+			throw ce;
+		}
+	}
+
 	/**
 	 * Helper function to query for a strip and set it as current
 	 * 
@@ -826,25 +821,18 @@ public abstract class Comic extends ComicParser {
 	}
 
 	/**
-	 * Returns the current favorite strip
 	 * 
+	 * Returns the current strip
+	 * 
+	 * @param idx index of array to return 
+	 * @param mArr array of strip index that are possible to return
 	 * @return strip
 	 */
-	private Strip _getFavoriteStrip() {
-		String uid = mFavs.get(mFavIdx);
+	private Strip _getStrip(int idx, ArrayList<String> mArr ) {
+		String uid = mArr.get(idx);
 		return _querySetCurrentUid(uid);
 	}
 
-	/**
-	 * Returns the current favorite strip
-	 * 
-	 * @return strip
-	 */
-	private Strip _getUnreadStrip() {
-		String uid = mUnr.get(mUnrIdx);
-		return _querySetCurrentUid(uid);
-	}
-	
 	/**
 	 * Helper function to return the properties json file associated with this
 	 * comic

From 755012e5564ef00c78880b43da2adb3eb54dbce5 Mon Sep 17 00:00:00 2001
From: whitecat <gmail@c.albert-thompson.com>
Date: Tue, 9 Apr 2013 20:55:22 -0700
Subject: [PATCH 3/3] fixed a messed up comment

---
 .../blogspot/applications4android/comicreader/core/Comic.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ComicReader/src/com/blogspot/applications4android/comicreader/core/Comic.java b/ComicReader/src/com/blogspot/applications4android/comicreader/core/Comic.java
index 24dd663..b4ee56f 100755
--- a/ComicReader/src/com/blogspot/applications4android/comicreader/core/Comic.java
+++ b/ComicReader/src/com/blogspot/applications4android/comicreader/core/Comic.java
@@ -92,7 +92,7 @@ public abstract class Comic extends ComicParser {
 	private int mType;
 	/** favorites array */
 	private ArrayList<String> mFavs;
-	/** favorites array */
+	/** unread array */
 	private ArrayList<String> mUnr;
 	/** for traversing on favorites array Also a hack to all pass by reference */
 	private int[] mFavIdx;