From 8706240fb49ba07c7a138966a6a39ea92ae9fa5b Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Sat, 1 May 2021 00:50:14 -0700 Subject: [PATCH] Adds DevContent class with dev resources. Specifically an example monster. Adds a task. --- .../majinnaibu/monstercards/data/DevContent.java | 13 +++++-------- .../monstercards/ui/library/LibraryFragment.java | 1 + 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/data/DevContent.java b/Android/app/src/main/java/com/majinnaibu/monstercards/data/DevContent.java index 0145afe..f337c31 100644 --- a/Android/app/src/main/java/com/majinnaibu/monstercards/data/DevContent.java +++ b/Android/app/src/main/java/com/majinnaibu/monstercards/data/DevContent.java @@ -1,7 +1,5 @@ package com.majinnaibu.monstercards.data; -import androidx.annotation.NonNull; - import com.majinnaibu.monstercards.data.enums.AbilityScore; import com.majinnaibu.monstercards.data.enums.AdvantageType; import com.majinnaibu.monstercards.data.enums.ArmorType; @@ -12,9 +10,7 @@ import com.majinnaibu.monstercards.models.Monster; import com.majinnaibu.monstercards.models.Skill; import com.majinnaibu.monstercards.models.Trait; -@SuppressWarnings("unused") public final class DevContent { - @NonNull public static Monster createSampleMonster() { Monster monster = new Monster(); // Name @@ -84,10 +80,11 @@ public final class DevContent { // Condition Immunities monster.conditionImmunities.add("blinded"); // Senses - monster.senses.add("blindsight 10 ft. (blind beyond this range)"); - monster.senses.add("darkvision 20 ft."); - monster.senses.add("tremorsense 30 ft."); - monster.senses.add("truesight 40 ft."); + monster.blindsightRange = 10; + monster.isBlindBeyondBlindsightRange = true; + monster.darkvisionRange = 20; + monster.tremorsenseRange = 30; + monster.truesightRange = 40; monster.telepathyRange = 20; monster.understandsButDescription = "doesn't care"; // Languages diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java index 10b31a9..3cf8fd5 100644 --- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java +++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/library/LibraryFragment.java @@ -35,6 +35,7 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; import io.reactivex.rxjava3.schedulers.Schedulers; public class LibraryFragment extends MCFragment { + // TODO: TOM: rename MonsterFragment MonsterDetailFragment private LibraryViewModel libraryViewModel;