From 8f9f27a8c44fbb8cd50c439c5454c8c709c19f76 Mon Sep 17 00:00:00 2001
From: kauron <carlos.s.galindo@gmail.com>
Date: Sun, 19 Jul 2015 19:12:38 +0200
Subject: [PATCH] Powers: now all fields are optional, except the names Made
 display scrollable

---
 .../java/com/kauron/dungeonmanager/Power.java |   4 +-
 .../com/kauron/dungeonmanager/ShowPlayer.java |  27 +-
 app/src/main/res/layout/attack_display.xml    | 289 +++++++++---------
 3 files changed, 168 insertions(+), 152 deletions(-)

diff --git a/app/src/main/java/com/kauron/dungeonmanager/Power.java b/app/src/main/java/com/kauron/dungeonmanager/Power.java
index 3e2ec61..7ab578b 100644
--- a/app/src/main/java/com/kauron/dungeonmanager/Power.java
+++ b/app/src/main/java/com/kauron/dungeonmanager/Power.java
@@ -59,13 +59,15 @@ class Power implements Serializable{
 
     String getKeywords() {return keywords;}
 
-    String getTypeString() {return ACTIONS[action];}
+    String getActionString() {return ACTIONS[action];}
     String getFrequencyString() {return FREQ[freq];}
     String getRangeString() {return RANGES[range];}
 
     int getAtk() {return atk;}
     int getDef() {return def;}
     int getFreq() {return freq;}
+    int getAction() {return action;}
+    int getRange() {return range;}
 
     String getDistance() {return distance;}
     String getName(){return name;}
diff --git a/app/src/main/java/com/kauron/dungeonmanager/ShowPlayer.java b/app/src/main/java/com/kauron/dungeonmanager/ShowPlayer.java
index d69c9f8..e2e6e8f 100644
--- a/app/src/main/java/com/kauron/dungeonmanager/ShowPlayer.java
+++ b/app/src/main/java/com/kauron/dungeonmanager/ShowPlayer.java
@@ -577,13 +577,30 @@ public class ShowPlayer extends ActionBarActivity {
                         nameText.setBackgroundColor(color);
 
                         ((TextView) nameText).setText(power.getName());
-                        ((TextView) dialog.findViewById(R.id.typeText)).setText(power.getTypeString());
-                        ((TextView) dialog.findViewById(R.id.rangeText)).setText(power.getRangeString() + " ");
-                        ((TextView) dialog.findViewById(R.id.freqText)).setText(power.getFrequencyString());
+
+                        if (power.getAction() != 0)
+                            ((TextView) dialog.findViewById(R.id.actionText)).setText(power.getActionString());
+                        else dialog.findViewById(R.id.actionText).setVisibility(View.GONE);
+
+                        if (power.getRange() != 0)
+                            ((TextView) dialog.findViewById(R.id.rangeText)).setText(power.getRangeString() + " ");
+                        else dialog.findViewById(R.id.rangeText).setVisibility(View.GONE);
+
+                        if (power.getFreq() != 0)
+                            ((TextView) dialog.findViewById(R.id.freqText)).setText(power.getFrequencyString());
+                        else dialog.findViewById(R.id.freqText).setVisibility(View.GONE);
+
                         ((TextView) dialog.findViewById(R.id.keywordsText)).setText(power.getKeywords());
                         ((TextView) dialog.findViewById(R.id.distanceText)).setText(String.valueOf(power.getDistance()));
-                        ((TextView) dialog.findViewById(R.id.objectiveText)).setText(power.getObjective());
-                        ((TextView) dialog.findViewById(R.id.impactText)).setText(power.getImpact());
+
+                        if (!power.getObjective().isEmpty())
+                            ((TextView) dialog.findViewById(R.id.objectiveText)).setText(power.getObjective());
+                        else dialog.findViewById(R.id.objectiveLayout).setVisibility(View.GONE);
+
+                        if (!power.getImpact().isEmpty())
+                            ((TextView) dialog.findViewById(R.id.impactText)).setText(power.getImpact());
+                        else dialog.findViewById(R.id.impactLayout).setVisibility(View.GONE);
+
                         ((TextView) dialog.findViewById(R.id.otherText)).setText(power.getOther());
 
                         String[] attack = getResources().getStringArray(R.array.attack);
diff --git a/app/src/main/res/layout/attack_display.xml b/app/src/main/res/layout/attack_display.xml
index 4b7bac1..f2e3803 100644
--- a/app/src/main/res/layout/attack_display.xml
+++ b/app/src/main/res/layout/attack_display.xml
@@ -19,162 +19,159 @@
         android:textColor="@color/white"
         android:id="@+id/nameText" />
 
-    <RelativeLayout
-        android:layout_marginBottom="@dimen/activity_vertical_margin"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    <ScrollView android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            tools:text="Daily"
-            android:id="@+id/freqText"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_marginRight="25dp"
-            android:textColor="@color/black"
-            android:textStyle="bold" />
+        <LinearLayout
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            tools:text="Fire, arcana"
-            android:id="@+id/keywordsText"
-            android:layout_toRightOf="@+id/freqText"
-            android:textColor="@color/black"
-            android:layout_toEndOf="@+id/freqText"
-            android:textStyle="bold" />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            tools:text="Standard action"
-            android:textColor="@color/black"
-            android:id="@+id/typeText"
-            android:layout_below="@+id/keywordsText"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:layout_marginRight="25dp"
-            android:textStyle="bold" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    tools:text="Daily"
+                    android:id="@+id/freqText"
+                    android:layout_marginRight="25dp"
+                    android:textColor="@color/black"
+                    android:textStyle="bold" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            tools:text="Ranged "
-            android:id="@+id/rangeText"
-            android:textStyle="bold"
-            android:layout_alignTop="@+id/typeText"
-            android:layout_toRightOf="@+id/typeText"
-            android:layout_toEndOf="@+id/typeText" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@color/black"
-            tools:text="8"
-            android:id="@+id/distanceText"
-            android:layout_toRightOf="@+id/rangeText"
-            android:layout_alignTop="@+id/rangeText"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    tools:text="Fire, arcana"
+                    android:id="@+id/keywordsText"
+                    android:textColor="@color/black"
+                    android:textStyle="bold" />
+            </LinearLayout>
 
-        <TextView
-            android:textColor="@color/black"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="@string/objective"
-            android:paddingRight="3sp"
-            android:id="@+id/objective"
-            android:layout_below="@+id/distanceText"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
-            android:textStyle="bold" />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="@string/attack"
-            android:paddingRight="3sp"
-            android:textStyle="bold"
-            android:textColor="@color/black"
-            android:id="@+id/attack"
-            android:layout_below="@+id/objectiveText"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    tools:text="Standard action"
+                    android:textColor="@color/black"
+                    android:id="@+id/actionText"
+                    android:layout_marginRight="25dp"
+                    android:textStyle="bold" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:textColor="@color/black"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="@string/impact"
-            android:paddingRight="3sp"
-            android:textStyle="bold"
-            android:id="@+id/impact"
-            android:layout_below="@+id/attack"
-            android:background="@color/darkened_text"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true" />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    tools:text="Ranged "
+                    android:id="@+id/rangeText"
+                    android:textStyle="bold"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black"
+                    tools:text="8"
+                    android:id="@+id/distanceText"/>
+            </LinearLayout>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:textColor="@color/black"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            tools:text="Constitución contra Reflejos"
-            android:id="@+id/attackText"
-            android:layout_below="@+id/objectiveText"
-            android:layout_toRightOf="@+id/attack"
-            android:layout_toEndOf="@+id/attack" />
+            <LinearLayout
+                android:id="@+id/objectiveLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            tools:text="one creature"
-            android:textColor="@color/black"
-            android:id="@+id/objectiveText"
-            android:layout_below="@+id/distanceText"
-            android:layout_toRightOf="@+id/objective"
-            android:layout_toEndOf="@+id/objective" />
+                <TextView
+                    android:textColor="@color/black"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:text="@string/objective"
+                    android:paddingRight="3sp"
+                    android:id="@+id/objective"
+                    android:textStyle="bold" />
 
-        <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/darkened_text"
-            android:textColor="@color/black"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            tools:text="1d8"
-            android:id="@+id/impactText"
-            android:layout_below="@+id/attackText"
-            android:layout_toRightOf="@+id/impact"
-            android:layout_toEndOf="@+id/impact" />
-        <TextView
-            android:layout_width="wrap_content"
-            android:textColor="@color/black"
-            android:layout_height="wrap_content"
-            android:id="@+id/otherText"
-            android:layout_below="@+id/impactText"
-            tools:text="If you are reading this the description has been displayed"
-            android:layout_alignParentLeft="true"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    tools:text="one creature"
+                    android:textColor="@color/black"
+                    android:id="@+id/objectiveText"/>
+            </LinearLayout>
 
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/use"
-            android:background="@android:color/transparent"
-            android:textStyle="bold"
-            android:id="@+id/useButton"
-            android:layout_gravity="right"
-            android:layout_below="@+id/otherText"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true" />
-    </RelativeLayout>
+            <LinearLayout
+                android:id="@+id/attackLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content">
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:text="@string/attack"
+                    android:paddingRight="3sp"
+                    android:textStyle="bold"
+                    android:textColor="@color/black"
+                    android:id="@+id/attack"/>
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:textColor="@color/black"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    tools:text="Constitución contra Reflejos"
+                    android:id="@+id/attackText"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/impactLayout"
+                android:background="@color/darkened_text"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:textColor="@color/black"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:text="@string/impact"
+                    android:paddingRight="3sp"
+                    android:textStyle="bold"
+                    android:id="@+id/impact"/>
+                <TextView
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/black"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    tools:text="1d8"
+                    android:id="@+id/impactText"/>
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:textColor="@color/black"
+                android:layout_height="wrap_content"
+                android:id="@+id/otherText"
+                android:layout_below="@+id/impactText"
+                tools:text="Other text"/>
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/use"
+                android:background="@android:color/transparent"
+                android:textStyle="bold"
+                android:id="@+id/useButton"
+                android:layout_gravity="right" />
+        </LinearLayout>
+    </ScrollView>
 </LinearLayout>
\ No newline at end of file