Merge pull request #6 from gatheringhallstudios/develop

Merge v1.00

android-section-adapter/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion  23
-    buildToolsVersion  "23.0.0"
+    buildToolsVersion  "23.0.2"
     defaultConfig {
         minSdkVersion 7
         versionName "1.0"
@@ -13,6 +13,6 @@ android {
 
 
 dependencies {
-    compile 'com.android.support:support-v4:23.0.0'
+    compile 'com.android.support:support-v4:23.3.0'
 }
 

android-section-adapter/src/main/java/com/github/monxalo/android/widget/SectionCursorAdapter.java

@@ -95,8 +95,8 @@ public SectionCursorAdapter(Context context, Cursor c, int headerLayout,
      * @param groupData
      * @return
      */
-    protected String getCustomGroup(String groupData) {
-        return groupData;
+    protected String getCustomGroup(Cursor c) {
+        return c.getString(mGroupColumn);
     }
 
     private void calculateSectionHeaders() {
@@ -116,7 +116,7 @@ private void calculateSectionHeaders() {
         c.moveToPosition(-1);
 
         while (c.moveToNext()) {
-            final String group = getCustomGroup(c.getString(mGroupColumn));
+            final String group = getCustomGroup(c);
 
             if (!previous.equals(group)) {
                 mSectionsIndexer.put(i + count, group);
@@ -159,28 +159,31 @@ public View getView(int position, View convertView, ViewGroup parent) {
             if (convertView == null) {
                 if (LOGV)
                     Log.v(TAG, "Creating new view for section");
+                convertView = newHeaderView(mContext,mCursor,parent);
+            }
 
-                holder = new ViewHolder();
-                convertView = mLayoutInflater.inflate(mHeaderRes, parent, false);
-                holder.textView = (TextView) convertView;
+            bindHeaderView(convertView,mContext,mCursor,position);
 
-                convertView.setTag(holder);
-            } else {
-                if (LOGV)
-                    Log.v(TAG, "Reusing view for section");
-
-                holder = (ViewHolder) convertView.getTag();
-            }
+            return convertView;
+        }
+    }
 
-            TextView sectionText = holder.textView;
+    protected View newHeaderView(Context context, Cursor cursor, ViewGroup parent){
+        ViewHolder holder = new ViewHolder();
+        View v = mLayoutInflater.inflate(mHeaderRes, parent, false);
+        holder.textView = (TextView) v;
+        v.setTag(holder);
+        return v;
+    }
 
-            final String group = mSectionsIndexer.get(position);
-            final String customFormat = getGroupCustomFormat(group);
+    protected void bindHeaderView(View view, Context context, Cursor cursor,int position){
+        ViewHolder holder = (ViewHolder) view.getTag();
+        TextView sectionText = holder.textView;
 
-            sectionText.setText(customFormat == null ? group : customFormat);
+        final String group = mSectionsIndexer.get(position);
+        final String customFormat = getGroupCustomFormat(group);
 
-            return sectionText;
-        }
+        sectionText.setText(customFormat == null ? group : customFormat);
     }
 
     @Override

android-sqlite-asset-helper/build.gradle

@@ -3,7 +3,7 @@ import com.android.builder.core.BuilderConstants
 apply plugin: 'android-library'
 
 android {
-    buildToolsVersion "23.0.0"
+    buildToolsVersion "23.0.2"
     compileSdkVersion 23
 
     defaultConfig {

app/build.gradle

@@ -8,6 +8,8 @@ android {
         applicationId "com.ghstudios.android.mhgendatabase"
         minSdkVersion 14
         targetSdkVersion 23
+        versionCode 1
+        versionName "1.00"
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
             targetCompatibility JavaVersion.VERSION_1_7

app/src/main/AndroidManifest.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.ghstudios.android.mhgendatabase"
-    android:versionCode="13"
-    android:versionName="1.08">
+    package="com.ghstudios.android.mhgendatabase">
 
     <application
         android:allowBackup="true"
@@ -16,10 +14,20 @@
             android:label="@string/app_name"
             android:screenOrientation="portrait" />
 
+        <activity android:name="com.ghstudios.android.ui.detail.MaterialDetailActivity"
+            android:label=""
+            android:screenOrientation="portrait"/>
+
+        <activity android:name="com.ghstudios.android.ui.list.PalicoActivity"
+            android:screenOrientation="portrait"/>
+
+        <activity android:name="com.ghstudios.android.ui.detail.PalicoWeaponDetailActivity"
+            android:screenOrientation="portrait"/>
+
         <!-- MONSTER LIST SECTION -->
         <activity
             android:name="com.ghstudios.android.ui.list.MonsterListActivity"
-            android:label="@string/app_name"
+            android:label="@string/app_name_launcher"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/ghstudios/android/data/classes/Gathering.java

@@ -12,6 +12,12 @@ public class Gathering {
 	private String site;		// Type of gathering node; bug, mine, fish, etc.
 	private String rank;		// Quest Rank found in
     private float rate;         // Gather rate
+
+	int group;					//What group is it a part of, (Unique within an area)
+	boolean fixed;				//is this a fixed gathering point
+	boolean rare;				//Is it a rare point
+
+	int quantity;
 
 	/* Default Constructor */
 	public Gathering() {
@@ -22,6 +28,10 @@ public Gathering() {
 		this.site = "";
 		this.rank = "";
         this.rate = 0;
+		this.group = 0;
+		this.fixed = true;
+		this.rare = false;
+		this.quantity = 1;
 	}
 
 	/* Getters and Setters */
@@ -80,5 +90,13 @@ public float getRate() {
     public void setRate(float rate) {
         this.rate = rate;
     }
-
+
+	public void setGroup(int group){this.group = group;}
+	public int getGroup(){return this.group;}
+	public void setFixed(boolean fixed){this.fixed = fixed;}
+	public boolean isFixed(){return this.fixed;}
+	public void setRare(boolean rare){this.rare = rare;}
+	public boolean isRare(){return this.rare;}
+	public void setQuantity(int quantity){this.quantity=quantity;}
+	public int getQuantity(){return this.quantity;}
 }

app/src/main/java/com/ghstudios/android/data/classes/Item.java

@@ -144,6 +144,75 @@ public void setFileLocation(String file_location) {
 		this.file_location = file_location;
 	}
 
+	public String getItemImage(){
+		String cellImage;
+		switch(this.getSubType()){
+			case "Head":
+				cellImage = "icons_armor/icons_head/head" + this.getRarity() + ".png";
+				break;
+			case "Body":
+				cellImage = "icons_armor/icons_body/body" + this.getRarity() + ".png";
+				break;
+			case "Arms":
+				cellImage = "icons_armor/icons_arms/arms" + this.getRarity() + ".png";
+				break;
+			case "Waist":
+				cellImage = "icons_armor/icons_waist/waist" + this.getRarity() + ".png";
+				break;
+			case "Legs":
+				cellImage = "icons_armor/icons_legs/legs" + this.getRarity() + ".png";
+				break;
+			case "Great Sword":
+				cellImage = "icons_weapons/icons_great_sword/great_sword" + this.getRarity() + ".png";
+				break;
+			case "Long Sword":
+				cellImage = "icons_weapons/icons_long_sword/long_sword" + this.getRarity() + ".png";
+				break;
+			case "Sword and Shield":
+				cellImage = "icons_weapons/icons_sword_and_shield/sword_and_shield" + this.getRarity() + ".png";
+				break;
+			case "Dual Blades":
+				cellImage = "icons_weapons/icons_dual_blades/dual_blades" + this.getRarity() + ".png";
+				break;
+			case "Hammer":
+				cellImage = "icons_weapons/icons_hammer/hammer" + this.getRarity() + ".png";
+				break;
+			case "Hunting Horn":
+				cellImage = "icons_weapons/icons_hunting_horn/hunting_horn" + this.getRarity() + ".png";
+				break;
+			case "Lance":
+				cellImage = "icons_weapons/icons_lance/lance" + this.getRarity() + ".png";
+				break;
+			case "Gunlance":
+				cellImage = "icons_weapons/icons_gunlance/gunlance" + this.getRarity() + ".png";
+				break;
+			case "Switch Axe":
+				cellImage = "icons_weapons/icons_switch_axe/switch_axe" + this.getRarity() + ".png";
+				break;
+			case "Charge Blade":
+				cellImage = "icons_weapons/icons_charge_blade/charge_blade" + this.getRarity() + ".png";
+				break;
+			case "Insect Glaive":
+				cellImage = "icons_weapons/icons_insect_glaive/insect_glaive" + this.getRarity() + ".png";
+				break;
+			case "Light Bowgun":
+				cellImage = "icons_weapons/icons_light_bowgun/light_bowgun" + this.getRarity() + ".png";
+				break;
+			case "Heavy Bowgun":
+				cellImage = "icons_weapons/icons_heavy_bowgun/heavy_bowgun" + this.getRarity() + ".png";
+				break;
+			case "Bow":
+				cellImage = "icons_weapons/icons_bow/bow" + this.getRarity() + ".png";
+				break;
+			default: {
+				if(this.type.equals("Palico Weapon"))
+					cellImage = "icons_weapons/"+this.getFileLocation();
+				else
+					cellImage = "icons_items/" + this.getFileLocation();
+			}
+		}
+		return cellImage;
+	}
 
 	public String getArmorDupeNameFix() {
 		return armor_dupe_name_fix;

app/src/main/java/com/ghstudios/android/data/classes/ItemToMaterial.java

@@ -0,0 +1,25 @@
+package com.ghstudios.android.data.classes;
+
+/**
+ * Created by Joseph on 7/7/2016.
+ */
+public class ItemToMaterial {
+    private int amount;
+    private Item item;
+
+    public int getAmount() {
+        return amount;
+    }
+
+    public void setAmount(int amount) {
+        this.amount = amount;
+    }
+
+    public Item getItem() {
+        return item;
+    }
+
+    public void setItem(Item item) {
+        this.item = item;
+    }
+}

app/src/main/java/com/ghstudios/android/data/classes/Location.java

@@ -43,7 +43,7 @@ public void setFileLocation(String file_location) {
 	}
 
     public String getFileLocationMini() {
-        return file_location_mini;
+        return file_location;
     }
 
     public void setFileLocationMini(String file_location_mini) {