Renames the ability editor to trait editor since it's not just for abilities any more.

This commit is contained in:
2021-03-25 15:53:38 -07:00
parent 71a90a8851
commit 6b30b8d12e
4 changed files with 24 additions and 24 deletions

View File

@@ -30,8 +30,8 @@
E24ACE6A2607F715009BF703 /* EditSkills.swift in Sources */ = {isa = PBXBuildFile; fileRef = E24ACE692607F715009BF703 /* EditSkills.swift */; }; E24ACE6A2607F715009BF703 /* EditSkills.swift in Sources */ = {isa = PBXBuildFile; fileRef = E24ACE692607F715009BF703 /* EditSkills.swift */; };
E254F901260D07C1009295A5 /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = E254F900260D07C1009295A5 /* MarkdownUI */; }; E254F901260D07C1009295A5 /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = E254F900260D07C1009295A5 /* MarkdownUI */; };
E254F906260D0818009295A5 /* AbilityViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E254F905260D0818009295A5 /* AbilityViewModel.swift */; }; E254F906260D0818009295A5 /* AbilityViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E254F905260D0818009295A5 /* AbilityViewModel.swift */; };
E254F90E260D19A0009295A5 /* EditAbilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = E254F90D260D19A0009295A5 /* EditAbilities.swift */; }; E254F90E260D19A0009295A5 /* EditTraits.swift in Sources */ = {isa = PBXBuildFile; fileRef = E254F90D260D19A0009295A5 /* EditTraits.swift */; };
E254F913260D1F6D009295A5 /* EditAbility.swift in Sources */ = {isa = PBXBuildFile; fileRef = E254F912260D1F6D009295A5 /* EditAbility.swift */; }; E254F913260D1F6D009295A5 /* EditTrait.swift in Sources */ = {isa = PBXBuildFile; fileRef = E254F912260D1F6D009295A5 /* EditTrait.swift */; };
E2570FB925B1AC520055B23B /* MonsterCardsApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2570FB825B1AC520055B23B /* MonsterCardsApp.swift */; }; E2570FB925B1AC520055B23B /* MonsterCardsApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2570FB825B1AC520055B23B /* MonsterCardsApp.swift */; };
E2570FBB25B1AC520055B23B /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2570FBA25B1AC520055B23B /* ContentView.swift */; }; E2570FBB25B1AC520055B23B /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2570FBA25B1AC520055B23B /* ContentView.swift */; };
E2570FBD25B1AC550055B23B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2570FBC25B1AC550055B23B /* Assets.xcassets */; }; E2570FBD25B1AC550055B23B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2570FBC25B1AC550055B23B /* Assets.xcassets */; };
@@ -101,8 +101,8 @@
E24ACE642607F55D009BF703 /* EditSavingThrows.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditSavingThrows.swift; sourceTree = "<group>"; }; E24ACE642607F55D009BF703 /* EditSavingThrows.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditSavingThrows.swift; sourceTree = "<group>"; };
E24ACE692607F715009BF703 /* EditSkills.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditSkills.swift; sourceTree = "<group>"; }; E24ACE692607F715009BF703 /* EditSkills.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditSkills.swift; sourceTree = "<group>"; };
E254F905260D0818009295A5 /* AbilityViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AbilityViewModel.swift; sourceTree = "<group>"; }; E254F905260D0818009295A5 /* AbilityViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AbilityViewModel.swift; sourceTree = "<group>"; };
E254F90D260D19A0009295A5 /* EditAbilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditAbilities.swift; sourceTree = "<group>"; }; E254F90D260D19A0009295A5 /* EditTraits.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditTraits.swift; sourceTree = "<group>"; };
E254F912260D1F6D009295A5 /* EditAbility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditAbility.swift; sourceTree = "<group>"; }; E254F912260D1F6D009295A5 /* EditTrait.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditTrait.swift; sourceTree = "<group>"; };
E2570FB525B1AC520055B23B /* MonsterCards.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MonsterCards.app; sourceTree = BUILT_PRODUCTS_DIR; }; E2570FB525B1AC520055B23B /* MonsterCards.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MonsterCards.app; sourceTree = BUILT_PRODUCTS_DIR; };
E2570FB825B1AC520055B23B /* MonsterCardsApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonsterCardsApp.swift; sourceTree = "<group>"; }; E2570FB825B1AC520055B23B /* MonsterCardsApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonsterCardsApp.swift; sourceTree = "<group>"; };
E2570FBA25B1AC520055B23B /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; }; E2570FBA25B1AC520055B23B /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -200,13 +200,13 @@
E2570FB725B1AC520055B23B /* MonsterCards */ = { E2570FB725B1AC520055B23B /* MonsterCards */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
E2570FBC25B1AC550055B23B /* Assets.xcassets */,
E2D473FB25B5328800CB36D7 /* Helpers */,
E2570FC625B1AC550055B23B /* Info.plist */, E2570FC625B1AC550055B23B /* Info.plist */,
E257101225B1B2790055B23B /* Models */,
E2570FC325B1AC550055B23B /* MonsterCards.xcdatamodeld */,
E2570FB825B1AC520055B23B /* MonsterCardsApp.swift */, E2570FB825B1AC520055B23B /* MonsterCardsApp.swift */,
E2570FC125B1AC550055B23B /* Persistence.swift */, E2570FC125B1AC550055B23B /* Persistence.swift */,
E2570FBC25B1AC550055B23B /* Assets.xcassets */,
E2D473FB25B5328800CB36D7 /* Helpers */,
E257101225B1B2790055B23B /* Models */,
E2570FC325B1AC550055B23B /* MonsterCards.xcdatamodeld */,
E2570FBE25B1AC550055B23B /* Preview Content */, E2570FBE25B1AC550055B23B /* Preview Content */,
E2570FEB25B1ADA90055B23B /* Views */, E2570FEB25B1ADA90055B23B /* Views */,
); );
@@ -245,8 +245,6 @@
E2570FF925B1AE020055B23B /* Collections.swift */, E2570FF925B1AE020055B23B /* Collections.swift */,
E2570FBA25B1AC520055B23B /* ContentView.swift */, E2570FBA25B1AC520055B23B /* ContentView.swift */,
E2570FF425B1ADEB0055B23B /* Dashboard.swift */, E2570FF425B1ADEB0055B23B /* Dashboard.swift */,
E254F90D260D19A0009295A5 /* EditAbilities.swift */,
E254F912260D1F6D009295A5 /* EditAbility.swift */,
E24ACE5F2607F45E009BF703 /* EditAbilityScores.swift */, E24ACE5F2607F45E009BF703 /* EditAbilityScores.swift */,
E24ACE552607EE94009BF703 /* EditArmor.swift */, E24ACE552607EE94009BF703 /* EditArmor.swift */,
E24ACE4F2607326E009BF703 /* EditBasicInfo.swift */, E24ACE4F2607326E009BF703 /* EditBasicInfo.swift */,
@@ -259,6 +257,8 @@
E24ACE692607F715009BF703 /* EditSkills.swift */, E24ACE692607F715009BF703 /* EditSkills.swift */,
E24ACE5A2607F0F2009BF703 /* EditSpeed.swift */, E24ACE5A2607F0F2009BF703 /* EditSpeed.swift */,
E2CB0DE526088CE400142591 /* EditStrings.swift */, E2CB0DE526088CE400142591 /* EditStrings.swift */,
E254F912260D1F6D009295A5 /* EditTrait.swift */,
E254F90D260D19A0009295A5 /* EditTraits.swift */,
E2570FFE25B1AE180055B23B /* Library.swift */, E2570FFE25B1AE180055B23B /* Library.swift */,
E2CB0DB726081A2F00142591 /* MCAbilityScorePicker.swift */, E2CB0DB726081A2F00142591 /* MCAbilityScorePicker.swift */,
E210B83E25B42DAB0083EAC5 /* MCAdvantagePicker.swift */, E210B83E25B42DAB0083EAC5 /* MCAdvantagePicker.swift */,
@@ -279,13 +279,13 @@
children = ( children = (
E254F905260D0818009295A5 /* AbilityViewModel.swift */, E254F905260D0818009295A5 /* AbilityViewModel.swift */,
E216B7B6260C5A9800FB205F /* ChallengeRatingViewModel.swift */, E216B7B6260C5A9800FB205F /* ChallengeRatingViewModel.swift */,
E20209E625D8DEB600EFE733 /* Enums */,
E216B790260C1FE800FB205F /* LanguageViewModel.swift */, E216B790260C1FE800FB205F /* LanguageViewModel.swift */,
E2182E6225B22F8A00DFAEF8 /* Monster+CoreDataClass.swift */, E2182E6225B22F8A00DFAEF8 /* Monster+CoreDataClass.swift */,
E20209FA25D8E19100EFE733 /* MonsterViewModel.swift */, E20209FA25D8E19100EFE733 /* MonsterViewModel.swift */,
E20209D225D8DD9600EFE733 /* Skill+CoreDataClass.swift */, E20209D225D8DD9600EFE733 /* Skill+CoreDataClass.swift */,
E20209F925D8E19100EFE733 /* SkillViewModel.swift */, E20209F925D8E19100EFE733 /* SkillViewModel.swift */,
E2CB0DE0260887ED00142591 /* StringViewModel.swift */, E2CB0DE0260887ED00142591 /* StringViewModel.swift */,
E20209E625D8DEB600EFE733 /* Enums */,
); );
path = Models; path = Models;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -440,7 +440,7 @@
E216B799260C2DF200FB205F /* EditLanguages.swift in Sources */, E216B799260C2DF200FB205F /* EditLanguages.swift in Sources */,
E2570FBB25B1AC520055B23B /* ContentView.swift in Sources */, E2570FBB25B1AC520055B23B /* ContentView.swift in Sources */,
E24ACE502607326E009BF703 /* EditBasicInfo.swift in Sources */, E24ACE502607326E009BF703 /* EditBasicInfo.swift in Sources */,
E254F90E260D19A0009295A5 /* EditAbilities.swift in Sources */, E254F90E260D19A0009295A5 /* EditTraits.swift in Sources */,
E2570FC525B1AC550055B23B /* MonsterCards.xcdatamodeld in Sources */, E2570FC525B1AC550055B23B /* MonsterCards.xcdatamodeld in Sources */,
E2182E6425B22F8A00DFAEF8 /* Monster+CoreDataClass.swift in Sources */, E2182E6425B22F8A00DFAEF8 /* Monster+CoreDataClass.swift in Sources */,
E216B791260C1FE800FB205F /* LanguageViewModel.swift in Sources */, E216B791260C1FE800FB205F /* LanguageViewModel.swift in Sources */,
@@ -471,7 +471,7 @@
E2570FFA25B1AE020055B23B /* Collections.swift in Sources */, E2570FFA25B1AE020055B23B /* Collections.swift in Sources */,
E24ACE5B2607F0F2009BF703 /* EditSpeed.swift in Sources */, E24ACE5B2607F0F2009BF703 /* EditSpeed.swift in Sources */,
E2570FB925B1AC520055B23B /* MonsterCardsApp.swift in Sources */, E2570FB925B1AC520055B23B /* MonsterCardsApp.swift in Sources */,
E254F913260D1F6D009295A5 /* EditAbility.swift in Sources */, E254F913260D1F6D009295A5 /* EditTrait.swift in Sources */,
E216B7B7260C5A9800FB205F /* ChallengeRatingViewModel.swift in Sources */, E216B7B7260C5A9800FB205F /* ChallengeRatingViewModel.swift in Sources */,
E20209D325D8DD9600EFE733 /* Skill+CoreDataClass.swift in Sources */, E20209D325D8DD9600EFE733 /* Skill+CoreDataClass.swift in Sources */,
E24ACE652607F55D009BF703 /* EditSavingThrows.swift in Sources */, E24ACE652607F55D009BF703 /* EditSavingThrows.swift in Sources */,

