From 5a2e98d35b0cfab42b942de808aa52a381bd0ed6 Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Fri, 25 Sep 2020 03:52:44 -0700 Subject: [PATCH] Adds HP to monster card. --- MonsterCards/Base.lproj/Main.storyboard | 10 ++++++++++ MonsterCards/Views/MonsterViewController.h | 1 + MonsterCards/Views/MonsterViewController.m | 8 ++++++++ MonsterCardsTests/Models/MonsterTests.m | 1 - 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/MonsterCards/Base.lproj/Main.storyboard b/MonsterCards/Base.lproj/Main.storyboard index 49df5d6..83e1d55 100644 --- a/MonsterCards/Base.lproj/Main.storyboard +++ b/MonsterCards/Base.lproj/Main.storyboard @@ -211,16 +211,25 @@ + + + + @@ -235,6 +244,7 @@ + diff --git a/MonsterCards/Views/MonsterViewController.h b/MonsterCards/Views/MonsterViewController.h index c3d8e16..c04af53 100644 --- a/MonsterCards/Views/MonsterViewController.h +++ b/MonsterCards/Views/MonsterViewController.h @@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN @property (weak, nonatomic) IBOutlet UILabel *monsterName; @property (weak, nonatomic) IBOutlet UILabel *monsterMeta; @property (weak, nonatomic) IBOutlet UILabel *monsterArmorClass; +@property (weak, nonatomic) IBOutlet UILabel *monsterHitPoints; @property Monster* monster; diff --git a/MonsterCards/Views/MonsterViewController.m b/MonsterCards/Views/MonsterViewController.m index a7cacf3..e5e1583 100644 --- a/MonsterCards/Views/MonsterViewController.m +++ b/MonsterCards/Views/MonsterViewController.m @@ -52,6 +52,14 @@ self.monsterArmorClass.attributedText = [HTMLHelper attributedStringFromHTML:[NSString stringWithFormat:@"Armor Class %@", armorClassDescription]]; } } + if (self.monsterHitPoints != nil) { + NSString *hitPointsDescription = self.monster.hitPointsDescription; + if (hitPointsDescription == nil) { + self.monsterHitPoints.text = @""; + } else { + self.monsterHitPoints.attributedText = [HTMLHelper attributedStringFromHTML:[NSString stringWithFormat:@"Hit Points %@", hitPointsDescription]]; + } + } } - (IBAction)unwindWithSegue:(UIStoryboardSegue *)unwindSegue { diff --git a/MonsterCardsTests/Models/MonsterTests.m b/MonsterCardsTests/Models/MonsterTests.m index eec86b9..72dcbd5 100644 --- a/MonsterCardsTests/Models/MonsterTests.m +++ b/MonsterCardsTests/Models/MonsterTests.m @@ -435,5 +435,4 @@ XCTAssertEqualObjects(@"20 (3d8+3)", _monster.hitPointsDescription); } - @end