From 0fe24d767c84189b48d5c426190ed4cbcf8b752d Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Sun, 13 Sep 2020 05:04:22 -0700 Subject: [PATCH] Adds armor class to monster cards. --- iOS/MonsterCards.xcodeproj/project.pbxproj | 4 +++ .../first.imageset/Contents.json | 12 --------- .../Assets.xcassets/first.imageset/first.pdf | Bin 2465 -> 0 bytes .../second.imageset/Contents.json | 12 --------- .../second.imageset/second.pdf | Bin 2423 -> 0 bytes iOS/MonsterCards/Assets/section-divider.png | Bin 0 -> 338 bytes .../Assets/section-divider@2x.png | Bin 0 -> 1001 bytes .../Assets/section-divider@3x.png | Bin 0 -> 2774 bytes iOS/MonsterCards/Base.lproj/Main.storyboard | 20 +++++++++++++++ .../Images.xcassets/Contents.json | 6 +++++ .../section-divider.imageset/Contents.json | 23 ++++++++++++++++++ .../section-divider.png | Bin 0 -> 338 bytes .../section-divider@2x.png | Bin 0 -> 1001 bytes .../section-divider@3x.png | Bin 0 -> 2774 bytes .../Views/MonsterViewController.h | 1 + .../Views/MonsterViewController.m | 21 ++++++++++++---- iOS/Pods/Pods.xcodeproj/project.pbxproj | 4 +-- 17 files changed, 72 insertions(+), 31 deletions(-) delete mode 100644 iOS/MonsterCards/Assets.xcassets/first.imageset/Contents.json delete mode 100644 iOS/MonsterCards/Assets.xcassets/first.imageset/first.pdf delete mode 100644 iOS/MonsterCards/Assets.xcassets/second.imageset/Contents.json delete mode 100644 iOS/MonsterCards/Assets.xcassets/second.imageset/second.pdf create mode 100644 iOS/MonsterCards/Assets/section-divider.png create mode 100644 iOS/MonsterCards/Assets/section-divider@2x.png create mode 100644 iOS/MonsterCards/Assets/section-divider@3x.png create mode 100644 iOS/MonsterCards/Images.xcassets/Contents.json create mode 100644 iOS/MonsterCards/Images.xcassets/section-divider.imageset/Contents.json create mode 100644 iOS/MonsterCards/Images.xcassets/section-divider.imageset/section-divider.png create mode 100644 iOS/MonsterCards/Images.xcassets/section-divider.imageset/section-divider@2x.png create mode 100644 iOS/MonsterCards/Images.xcassets/section-divider.imageset/section-divider@3x.png 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 47d911dea647d55983671ead4d08b6f6b3600715..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2465 zcmai03se(l7FLvisY+L#f-EBsK`11Xkc1=%MIujmB|xQ!>5vQ%APFP`Mlf5nSPOKE z2-^C>7DZkM!J;Da5{kfrC?Kvp3J41-3shFXvhuJqKo*oer*r0H{{P-P_x0cTzLzjD!bE z0qT;#Q7l4Gy%fMoXJaKT`@{5#R(MOqJPwQifv8iK6A%Ot9L14h2`38T!2s4PM=1!< zmL06}VYAA|ay#jZRs>HpA%X+eQW4rufWU%d1w5GTy!X#LeZsF_+~ccZmn3Fi)v^Z; zIG;?uU*yLLEYs61tjD>gXOFvSWsh{48xJvPNqKrIJtMdCz2cA2aC7TF?b@K`V!Lw- zE;zpH&ApqhoRjAHt}gK}>(qAc8dvrkD31*`<5<%C(&4_LqhQ3-GOf8~n^leG?+-@@^pjPa$J2gW@O)!b9hdTJ zTauyIJ&~rqeEZC1p9dWgx7{_WRc2=drMO=wcT7B{Zd58z`d)r_36r4V<6PGkCjpGfbnVMtm@;b}F!T?)Qav$_y7H5T;Mf!T}M zWxP9TNqrV?e5;b|pWd3^u2KAatk&3aDB@0 zZBaQNdCZ2#fblzYZnRCCjQ-GQWb-s8bX&<)?SxnUGdDYVFVk`xIf7@g3~$DX`H71_;r5OSZz1p`$_8y_9 z{;MJJ+n=>7Ewg;GnGHoz)&ID0z@F2!e$F7cWQ?d6s(!VY)_Gw})xCyMvsD={5i&H* zAIr_ACo8;Se6<*!-mm9Am79Iz^RVlc?%S5sg|E*SyIV{dd9{Mpf#d3cih5WKt=%ps zBEo)bt8EjmeCFYJRYU|b7d`p+-V|X2wOCYtyLP6t=!WH-kgdf0A};ytPfZiCwVPx{ z`g;zpe{8a4RQxQUwVU02<4X3w|9h;}XjhGWquqn{vVqq8g{*}BQF9=ybe_TM*!M=rFs1pN)yzctIXAoicsCe6>fit>wgZ#vp^hZOY0`J`rx zwdSK?GwR_xm9;5XjH|vf{O+Yg-)z;s*xt>;-vU`D-_SK<=~4eEVQkV~57{vyH6ebu>DqwE~Mx_A31Lg~$ zy`i52ew?GEluE%AN>ju*5z~dx2QQLP-G+E>o|En2+s&<^4*d zWD+<8PXs_Jp7_5Dpi(Gg3J?M;%Rn0{dcxQRh!ip+iHJ_e`!bM1MGxwI8Iedr+x>wI zq@&04fsADHfBccq^gpm8Q_u-~Uj|Z$YwSR(^_mzUb!}Xb2Cj`uqphg}v_Y%?Fs=;= zWq3s{hy)Tu!ji@RJsd$C+G{F6V2j1*Xk+7xo|LO7M2yb)(wc=%x-AclP9pLsbTF7m tf?*P!2EjJu5MD57P32Q4pdJ3tO_shCDT2=K;$ebx8ymcd$v!V9{2$sQiO>K5 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 401614e288b4b160471c2776bed6f09762af3e1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2423 zcmai02~-nz8dqq7rWU#)x2z)&iMWtV?gK$2a)?|BP!TbkV}J-Gl1wmy+3G9S0=uOY zwCjai6uBOPMMdNiN`VDYKwLQr2#W^`R93*Ua=0^)EGYY4=grIf|KIohziYnv{elnR zdN_hk6db<(+3RPcxs!iut8c(j0TLh=9mY931H^rhEE0|aXo!dh5Iv+ZFr+}9F+v#P zLSnfD0$f~hN>~92V{z)WJA&2)5rW!|I?;o?oI*%zejJiuY>hFLQwKlAa9O+PnPh#% zJp~JAfs-De6u@;{cREMs}D-sGib_4>50m8_|Uj-zC0m@Qx zJV+^5Da4Qxpf3sBtKZs<_aI$Cb1T+h<->yL^rfiGNelYkqgC3#SqVP_iy*_RPcbjH)xYf zvYdC-)D_t8c{=5%;$VJQxs_#61J*kuXMC?|&PbPo-7uSxoNr~&J94|gKk+03JGXXM zx4w~=^VUzWqQveu_ilRgPdgNNdnLZCH`=;w91}cP5ihdm*B_jI+rk=Pz2Lk!)XUu| zkls3P5&YHJ!t0kF+MUVBHOAx)a zy|JxHNd37z*~b5#%*0w_F|#4?erNP;pG`Fevoq2%?9Y>%Cmzv1(ks;aPIGaiy1mhU zr{7lB^Mem&`QK{b{uiDC zLD8muY(FNk{YdV|zO#o_VB%);8|~Bh(Z4p?GM}g-HN2;q7~YNl-lD~HZ$taYw$Fzbn6c?c5eo=@`i>()el#qwB)hI-gp0 ztsw@dh-I5NJkk)RCoBC`L8ffKfY)=oG=#4LA9TO6eA}9~@a6dupB+=S{%s&NY}^0GY`hAqod)uxXHitrN%bWOJohV>t?!&Z#d4y^7J@=Oh`HV zee**4j>xRUd)|D0^I-B#<`m1-5PO{)!v(q?ecFYqr_8Q{+z7#n0uFbq%_?hZ-Ck(6NRn=vDS7Nb1Xxx_)9`!i- zGR>av*PJ+P_AGO*a_$FbtCCISg5PK44p&W#t$)+HVcxpR9LAL%_Pv$p`0tO*sYZD0 zCG3-ipr4WoVbjpw%Nf^r^rnWcDcjumgBPEjO;NM6QtZ8wU#0rjHx5zs%CahF4$W*U zxu!q8kYP+>v!BNPVIRJUGIWU@7qVvx2VZDw4gV8%z%bjpF#aF(W|PmliwlakuRq>= zhaCRc^R!7T)#Twb0{!Tns=CxGcGX|leErg`f3|v0eBXxHU&6Sj-_>zOL!!d+j5Xt* zPS;rWd^zEF{5d5%)nNK=)zFJ8Uc=aQKD%UK)_TNes1Gh{SD*Mb_@O` z7*zs9Uq~Vq?v|^8FcM-yLGMKzR3YFB0z@CFM2X-dio%Gu6&MJj=I?uS7sA3AdE^p8 zE49$PjJzPIJwfn;jso7X2#jynr3dO@p5QAK1O9wqKLC=PkQjj~p#n|-5O`ihbTzzu zL{}2QEe28pJYfVZRW56FL`LvO&|C^1Th{0}hQMW$Ng$QPpnzlwnMnf=kVy8(y==L% zLMa>r0gELdTl@6q@3MdrJZ{%l~(8;inh0Tt^L7Bxv8mN$=OTpoj!3Rc$2mD!_0?hIZ d3}FwLcISnH8|LSJnj6K_TAZzL3vJEGBl@9+ltnmM3 zY}^3R)D?3uAlk&`=xe2E`Vz}dwN-qo6N$V2fA-4{hNbhYmbFc&JK^CzvE+pYuY9nx z$LaU=KYn-R+t<12GIM|p@Rrh+@Ooa|V}D_ORe^n3eP>f*h5e#G4EE*={(NqzfAZYi zOlC`sNm$RF_$-I4zaDFrEnIwrfeEBH!2RHYgov#P4@}tvK>UV6E;iP~YOKub4I4oG z1Em@gB0OAddWRwEpD#}cFwl_LAp^16eG!=3pas$0=KwS_u1TF2Wgwp$e1D*du2MeF8_z$ zi?=3JJX7x2HRCzszbg}jX1=y$Thj68dw8(XlYRg1+&BLAKga;2iQ!ELNY@`(rM#0D zr}OTg^!m=v+7Hju+ox1Nv(lA~>T18%U-l_M9;CG4>|eIR%mud{0+Dmvv4F FO#p~uOMzCZFMlQZX>=Q+=F z-tSUifUl{^783w~=}|xLAOMW1@VkrAM)>)d^Xa?rvGGHHUvKz?XVI(W0stnLk9vEM z(}sT^d6@UVP78znf4KX6Vf^dY6$3|kZ@k=fCG#1{#qcy6>vKD2i+tK{ z>grf~cD6dP<_x@~&#TscfHb!F-b6{hlB41d*Kx$Ol5Gdvq|+&1t;!+QPNxnJGTtjkU-tLjAHMZObeCCUK;6L3p9$lDKgSFAYQ0 z=H9tc_488Xt58{Z9HpCIhRJ9cCmgYRT-~lZVk!OM#npQg2T;{N%!JrW=H`?^e(|`@ z1Gw+em&Ci~^+F@WAB@_(Y72?)B1`gamtjs)q+2pMB+6!jI8O2)_HIP?^vVH8;V4sx z&K=GeY)0YgY!r3L_Ey)2i;9FO#gnn8W2(h-vn7tcf3)*S16Cg1Xwz%*w0>|P*6XnF z-?h07NZ+6`bfnP9w#@16#O0QTi*lcn&j*t7oUsYgl&r;GU&G2{*~>5Il)31$S_(vm zu<}{FtMX>wVCLtn=7SZy_~*+eDphe-YRB=88Fqnbs5bJv8&o)AP8{Xg?AwETq9?l`R*z(`;D=*#0fYcjQ0`7^m>KRi(AJIRP3%H9UT6~)q z5q63fcYI2t^~4yRLAm6taXv{RNgKl)Qn~p|$2z@z-Pc*ovyXBa?-wpp6I+*s?R_|BrLsKZcHaTYp9g3MO;qwT}gso|C z-WS={pcRGD3=;X^@8)fKV=F)|TWPENgfe$S4MEHNp}&D7zq7^<_`L3@=v2XPtMvcW4|C}CTQrlzJso2=0EtRnh{6JdKg-y_Isd-yz@I4{isKYcOK3|4(#GjCavPJ5}BbO&jb z@z$dCp@V+WM)l&9jqv{7Uhsbqvg&VyQLj%TOP=V(SR|r~D<^82_a}PZ9$`x?zY8W6 zwzMseGegwThp|SGfwWQ`#Q|>BXfxjHNe!mkPE;EWDG%2zH5eVJMjohxb%6M;?iOkh ztGTV$xkg#BDTcG{eAqZyl0V_o`W1)awcAh)B@MGdy#ixj!(%Y4m4MCxpnqyzkHNSZ zrv#{ABvl7+kmR98zU1h!2~A%FVcrq$G(~#Flz$QX?7_E%`oFq!j&cT;qZSeMS#9G!5Y zy850glU_s9e|pyny-*hKkKBTKx5(VH^6-k8pO7qxWd`3oNS#Z{VDU1>j;W?R53kY- zmFm7BR9s{BG;{Nh9AWQiZ};-lI+A@tfoUG`v2uE9q3T)hM24!(6~m1)oGd+cYrOII zm6c!*XSnt?hiZ$=y&3I=j~2*l^XUGtWMoUIdeB8(N9o5pM(oVTf71RrpHyMcI`Qdc5|pycXgB);9ccOW&R&4vx}er literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6340565d03473bf1cfc17a432342d07ab304f9ca GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0y~yU{(OKML5`iWNC4vACO{8@^*It(m?Rjd3QYn10%bq zi(^Q|t+&?${SG;Zv|Y@8q!iI4T^yQsM)ilDh~S1jCMlOZCRpUATRm4X|9tDq%m4H4 z#hKLt4LI|l@+Ciz-t@bt<88t2CvPWh@9wBAieGHa^WAn=a?$c9=T81rxz3;O;-c@s z!0@2(DBqusj_cq1m;OKR%f!OaASC%iTNNmCE9Jpv4n`&h172qNIzl@6q@3MdrJZ{%l~(8;inh0Tt^L7Bxv8mN$=OTpoj!3Rc$2mD!_0?hIZ d3}FwLcISnH8|LSJnj6K_TAZzL3vJEGBl@9+ltnmM3 zY}^3R)D?3uAlk&`=xe2E`Vz}dwN-qo6N$V2fA-4{hNbhYmbFc&JK^CzvE+pYuY9nx z$LaU=KYn-R+t<12GIM|p@Rrh+@Ooa|V}D_ORe^n3eP>f*h5e#G4EE*={(NqzfAZYi zOlC`sNm$RF_$-I4zaDFrEnIwrfeEBH!2RHYgov#P4@}tvK>UV6E;iP~YOKub4I4oG z1Em@gB0OAddWRwEpD#}cFwl_LAp^16eG!=3pas$0=KwS_u1TF2Wgwp$e1D*du2MeF8_z$ zi?=3JJX7x2HRCzszbg}jX1=y$Thj68dw8(XlYRg1+&BLAKga;2iQ!ELNY@`(rM#0D zr}OTg^!m=v+7Hju+ox1Nv(lA~>T18%U-l_M9;CG4>|eIR%mud{0+Dmvv4F FO#p~uOMzCZFMlQZX>=Q+=F z-tSUifUl{^783w~=}|xLAOMW1@VkrAM)>)d^Xa?rvGGHHUvKz?XVI(W0stnLk9vEM z(}sT^d6@UVP78znf4KX6Vf^dY6$3|kZ@k=fCG#1{#qcy6>vKD2i+tK{ z>grf~cD6dP<_x@~&#TscfHb!F-b6{hlB41d*Kx$Ol5Gdvq|+&1t;!+QPNxnJGTtjkU-tLjAHMZObeCCUK;6L3p9$lDKgSFAYQ0 z=H9tc_488Xt58{Z9HpCIhRJ9cCmgYRT-~lZVk!OM#npQg2T;{N%!JrW=H`?^e(|`@ z1Gw+em&Ci~^+F@WAB@_(Y72?)B1`gamtjs)q+2pMB+6!jI8O2)_HIP?^vVH8;V4sx z&K=GeY)0YgY!r3L_Ey)2i;9FO#gnn8W2(h-vn7tcf3)*S16Cg1Xwz%*w0>|P*6XnF z-?h07NZ+6`bfnP9w#@16#O0QTi*lcn&j*t7oUsYgl&r;GU&G2{*~>5Il)31$S_(vm zu<}{FtMX>wVCLtn=7SZy_~*+eDphe-YRB=88Fqnbs5bJv8&o)AP8{Xg?AwETq9?l`R*z(`;D=*#0fYcjQ0`7^m>KRi(AJIRP3%H9UT6~)q z5q63fcYI2t^~4yRLAm6taXv{RNgKl)Qn~p|$2z@z-Pc*ovyXBa?-wpp6I+*s?R_|BrLsKZcHaTYp9g3MO;qwT}gso|C z-WS={pcRGD3=;X^@8)fKV=F)|TWPENgfe$S4MEHNp}&D7zq7^<_`L3@=v2XPtMvcW4|C}CTQrlzJso2=0EtRnh{6JdKg-y_Isd-yz@I4{isKYcOK3|4(#GjCavPJ5}BbO&jb z@z$dCp@V+WM)l&9jqv{7Uhsbqvg&VyQLj%TOP=V(SR|r~D<^82_a}PZ9$`x?zY8W6 zwzMseGegwThp|SGfwWQ`#Q|>BXfxjHNe!mkPE;EWDG%2zH5eVJMjohxb%6M;?iOkh ztGTV$xkg#BDTcG{eAqZyl0V_o`W1)awcAh)B@MGdy#ixj!(%Y4m4MCxpnqyzkHNSZ zrv#{ABvl7+kmR98zU1h!2~A%FVcrq$G(~#Flz$QX?7_E%`oFq!j&cT;qZSeMS#9G!5Y zy850glU_s9e|pyny-*hKkKBTKx5(VH^6-k8pO7qxWd`3oNS#Z{VDU1>j;W?R53kY- zmFm7BR9s{BG;{Nh9AWQiZ};-lI+A@tfoUG`v2uE9q3T)hM24!(6~m1)oGd+cYrOII zm6c!*XSnt?hiZ$=y&3I=j~2*l^XUGtWMoUIdeB8(N9o5pM(oVTf71RrpHyMcI`Qdc5|pycXgB);9ccOW&R&4vx}er literal 0 HcmV?d00001 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 = (