diff --git a/app/build.gradle b/app/build.gradle
index 3ca3a5a1..243b2038 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@ android {
//1.0.2 Version Code: 3 Released 7-19-2016
//1.1.0 Version Code: 4 Released 7-31-2016
//1.1.1 Version Code: 5 Released 8-05-2016
- //1.1.2 Version Code: 6 unreleased
+ //1.1.2 Version Code: 6 Released 10-17-2016
versionCode 6
versionName "1.1.2"
diff --git a/app/src/main/res/layout/fragment_weapon_blade_detail.xml b/app/src/main/res/layout/fragment_weapon_blade_detail.xml
index 39dc2573..a821d487 100644
--- a/app/src/main/res/layout/fragment_weapon_blade_detail.xml
+++ b/app/src/main/res/layout/fragment_weapon_blade_detail.xml
@@ -43,7 +43,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- tools:text="Attack"
+ android:text="@string/weapon_attack"
style="@style/detail_subheader_text"/>
@@ -149,7 +149,7 @@
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
- tools:text="Sharpness"/>
+ android:text="@string/weapon_sharpness"/>
+ android:text="@string/weapon_notes"/>
+ android:text="@string/weapon_phial_type"/>
+ android:text="@string/weapon_defense"/>
+ android:text="@string/weapon_upgrade_cost"/>
+ android:text="@string/weapon_creation_cost"/>
+ android:text="@string/item_rarity"/>
+ android:text="@string/item_description"/>
@@ -7,7 +8,7 @@
style="@style/title_bar">
@@ -132,106 +133,106 @@
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
- android:text="Charges"/>
+ android:text="@string/weapon_charges"/>
+ tools:text="Spread 2"/>
+ tools:text="Spread 2"/>
+ tools:text="Spread 3"/>
+ tools:text="Rapid 1"/>
+ android:text="@string/weapon_arc"/>
+ tools:text="Wide"/>
+ android:text="@string/weapon_defense"/>
+ tools:text="10"/>
+ android:text="@string/weapon_upgrade_cost"/>
+ tools:text="48000z"/>
+ android:text="@string/weapon_creation_cost"/>
+ tools:text="-"/>
+ android:text="@string/item_rarity"/>
+ tools:text="5"/>
+ android:text="@string/item_description"/>
+ tools:text="5"/>
diff --git a/app/src/main/res/layout/fragment_weapon_bowgun_detail.xml b/app/src/main/res/layout/fragment_weapon_bowgun_detail.xml
index f47f844b..1656633f 100644
--- a/app/src/main/res/layout/fragment_weapon_bowgun_detail.xml
+++ b/app/src/main/res/layout/fragment_weapon_bowgun_detail.xml
@@ -1,5 +1,6 @@
@@ -7,7 +8,7 @@
style="@style/title_bar">
@@ -110,96 +111,96 @@
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
- android:text="Recoil"/>
+ android:text="@string/weapon_recoil"/>
+ tools:text="Average"/>
+ android:text="@string/weapon_reload"/>
+ tools:text="Faster"/>
+ android:text="@string/weapon_deviation"/>
+ tools:text="None"/>
+ android:text="@string/weapon_defense"/>
+ tools:text="10"/>
+ android:text="@string/weapon_upgrade_cost"/>
+ tools:text="48000z"/>
+ android:text="@string/weapon_creation_cost"/>
+ tools:text="-"/>
+ android:text="@string/item_rarity"/>
+ tools:text="5"/>
+ android:text="@string/item_description"/>
+ tools:text="5"/>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9f348f81..659dac48 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -238,6 +238,18 @@
Dragon
My Wishlist
My Armor Set
+ Attack
+ Slots
+ Sharpness
+ Notes
+ Phial Type
+ Upgrade Cost
+ Creation Cost
+ Charges
+ Arc
+ Recoil
+ Reload
+ Deviation
- Pawn,Talisman-White.png
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index bc00fa7a..a2ea1d4e 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,6 +1,13 @@
+
+ Added September DLC Quests
+ Added October DLC Quests
+ Redesign item details
+ Fix tab issue on Android 7
+
+
Added July DLC Quests
Added August DLC Quests
diff --git a/multilevelexpindlistview/src/main/res/values/strings.xml b/multilevelexpindlistview/src/main/res/values/strings.xml
index 9f9a8f21..4389f7e7 100644
--- a/multilevelexpindlistview/src/main/res/values/strings.xml
+++ b/multilevelexpindlistview/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
MultiLevelExpIndListView
+ Affinity
+ Defense