From 212358e41dece1f04c12d6b65701435668c48c74 Mon Sep 17 00:00:00 2001
From: Tom Hicks <headhunter3@gmail.com>
Date: Tue, 1 Sep 2020 20:55:58 -0700
Subject: [PATCH] Adds hit points to monster card.

---
 Android/.idea/gradle.xml                      |  1 +
 .../monstercards/models/Monster.java          | 55 +++++++++++++++++++
 .../ui/monster/MonsterFragment.java           | 13 +++++
 .../ui/monster/MonsterViewModel.java          |  8 ++-
 .../src/main/res/layout/fragment_monster.xml  | 13 +++++
 5 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/Android/.idea/gradle.xml b/Android/.idea/gradle.xml
index b9f8a5e..ac6b0ae 100644
--- a/Android/.idea/gradle.xml
+++ b/Android/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java b/Android/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java
index bb31122..598971d 100644
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java
@@ -284,4 +284,59 @@ public class Monster {
     private static final int SPLINT_ARMOR_CLASS = BASE_ARMOR_CLASS + 7;
     private static final int PLATE_ARMOR_CLASS = BASE_ARMOR_CLASS + 8;
 
+    private int mHitDice;
+    public int getHitDice() {
+        return mHitDice;
+    }
+    public void setHitDice(int value) {
+        mHitDice = value;
+    }
+
+    private boolean mCustomHP;
+    public boolean getCustomHP() {
+        return mCustomHP;
+    }
+    public void setCustomHP(boolean value) {
+        mCustomHP = value;
+    }
+
+    private String mHPText;
+    public String getHPText() {
+        return mHPText;
+    }
+    public void setHPText(String value) {
+        mHPText = value;
+    }
+
+    public String getHitPoints() {
+        if (getCustomHP()) {
+            return getHPText();
+        } else {
+            int hitDice = getHitDice();
+            int dieSize = getHitDieForSize(getSize());
+            int conMod = getConstitutionModifier();
+            int hpTotal = (int) Math.max(1, Math.ceil(hitDice * ((dieSize + 1) / 2.0 + conMod)));
+            return String.format(Locale.US, "%d (%dd%d %+d)", hpTotal, hitDice, dieSize, conMod * hitDice);
+        }
+    }
+
+    private static int getHitDieForSize(String size) {
+        if ("tiny".equals(size)) {
+            return 4;
+        } else if ("small".equals(size)) {
+            return 6;
+        } else if ("medium".equals(size)) {
+            return 8;
+        } else if ("large".equals(size)) {
+            return 10;
+        } else if ("huge".equals(size)) {
+            return 12;
+        } else if ("gargantuan".equals(size)) {
+            return 20;
+        } else {
+            return 8;
+        }
+    }
+
+
 }
diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterFragment.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterFragment.java
index 217c614..3e4e6d8 100644
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterFragment.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterFragment.java
@@ -38,6 +38,11 @@ public class MonsterFragment extends Fragment {
         monster.setShieldBonus(0);
         monster.setNaturalArmorBonus(7);
         monster.setOtherArmorDescription("14");
+        // Hit Points
+        monster.setHitDice(1);
+        monster.setCustomHP(false);
+        monster.setHPText("11 (2d8 + 2)");
+
         // END remove block
         monsterViewModel = new ViewModelProvider(this).get(MonsterViewModel.class);
         View root = inflater.inflate(R.layout.fragment_monster, container, false);
@@ -67,6 +72,14 @@ public class MonsterFragment extends Fragment {
             }
         });
 
+        final TextView monsterHitPoints = root.findViewById(R.id.hit_points);
+        monsterViewModel.getHitPoints().observe(getViewLifecycleOwner(), new Observer<String>() {
+            @Override
+            public void onChanged(String hitPoints) {
+                monsterHitPoints.setText(Html.fromHtml("<b>Hit Points</b> " + hitPoints));
+            }
+        });
+
         return root;
     }
 }
diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java
index 26f03d3..fc09444 100644
--- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java
+++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/monster/MonsterViewModel.java
@@ -16,7 +16,8 @@ public class MonsterViewModel extends ViewModel {
         mMeta.setValue("");
         mArmorClass = new MutableLiveData<>();
         mArmorClass.setValue("");
-
+        mHitPoints = new MutableLiveData<>();
+        mHitPoints.setValue("");
     }
 
     private MutableLiveData<String> mName;
@@ -31,6 +32,10 @@ public class MonsterViewModel extends ViewModel {
     public LiveData<String> getArmorClass() {
         return mArmorClass;
     }
+    private MutableLiveData<String> mHitPoints;
+    public LiveData<String> getHitPoints() {
+        return mHitPoints;
+    }
 
     private Monster mMonster;
     public void setMonster(Monster monster) {
@@ -38,5 +43,6 @@ public class MonsterViewModel extends ViewModel {
         mName.setValue(mMonster.getName());
         mMeta.setValue(mMonster.getMeta());
         mArmorClass.setValue(mMonster.getArmorClass());
+        mHitPoints.setValue(mMonster.getHitPoints());
     }
 }
\ No newline at end of file
diff --git a/Android/app/src/main/res/layout/fragment_monster.xml b/Android/app/src/main/res/layout/fragment_monster.xml
index 5f140dd..73d1a57 100644
--- a/Android/app/src/main/res/layout/fragment_monster.xml
+++ b/Android/app/src/main/res/layout/fragment_monster.xml
@@ -69,5 +69,18 @@
             app:layout_constraintTop_toBottomOf="@+id/divider1"
             tools:text="Armor Class 15" />
 
+        <TextView
+            android:id="@+id/hit_points"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/armor_class"
+            tools:text="Hit Points 1 (1d4 - 1)" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file