View File

@@ -75,11 +75,11 @@ struct EditMonster: View {
destination: EditChallengeRating(viewModel: monsterViewModel)) destination: EditChallengeRating(viewModel: monsterViewModel))
NavigationLink( NavigationLink(
"Abilities", destination: EditAbilities(viewModel: monsterViewModel, path: \.abilities, title: "Abilities")) "Abilities", destination: EditTraits(viewModel: monsterViewModel, path: \.abilities, title: "Abilities"))
NavigationLink( NavigationLink(
"Actions", "Actions",
destination: EditAbilities(viewModel: monsterViewModel, path: \.actions, title: "Actions")) destination: EditTraits(viewModel: monsterViewModel, path: \.actions, title: "Actions"))
} }
} }

View File

@@ -1,5 +1,5 @@
// //
// EditAbility.swift // EditTrait.swift
// MonsterCards // MonsterCards
// //
// Created by Tom Hicks on 3/25/21. // Created by Tom Hicks on 3/25/21.
@@ -7,7 +7,7 @@
import SwiftUI import SwiftUI
struct EditAbility: View { struct EditTrait: View {
@ObservedObject var viewModel: AbilityViewModel @ObservedObject var viewModel: AbilityViewModel
var body: some View { var body: some View {
@@ -21,9 +21,9 @@ struct EditAbility: View {
} }
} }
struct EditAbility_Previews: PreviewProvider { struct EditTrait_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
let viewModel = AbilityViewModel() let viewModel = AbilityViewModel()
EditAbility(viewModel: viewModel) EditTrait(viewModel: viewModel)
} }
} }

