diff --git a/iOS/MonsterCards.xcodeproj/project.pbxproj b/iOS/MonsterCards.xcodeproj/project.pbxproj index fbcff00..5d80e08 100644 --- a/iOS/MonsterCards.xcodeproj/project.pbxproj +++ b/iOS/MonsterCards.xcodeproj/project.pbxproj @@ -25,6 +25,7 @@ E25BD60425036CF0007B04EF /* Ability.m in Sources */ = {isa = PBXBuildFile; fileRef = E25BD60325036CF0007B04EF /* Ability.m */; }; E25BD60725036CFA007B04EF /* Action.m in Sources */ = {isa = PBXBuildFile; fileRef = E25BD60625036CFA007B04EF /* Action.m */; }; E26A73572511BA1900C5677E /* HTMLHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = E26A73562511BA1900C5677E /* HTMLHelper.m */; }; + E278E21B250DFFCA00D3EC0E /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E278E21A250DFFCA00D3EC0E /* Images.xcassets */; }; E2D3E3B0250827110052A8EC /* EditMonsterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2D3E3AF250827110052A8EC /* EditMonsterViewController.m */; }; E2D3E3B42508C3360052A8EC /* EditableShortStringTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E2D3E3B32508C3360052A8EC /* EditableShortStringTableViewCell.m */; }; E2E25805250CC3A7002E7308 /* MonsterCards.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = E2F7248225005E89007D87ED /* MonsterCards.xcdatamodeld */; }; @@ -102,6 +103,7 @@ E265EE24B2C8E81E1B559306 /* Pods-MonsterCards-MonsterCardsUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MonsterCards-MonsterCardsUITests.debug.xcconfig"; path = "Target Support Files/Pods-MonsterCards-MonsterCardsUITests/Pods-MonsterCards-MonsterCardsUITests.debug.xcconfig"; sourceTree = ""; }; E26A73552511BA1900C5677E /* HTMLHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HTMLHelper.h; sourceTree = ""; }; E26A73562511BA1900C5677E /* HTMLHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HTMLHelper.m; sourceTree = ""; }; + E278E21A250DFFCA00D3EC0E /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; E2D3E3AE250827110052A8EC /* EditMonsterViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EditMonsterViewController.h; sourceTree = ""; }; E2D3E3AF250827110052A8EC /* EditMonsterViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EditMonsterViewController.m; sourceTree = ""; }; E2D3E3B22508C3360052A8EC /* EditableShortStringTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EditableShortStringTableViewCell.h; sourceTree = ""; }; @@ -286,6 +288,7 @@ E2F7247425005E89007D87ED /* AppDelegate.m */, E2F7247625005E89007D87ED /* SceneDelegate.h */, E2F7247725005E89007D87ED /* SceneDelegate.m */, + E278E21A250DFFCA00D3EC0E /* Images.xcassets */, E2F7247F25005E89007D87ED /* Main.storyboard */, E2F7248525005E8A007D87ED /* Assets.xcassets */, E2F7248725005E8A007D87ED /* LaunchScreen.storyboard */, @@ -439,6 +442,7 @@ buildActionMask = 2147483647; files = ( E2F7248925005E8A007D87ED /* LaunchScreen.storyboard in Resources */, + E278E21B250DFFCA00D3EC0E /* Images.xcassets in Resources */, E2F7248625005E8A007D87ED /* Assets.xcassets in Resources */, E2F7248125005E89007D87ED /* Main.storyboard in Resources */, ); diff --git a/iOS/MonsterCards/Assets.xcassets/first.imageset/Contents.json b/iOS/MonsterCards/Assets.xcassets/first.imageset/Contents.json deleted file mode 100644 index 33a7451..0000000 --- a/iOS/MonsterCards/Assets.xcassets/first.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "first.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iOS/MonsterCards/Assets.xcassets/first.imageset/first.pdf b/iOS/MonsterCards/Assets.xcassets/first.imageset/first.pdf deleted file mode 100644 index 47d911d..0000000 Binary files a/iOS/MonsterCards/Assets.xcassets/first.imageset/first.pdf and /dev/null differ diff --git a/iOS/MonsterCards/Assets.xcassets/second.imageset/Contents.json b/iOS/MonsterCards/Assets.xcassets/second.imageset/Contents.json deleted file mode 100644 index 03bd9c9..0000000 --- a/iOS/MonsterCards/Assets.xcassets/second.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "second.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/iOS/MonsterCards/Assets.xcassets/second.imageset/second.pdf b/iOS/MonsterCards/Assets.xcassets/second.imageset/second.pdf deleted file mode 100644 index 401614e..0000000 Binary files a/iOS/MonsterCards/Assets.xcassets/second.imageset/second.pdf and /dev/null differ diff --git a/iOS/MonsterCards/Assets/section-divider.png b/iOS/MonsterCards/Assets/section-divider.png new file mode 100644 index 0000000..6340565 Binary files /dev/null and b/iOS/MonsterCards/Assets/section-divider.png differ diff --git a/iOS/MonsterCards/Assets/section-divider@2x.png b/iOS/MonsterCards/Assets/section-divider@2x.png new file mode 100644 index 0000000..5a17101 Binary files /dev/null and b/iOS/MonsterCards/Assets/section-divider@2x.png differ diff --git a/iOS/MonsterCards/Assets/section-divider@3x.png b/iOS/MonsterCards/Assets/section-divider@3x.png new file mode 100644 index 0000000..831a843 Binary files /dev/null and b/iOS/MonsterCards/Assets/section-divider@3x.png differ diff --git a/iOS/MonsterCards/Base.lproj/Main.storyboard b/iOS/MonsterCards/Base.lproj/Main.storyboard index 795f07a..5462e72 100644 --- a/iOS/MonsterCards/Base.lproj/Main.storyboard +++ b/iOS/MonsterCards/Base.lproj/Main.storyboard @@ -197,12 +197,30 @@ + + + + + + + + + + + + + @@ -214,6 +232,7 @@ + @@ -299,6 +318,7 @@ + diff --git a/iOS/MonsterCards/Images.xcassets/Contents.json b/iOS/MonsterCards/Images.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/iOS/MonsterCards/Images.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOS/MonsterCards/Images.xcassets/section-divider.imageset/Contents.json b/iOS/MonsterCards/Images.xcassets/section-divider.imageset/Contents.json new file mode 100644 index 0000000..0db353e --- /dev/null +++ b/iOS/MonsterCards/Images.xcassets/section-divider.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "section-divider.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "section-divider@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "section-divider@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iOS/MonsterCards/Images.xcassets/section-divider.imageset/section-divider.png b/iOS/MonsterCards/Images.xcassets/section-divider.imageset/section-divider.png new file mode 100644 index 0000000..6340565 Binary files /dev/null and b/iOS/MonsterCards/Images.xcassets/section-divider.imageset/section-divider.png differ diff --git a/iOS/MonsterCards/Images.xcassets/section-divider.imageset/section-divider@2x.png b/iOS/MonsterCards/Images.xcassets/section-divider.imageset/section-divider@2x.png new file mode 100644 index 0000000..5a17101 Binary files /dev/null and b/iOS/MonsterCards/Images.xcassets/section-divider.imageset/section-divider@2x.png differ diff --git a/iOS/MonsterCards/Images.xcassets/section-divider.imageset/section-divider@3x.png b/iOS/MonsterCards/Images.xcassets/section-divider.imageset/section-divider@3x.png new file mode 100644 index 0000000..831a843 Binary files /dev/null and b/iOS/MonsterCards/Images.xcassets/section-divider.imageset/section-divider@3x.png differ diff --git a/iOS/MonsterCards/Views/MonsterViewController.h b/iOS/MonsterCards/Views/MonsterViewController.h index 305ad8e..c3d8e16 100644 --- a/iOS/MonsterCards/Views/MonsterViewController.h +++ b/iOS/MonsterCards/Views/MonsterViewController.h @@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN @property (weak, nonatomic) IBOutlet UILabel *monsterName; @property (weak, nonatomic) IBOutlet UILabel *monsterMeta; +@property (weak, nonatomic) IBOutlet UILabel *monsterArmorClass; @property Monster* monster; diff --git a/iOS/MonsterCards/Views/MonsterViewController.m b/iOS/MonsterCards/Views/MonsterViewController.m index 33a0b66..a7cacf3 100644 --- a/iOS/MonsterCards/Views/MonsterViewController.m +++ b/iOS/MonsterCards/Views/MonsterViewController.m @@ -8,6 +8,7 @@ #import "MonsterViewController.h" #import "EditMonsterViewController.h" +#import "HTMLHelper.h" @interface MonsterViewController () @@ -35,11 +36,21 @@ self.navigationItem.title = self.monster.name; } } - NSString *metaText = self.monster.meta; - if (metaText == nil) { - self.monsterMeta.text = @""; - } else { - self.monsterMeta.text = metaText; + if (self.monsterMeta != nil) { + NSString *metaText = self.monster.meta; + if (metaText == nil) { + self.monsterMeta.text = @""; + } else { + self.monsterMeta.text = metaText; + } + } + if (self.monsterArmorClass != nil) { + NSString *armorClassDescription = self.monster.armorClassDescription; + if (armorClassDescription == nil) { + self.monsterArmorClass.text = @""; + } else { + self.monsterArmorClass.attributedText = [HTMLHelper attributedStringFromHTML:[NSString stringWithFormat:@"Armor Class %@", armorClassDescription]]; + } } } diff --git a/iOS/Pods/Pods.xcodeproj/project.pbxproj b/iOS/Pods/Pods.xcodeproj/project.pbxproj index f0ac369..248d683 100644 --- a/iOS/Pods/Pods.xcodeproj/project.pbxproj +++ b/iOS/Pods/Pods.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -1546,7 +1546,7 @@ LastUpgradeCheck = 1100; }; buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */; - compatibilityVersion = "Xcode 9.3"; + compatibilityVersion = "Xcode 10.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = (