Skip to content

Commit

Permalink
Fix weapon detail bug + update changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
@JosephMichels
JosephMichels committed Oct 17, 2016
1 parent 7c6930f commit 349ac53
Show file tree
Hide file tree
Showing 7 changed files with 84 additions and 61 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Expand Up @@ -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"

Expand Down
22 changes: 11 additions & 11 deletions app/src/main/res/layout/fragment_weapon_blade_detail.xml
View file
Expand Up @@ -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"/>
</LinearLayout>
<LinearLayout
Expand Down Expand Up @@ -105,7 +105,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
tools:text="Affinity"
android:text="@string/weapon_affinity"
style="@style/detail_subheader_text"/>
</LinearLayout>
<LinearLayout
Expand All @@ -125,7 +125,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
tools:text="Slots"
android:text="@string/weapon_slots"
style="@style/detail_subheader_text"/>
</LinearLayout>
</LinearLayout>
Expand All @@ -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"/>
<com.ghstudios.android.ui.general.DrawSharpness
android:id="@+id/detail_weapon_blade_sharpness"
android:layout_width="160dp"
Expand All @@ -161,7 +161,7 @@
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
tools:text="Notes"/>
android:text="@string/weapon_notes"/>
<LinearLayout
android:id="@+id/detail_weapon_note_container"
android:layout_width="wrap_content"
Expand All @@ -186,7 +186,7 @@
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
tools:text="Phial Type"/>
android:text="@string/weapon_phial_type"/>
<TextView
android:id="@+id/detail_weapon_blade_special_value"
android:layout_width="wrap_content"
Expand All @@ -199,7 +199,7 @@
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
tools:text="Defense"/>
android:text="@string/weapon_defense"/>
<TextView
android:id="@+id/detail_weapon_defense"
android:layout_width="wrap_content"
Expand All @@ -212,7 +212,7 @@
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
tools:text="Upgrade Cost"/>
android:text="@string/weapon_upgrade_cost"/>
<TextView
android:id="@+id/detail_weapon_upgrade"
android:layout_width="wrap_content"
Expand All @@ -225,7 +225,7 @@
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
tools:text="Creation Cost"/>
android:text="@string/weapon_creation_cost"/>
<TextView
android:id="@+id/detail_weapon_creation"
android:layout_width="wrap_content"
Expand All @@ -238,7 +238,7 @@
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
tools:text="Rarity"/>
android:text="@string/item_rarity"/>
<TextView
android:id="@+id/detail_weapon_rarity"
android:layout_width="wrap_content"
Expand All @@ -251,7 +251,7 @@
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
tools:text="Description"/>
android:text="@string/item_description"/>
<TextView
android:id="@+id/detail_weapon_description"
android:layout_width="wrap_content"
Expand Down
53 changes: 27 additions & 26 deletions app/src/main/res/layout/fragment_weapon_bow_detail.xml
View file
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
style="@style/title_bar">
<TextView
android:id="@+id/detail_title_bar_text"
android:text="Title Bar Text"
tools:text="Title Bar Text"
style="@style/title_bar_text" />
</RelativeLayout>
<ScrollView
Expand Down Expand Up @@ -36,14 +37,14 @@
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="center_horizontal"
android:text="180"
tools:text="180"
style="@style/detail_header_text"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="Attack"
android:text="@string/weapon_attack"
style="@style/detail_subheader_text"/>
</LinearLayout>
<LinearLayout
Expand All @@ -58,14 +59,14 @@
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="center_horizontal"
android:text="28"
tools:text="28"
style="@style/detail_header_text"/>
<TextView
android:id="@+id/detail_weapon_element_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="Fire"
tools:text="Fire"
style="@style/detail_subheader_text"/>
</LinearLayout>
<LinearLayout
Expand All @@ -78,14 +79,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="5%"
tools:text="5%"
style="@style/detail_header_text"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="Affinity"
android:text="@string/weapon_affinity"
style="@style/detail_subheader_text"/>
</LinearLayout>
<LinearLayout
Expand All @@ -99,14 +100,14 @@
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="center_horizontal"
android:text="---"
tools:text="---"
style="@style/detail_header_text"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:text="Slots"
android:text="@string/weapon_slots"
style="@style/detail_subheader_text"/>
</LinearLayout>
</LinearLayout>
Expand All @@ -132,114 +133,114 @@
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
android:text="Charges"/>
android:text="@string/weapon_charges"/>
<TextView
android:id="@+id/detail_weapon_bow_charge1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="0dp"
style="@style/detail_value_text"
android:text="Spread 2"/>
tools:text="Spread 2"/>
<TextView
android:id="@+id/detail_weapon_bow_charge2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="0dp"
style="@style/detail_value_text"
android:text="Spread 2"/>
tools:text="Spread 2"/>
<TextView
android:id="@+id/detail_weapon_bow_charge3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="0dp"
style="@style/detail_value_text"
android:text="Spread 3"/>
tools:text="Spread 3"/>
<TextView
android:id="@+id/detail_weapon_bow_charge4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/detail_value_text"
android:text="Rapid 1"/>
tools:text="Rapid 1"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
android:text="Arc"/>
android:text="@string/weapon_arc"/>
<TextView
android:id="@+id/detail_weapon_bow_arc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
style="@style/detail_value_text"
android:text="Wide"/>
tools:text="Wide"/>
<TextView
android:id="@+id/detail_weapon_defense_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
android:text="Defense"/>
android:text="@string/weapon_defense"/>
<TextView
android:id="@+id/detail_weapon_defense"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/detail_value_text"
android:text="10"/>
tools:text="10"/>
<!--Upgrade Cost-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
android:text="Upgrade Cost"/>
android:text="@string/weapon_upgrade_cost"/>
<TextView
android:id="@+id/detail_weapon_upgrade"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/detail_value_text"
android:text="48000z"/>
tools:text="48000z"/>
<!--Creation Cost-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
android:text="Creation Cost"/>
android:text="@string/weapon_creation_cost"/>
<TextView
android:id="@+id/detail_weapon_creation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/detail_value_text"
android:text="-"/>
tools:text="-"/>
<!--Creation Cost-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
android:text="Rarity"/>
android:text="@string/item_rarity"/>
<TextView
android:id="@+id/detail_weapon_rarity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/detail_value_text"
android:text="5"/>
tools:text="5"/>
<!--Creation Cost-->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/text_small_secondary"
android:layout_marginBottom="4dp"
android:text="Description"/>
android:text="@string/item_description"/>
<TextView
android:id="@+id/detail_weapon_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/text_medium"
android:textColor="@color/weapon_property_color"
android:layout_marginBottom="8dp"
android:text="5"/>
tools:text="5"/>
</LinearLayout>
</LinearLayout>
</ScrollView>
Expand Down

0 comments on commit 349ac53

Please sign in to comment.