maj/MonsterCards
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Makes armor type a picker instead of a string.

Browse Source
This commit is contained in:
Tom Hicks
2021-02-07 12:43:23 -08:00
parent 8be1479357
commit b5cb02937b
3 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MonsterCards.xcodeproj/project.pbxproj
View File

@@ -26,6 +26,7 @@
E2570FFF25B1AE180055B23B /* Library.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2570FFE25B1AE180055B23B /* Library.swift */; };
E257100425B1AF4A0055B23B /* SearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = E257100325B1AF4A0055B23B /* SearchBar.swift */; };
E257100925B1B2480055B23B /* MonsterDetail.swift in Sources */ = {isa = PBXBuildFile; fileRef = E257100825B1B2470055B23B /* MonsterDetail.swift */; };
E26CDA2B25CFB38E00E3F50D /* MCArmorTypePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = E26CDA2A25CFB38E00E3F50D /* MCArmorTypePicker.swift */; };
E2B5285925B3028700AAA69E /* EditMonster.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2B5285825B3028700AAA69E /* EditMonster.swift */; };
E2BD702C25B3A8D70058ED69 /* MCTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2BD702B25B3A8D70058ED69 /* MCTextField.swift */; };
E2BD703125B3BBB90058ED69 /* MCStepperField.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2BD703025B3BBB90058ED69 /* MCStepperField.swift */; };
@@ -75,6 +76,7 @@
E2570FFE25B1AE180055B23B /* Library.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Library.swift; sourceTree = "<group>"; };
E257100325B1AF4A0055B23B /* SearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchBar.swift; sourceTree = "<group>"; };
E257100825B1B2470055B23B /* MonsterDetail.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonsterDetail.swift; sourceTree = "<group>"; };
E26CDA2A25CFB38E00E3F50D /* MCArmorTypePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MCArmorTypePicker.swift; sourceTree = "<group>"; };
E2B5285825B3028700AAA69E /* EditMonster.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditMonster.swift; sourceTree = "<group>"; };
E2BD702B25B3A8D70058ED69 /* MCTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MCTextField.swift; sourceTree = "<group>"; };
E2BD703025B3BBB90058ED69 /* MCStepperField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MCStepperField.swift; sourceTree = "<group>"; };
@@ -183,6 +185,7 @@
E2BD702B25B3A8D70058ED69 /* MCTextField.swift */,
E2BD703025B3BBB90058ED69 /* MCStepperField.swift */,
E210B83925B42D980083EAC5 /* MCProficiencyPicker.swift */,
E26CDA2A25CFB38E00E3F50D /* MCArmorTypePicker.swift */,
);
path = Views;
sourceTree = "<group>";
@@ -353,6 +356,7 @@
E210B83025B426570083EAC5 /* ProficiencyType.swift in Sources */,
E2BD702C25B3A8D70058ED69 /* MCTextField.swift in Sources */,
E210B83F25B42DAB0083EAC5 /* MCAdvantagePicker.swift in Sources */,
E26CDA2B25CFB38E00E3F50D /* MCArmorTypePicker.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

11
MonsterCards/Views/EditMonster.swift
View File

@@ -23,7 +23,7 @@ struct EditMonster: View {
@State private var monsterHitDice: Int64 = 0
@State private var monsterHasCustomHP: Bool = false
@State private var monsterCustomHP: String = ""
@State private var monsterArmorType: String = ""
@State private var monsterArmorType: ArmorType = ArmorType.none
@State private var monsterHasShield: Bool = false
@State private var monsterNaturalArmorBonus: Int64 = 0
@State private var monsterCustomArmor: String = ""
@@ -103,9 +103,8 @@ struct EditMonster: View {
.textCase(nil)
Section(header: Text("Armor")) {
// Armor Type select bound to monster.armorType?
// TODO: this should be a select/dropdown
MCTextField(
// Armor Type select bound to monster.armorTypeEnum
MCArmorTypePicker(
label: "Armor Type",
value: $monsterArmorType)
@@ -306,7 +305,7 @@ struct EditMonster: View {
monsterHitDice = monster.hitDice
monsterHasCustomHP = monster.hasCustomHP
monsterCustomHP = monster.customHP ?? ""
monsterArmorType = monster.armorType ?? ""
monsterArmorType = monster.armorTypeEnum
monsterHasShield = monster.hasShield
monsterNaturalArmorBonus = monster.naturalArmorBonus
monsterCustomArmor = monster.customArmor ?? ""
@@ -347,7 +346,7 @@ struct EditMonster: View {
monster.hitDice = monsterHitDice
monster.hasCustomHP = monsterHasCustomHP
monster.customHP = monsterCustomHP
monster.armorType = monsterArmorType
monster.armorType = monsterArmorType.rawValue
monster.hasShield = monsterHasShield
monster.naturalArmorBonus = monsterNaturalArmorBonus
monster.customArmor = monsterCustomArmor

36
MonsterCards/Views/MCArmorTypePicker.swift Normal file
View File

@@ -0,0 +1,36 @@
//
// MCArmorTypePicker.swift
// MonsterCards
//
// Created by Tom Hicks on 2/6/21.
//
import SwiftUI
struct MCArmorTypePicker: View {
var label: String = ""
var value: Binding<ArmorType>
var body: some View {
VStack(alignment: .leading) {
Text(label)
.font(.caption2)
Picker(
selection: value,
label: Text(value.wrappedValue.displayName)) {
ForEach(ArmorType.allCases) {armorType in
Text(armorType.displayName).tag(armorType)
}
}
.pickerStyle(MenuPickerStyle())
}
}
}
struct MCArmorTypePicker_Previews: PreviewProvider {
static var previews: some View {
MCArmorTypePicker(
value: .constant(ArmorType.none)
)
}
}