Merge pull request #18 from gatheringhallstudios/develop

V1.1.1 Release
gatheringhallstudios · Aug 5, 2016 · 4cb44a0 · 4cb44a0
2 parents 8e687ed + ac23886
commit 4cb44a0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,9 +12,10 @@ android {
         //1.00   Version Code: 1   Released 7-14-2016
         //1.0.1  Version Code: 2   Released 7-19-2016
         //1.0.2  Version Code: 3   Released 7-19-2016
-        //1.1.0  Version Code: 4   Not Released
-        versionCode 4
-        versionName "1.1.0"
+        //1.1.0  Version Code: 4   Released 7-31-2016
+        //1.1.1  Version Code: 5   Released 8-05-2016
+        versionCode 5
+        versionName "1.1.1"
 
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7

diff --git a/app/src/main/assets/databases/mhgen.db.zip b/app/src/main/assets/databases/mhgen.db.zip
diff --git a/app/src/main/java/com/ghstudios/android/data/database/MonsterHunterDatabaseHelper.java b/app/src/main/java/com/ghstudios/android/data/database/MonsterHunterDatabaseHelper.java
@@ -62,12 +62,13 @@ class MonsterHunterDatabaseHelper extends SQLiteAssetHelper {
     private static MonsterHunterDatabaseHelper mInstance = null;
 
     private static final String DATABASE_NAME = "mhgen.db";
-    private static final int DATABASE_VERSION = 4;
+    private static final int DATABASE_VERSION = 5;
 
     //Version 1 - v1.0   - Initial Release
     //Version 2 - v1.0.1 - Added Alternate Damages/Weaknesses/Ailments
     //Version 3 - v1.0.2 - Fixed issues with some quest data
     //Version 4 - v1.1.0 - Changed Weaknesses / Fixed some data bugs / Default Wishlists+Set
+    //Version 5 - v1.1.1 - Added more localized data / July DLC / August DLC
 
     private final Context myContext;
     private SQLiteDatabase myDataBase;

diff --git a/app/src/main/java/com/ghstudios/android/ui/dialog/WishlistDataAddDialogFragment.java b/app/src/main/java/com/ghstudios/android/ui/dialog/WishlistDataAddDialogFragment.java
@@ -30,7 +30,7 @@ public class WishlistDataAddDialogFragment extends DialogFragment {
 	private static final String ARG_WISHLIST_DATA_WEAPON_NAME = "WISHLIST_DATA_WEAPON_NAME";
 	private static final String DIALOG_WISHLIST_COMPONENT_PATH = "wishlist_component_path";
 
-	private long wishlistId = -1;
+	private int wishlistId = -1;
 	private String wishlistName = "";
 
 	private long item_id;
@@ -55,22 +55,27 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
 
 		final WishlistCursor cursor = DataManager.get(getActivity()).queryWishlists();
 
-		int selected = -1;
-
 		//If there is only 1 wishlist, select it by default.
-		if(cursor.getCount()==1)
-			selected = 0;
+		int checkedItem = -1;
+		if(cursor.getCount()==1) {
+			cursor.moveToFirst();
+			Wishlist w = cursor.getWishlist();
+			wishlistId = (int)w.getId();
+			wishlistName = w.getName();
+			checkedItem = 0;
+			cursor.moveToFirst();
+		}
 
 		return new AlertDialog.Builder(getActivity())
 			.setTitle("Add to which wishlist?")
 			.setView(v)
-			.setSingleChoiceItems(cursor, selected, "name", new DialogInterface.OnClickListener() {
+			.setSingleChoiceItems(cursor, checkedItem, "name", new DialogInterface.OnClickListener() {
 
 	               @Override
 	               public void onClick(DialogInterface dialog, int id) {
 	            	   cursor.moveToPosition(id);
 	            	   Wishlist wishlist = cursor.getWishlist();
-	            	   wishlistId = wishlist.getId();
+	            	   wishlistId = (int)wishlist.getId();
 	            	   wishlistName = wishlist.getName();
 	               }
 			})

diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
 
+    <release version="1.1.1" versioncode="5">
+        <change>Added July DLC Quests</change>
+        <change>Added August DLC Quests</change>
+        <change>Fixed issue with wishlist selection</change>
+    </release>
+
     <release version="1.1.0" versioncode="4">
         <change>Added Wishlist functionality.</change>
         <change>Monster summary screen now only shows the most effective weakness elements.</change>