View File

@@ -1,5 +1,5 @@
// //
// EditAbilities.swift // EditTraits.swift
// MonsterCards // MonsterCards
// //
// Created by Tom Hicks on 3/25/21. // Created by Tom Hicks on 3/25/21.
@@ -7,7 +7,7 @@
import SwiftUI import SwiftUI
struct EditAbilities: View { struct EditTraits: View {
@ObservedObject var viewModel: MonsterViewModel @ObservedObject var viewModel: MonsterViewModel
var path: ReferenceWritableKeyPath<MonsterViewModel, [AbilityViewModel]> var path: ReferenceWritableKeyPath<MonsterViewModel, [AbilityViewModel]>
var title: String var title: String
@@ -17,7 +17,7 @@ struct EditAbilities: View {
ForEach(viewModel[keyPath: path]) { ability in ForEach(viewModel[keyPath: path]) { ability in
NavigationLink( NavigationLink(
ability.name, ability.name,
destination: EditAbility(viewModel: ability)) destination: EditTrait(viewModel: ability))
} }
.onDelete(perform: { indexSet in .onDelete(perform: { indexSet in
for index in indexSet { for index in indexSet {
@@ -53,10 +53,10 @@ struct EditAbilities: View {
} }
} }
struct EditAbilities_Previews: PreviewProvider { struct EditTraits_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
let viewModel = MonsterViewModel() let viewModel = MonsterViewModel()
EditAbilities( EditTraits(
viewModel: viewModel, viewModel: viewModel,
path: \.abilities, path: \.abilities,
title: "Abilities") title: "Abilities")