From ef05ac1c5a1d665f8f56e1733dc718ed6455bfbf Mon Sep 17 00:00:00 2001 From: Tom Hicks Date: Sun, 4 Apr 2021 03:28:20 -0700 Subject: [PATCH] Reorganizes the project tree and adds a task. --- MonsterCards.xcodeproj/project.pbxproj | 18 +++++++++++------- MonsterCards/Models/MonsterViewModel.swift | 2 ++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/MonsterCards.xcodeproj/project.pbxproj b/MonsterCards.xcodeproj/project.pbxproj index 7527c24..dac0873 100644 --- a/MonsterCards.xcodeproj/project.pbxproj +++ b/MonsterCards.xcodeproj/project.pbxproj @@ -29,6 +29,7 @@ E219248A26198A5400C84E12 /* TraitDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = E219248926198A5400C84E12 /* TraitDTO.swift */; }; E219248F26198A6A00C84E12 /* DamageTypeDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = E219248E26198A6A00C84E12 /* DamageTypeDTO.swift */; }; E219249426198A8200C84E12 /* LanguageDTO.swift in Sources */ = {isa = PBXBuildFile; fileRef = E219249326198A8200C84E12 /* LanguageDTO.swift */; }; + E219249926198E0D00C84E12 /* MonsterImportHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = E219249826198E0D00C84E12 /* MonsterImportHelper.swift */; }; E24ACE502607326E009BF703 /* EditBasicInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = E24ACE4F2607326E009BF703 /* EditBasicInfo.swift */; }; E24ACE562607EE94009BF703 /* EditArmor.swift in Sources */ = {isa = PBXBuildFile; fileRef = E24ACE552607EE94009BF703 /* EditArmor.swift */; }; E24ACE5B2607F0F2009BF703 /* EditSpeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = E24ACE5A2607F0F2009BF703 /* EditSpeed.swift */; }; @@ -108,6 +109,7 @@ E219248926198A5400C84E12 /* TraitDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TraitDTO.swift; sourceTree = ""; }; E219248E26198A6A00C84E12 /* DamageTypeDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DamageTypeDTO.swift; sourceTree = ""; }; E219249326198A8200C84E12 /* LanguageDTO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguageDTO.swift; sourceTree = ""; }; + E219249826198E0D00C84E12 /* MonsterImportHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonsterImportHelper.swift; sourceTree = ""; }; E24ACE4F2607326E009BF703 /* EditBasicInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditBasicInfo.swift; sourceTree = ""; }; E24ACE552607EE94009BF703 /* EditArmor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditArmor.swift; sourceTree = ""; }; E24ACE5A2607F0F2009BF703 /* EditSpeed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditSpeed.swift; sourceTree = ""; }; @@ -268,12 +270,12 @@ E2B5285825B3028700AAA69E /* EditMonster.swift */, E24ACE642607F55D009BF703 /* EditSavingThrows.swift */, E2CB0DB226080C0500142591 /* EditSkill.swift */, - E21661D02616E9A800117782 /* ImportMonster.swift */, E24ACE692607F715009BF703 /* EditSkills.swift */, E24ACE5A2607F0F2009BF703 /* EditSpeed.swift */, E2CB0DE526088CE400142591 /* EditStrings.swift */, E254F912260D1F6D009295A5 /* EditTrait.swift */, E254F90D260D19A0009295A5 /* EditTraits.swift */, + E21661D02616E9A800117782 /* ImportMonster.swift */, E2570FFE25B1AE180055B23B /* Library.swift */, E2CB0DB726081A2F00142591 /* MCAbilityScorePicker.swift */, E210B83E25B42DAB0083EAC5 /* MCAdvantagePicker.swift */, @@ -294,19 +296,19 @@ children = ( E254F905260D0818009295A5 /* AbilityViewModel.swift */, E216B7B6260C5A9800FB205F /* ChallengeRatingViewModel.swift */, + E219248E26198A6A00C84E12 /* DamageTypeDTO.swift */, + E20209E625D8DEB600EFE733 /* Enums */, + E219249326198A8200C84E12 /* LanguageDTO.swift */, E216B790260C1FE800FB205F /* LanguageViewModel.swift */, E2182E6225B22F8A00DFAEF8 /* Monster+CoreDataClass.swift */, + E219247A261989B400C84E12 /* MonsterDTO.swift */, E20209FA25D8E19100EFE733 /* MonsterViewModel.swift */, + E219247F261989F700C84E12 /* SavingThrowDTO.swift */, E20209D225D8DD9600EFE733 /* Skill+CoreDataClass.swift */, + E219248426198A1200C84E12 /* SkillDTO.swift */, E20209F925D8E19100EFE733 /* SkillViewModel.swift */, E2CB0DE0260887ED00142591 /* StringViewModel.swift */, - E20209E625D8DEB600EFE733 /* Enums */, - E219247A261989B400C84E12 /* MonsterDTO.swift */, - E219249326198A8200C84E12 /* LanguageDTO.swift */, - E219247F261989F700C84E12 /* SavingThrowDTO.swift */, - E219248426198A1200C84E12 /* SkillDTO.swift */, E219248926198A5400C84E12 /* TraitDTO.swift */, - E219248E26198A6A00C84E12 /* DamageTypeDTO.swift */, ); path = Models; sourceTree = ""; @@ -315,6 +317,7 @@ isa = PBXGroup; children = ( E2D473FC25B532C900CB36D7 /* Color+Hex.swift */, + E219249826198E0D00C84E12 /* MonsterImportHelper.swift */, E2CB0DD62608720000142591 /* StringHelper.swift */, ); path = Helpers; @@ -477,6 +480,7 @@ E2CB0DD72608720000142591 /* StringHelper.swift in Sources */, E2570FF525B1ADEB0055B23B /* Dashboard.swift in Sources */, E2CB0DB826081A2F00142591 /* MCAbilityScorePicker.swift in Sources */, + E219249926198E0D00C84E12 /* MonsterImportHelper.swift in Sources */, E2CB0DC026086E3C00142591 /* ChallengeRating.swift in Sources */, E257100425B1AF4A0055B23B /* SearchBar.swift in Sources */, E20209F525D8E04300EFE733 /* AdvantageType.swift in Sources */, diff --git a/MonsterCards/Models/MonsterViewModel.swift b/MonsterCards/Models/MonsterViewModel.swift index a99d3e7..61031a4 100644 --- a/MonsterCards/Models/MonsterViewModel.swift +++ b/MonsterCards/Models/MonsterViewModel.swift @@ -10,6 +10,8 @@ import CoreData class MonsterViewModel: ObservableObject { + // TODO: Determine whether to prefer Int or Int64 for these fields and switch as many as possible to the winner. + @Published var name: String @Published var size: String @Published var type: String