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

Moves MonsterDetailWrapper into its own file to separate the core data dependencies.

Browse Source
This commit is contained in:
Tom Hicks
2021-04-08 18:55:31 -07:00
committed by headhunter45
parent 5304c66b0b
commit 5ba59bbdf3
3 changed files with 113 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
iOS/MonsterCards/Views/MonsterDetail.swift → iOS/MonsterCards/Views/MonsterDetailView.swift
View File

@@ -324,41 +324,13 @@ struct MonsterDetailView: View {
}
}
struct MonsterDetailWrapper: View {
// TODO: Add display for when the monster is blind
let kTextColor: Color = Color(hex: 0x982818)
@ObservedObject var monster: Monster
@StateObject private var viewModel = MonsterViewModel()
var body: some View {
MonsterDetailView(viewModel: viewModel)
.onAppear(perform: {
viewModel.copyFromMonster(monster: monster)
})
.toolbar(content: {
ToolbarItem(placement: .primaryAction) {
NavigationLink("Edit", destination: EditMonster(monster: monster))
}
})
.navigationTitle(monster.name ?? "")
.navigationBarTitleDisplayMode(.inline)
}
private func editMonster() {
print("Edit Monster pressed")
}
}
struct MonsterDetailWrapper_Previews: PreviewProvider {
struct MonsterDetailView_Previews: PreviewProvider {
static var previews: some View {
let context = PersistenceController.preview.container.viewContext
let monster = Monster.init(context: context)
let monster = MonsterViewModel.init()
monster.name = "Steve"
monster.size = "Medium"
monster.type = "humanoid"
monster.subtype = "human"
monster.subType = "human"
monster.alignment = "LG"
monster.hitDice = 6
monster.hasCustomHP = true
@@ -377,18 +349,18 @@ struct MonsterDetailWrapper_Previews: PreviewProvider {
monster.intelligenceScore = 14
monster.wisdomScore = 16
monster.charismaScore = 18
monster.strengthSavingThrowAdvantageEnum = AdvantageType.none
monster.strengthSavingThrowProficiencyEnum = ProficiencyType.none
monster.dexteritySavingThrowAdvantageEnum = AdvantageType.advantage
monster.dexteritySavingThrowProficiencyEnum = ProficiencyType.proficient
monster.constitutionSavingThrowAdvantageEnum = AdvantageType.disadvantage
monster.constitutionSavingThrowProficiencyEnum = ProficiencyType.expertise
monster.intelligenceSavingThrowAdvantageEnum = AdvantageType.none
monster.intelligenceSavingThrowProficiencyEnum = ProficiencyType.expertise
monster.wisdomSavingThrowAdvantageEnum = AdvantageType.advantage
monster.wisdomSavingThrowProficiencyEnum = ProficiencyType.proficient
monster.charismaSavingThrowAdvantageEnum = AdvantageType.disadvantage
monster.charismaSavingThrowProficiencyEnum = ProficiencyType.none
monster.strengthSavingThrowAdvantage = AdvantageType.none
monster.strengthSavingThrowProficiency = ProficiencyType.none
monster.dexteritySavingThrowAdvantage = AdvantageType.advantage
monster.dexteritySavingThrowProficiency = ProficiencyType.proficient
monster.constitutionSavingThrowAdvantage = AdvantageType.disadvantage
monster.constitutionSavingThrowProficiency = ProficiencyType.expertise
monster.intelligenceSavingThrowAdvantage = AdvantageType.none
monster.intelligenceSavingThrowProficiency = ProficiencyType.expertise
monster.wisdomSavingThrowAdvantage = AdvantageType.advantage
monster.wisdomSavingThrowProficiency = ProficiencyType.proficient
monster.charismaSavingThrowAdvantage = AdvantageType.disadvantage
monster.charismaSavingThrowProficiency = ProficiencyType.none
monster.telepathy = 1
monster.languages = [
LanguageViewModel("English", true),
@@ -396,12 +368,7 @@ struct MonsterDetailWrapper_Previews: PreviewProvider {
]
return Group {
MonsterDetailWrapper(monster: monster)
.environment(\.managedObjectContext, context)
.previewDevice("iPod touch (7th generation)")
MonsterDetailWrapper(monster: monster)
.environment(\.managedObjectContext, context)
.previewDevice("iPad Pro (11-inch) (2nd generation)")
MonsterDetailView(viewModel: monster)
}
}
}

89
iOS/MonsterCards/Views/MonsterDetailWrapper.swift Normal file
View File

@@ -0,0 +1,89 @@
//
// MonsterDetailWrapper.swift
// MonsterCards
//
// Created by Tom Hicks on 4/7/21.
//
import SwiftUI
struct MonsterDetailWrapper: View {
let kTextColor = Color(hex: 0x982818)
@ObservedObject var monster: Monster
@StateObject private var viewModel = MonsterViewModel()
var body: some View {
MonsterDetailView(viewModel: viewModel)
.onAppear(perform: {
viewModel.copyFromMonster(monster: monster)
})
.toolbar(content: {
ToolbarItem(placement: .primaryAction) {
NavigationLink("Edit", destination: EditMonster(monster: monster))
}
})
.navigationTitle(monster.name ?? "")
.navigationBarTitleDisplayMode(.inline)
}
private func editMonster() {
print("Edit Monster pressed")
}
}
struct MonsterDetailWrapper_Previews: PreviewProvider {
static var previews: some View {
let context = PersistenceController.preview.container.viewContext
let monster = Monster.init(context: context)
monster.name = "Steve"
monster.size = "Medium"
monster.type = "humanoid"
monster.subtype = "human"
monster.alignment = "LG"
monster.hitDice = 6
monster.hasCustomHP = true
monster.customHP = "12 (1d10)+2"
monster.walkSpeed = 5
monster.burrowSpeed = 10
monster.climbSpeed = 15
monster.flySpeed = 20
monster.swimSpeed = 25
monster.canHover = true
monster.hasCustomSpeed = false
monster.customSpeed = "walk: 5 ft."
monster.strengthScore = 8
monster.dexterityScore = 10
monster.constitutionScore = 12
monster.intelligenceScore = 14
monster.wisdomScore = 16
monster.charismaScore = 18
monster.strengthSavingThrowAdvantageEnum = AdvantageType.none
monster.strengthSavingThrowProficiencyEnum = ProficiencyType.none
monster.dexteritySavingThrowAdvantageEnum = AdvantageType.advantage
monster.dexteritySavingThrowProficiencyEnum = ProficiencyType.proficient
monster.constitutionSavingThrowAdvantageEnum = AdvantageType.disadvantage
monster.constitutionSavingThrowProficiencyEnum = ProficiencyType.expertise
monster.intelligenceSavingThrowAdvantageEnum = AdvantageType.none
monster.intelligenceSavingThrowProficiencyEnum = ProficiencyType.expertise
monster.wisdomSavingThrowAdvantageEnum = AdvantageType.advantage
monster.wisdomSavingThrowProficiencyEnum = ProficiencyType.proficient
monster.charismaSavingThrowAdvantageEnum = AdvantageType.disadvantage
monster.charismaSavingThrowProficiencyEnum = ProficiencyType.none
monster.telepathy = 1
monster.languages = [
LanguageViewModel("English", true),
LanguageViewModel("French", false)
]
return Group {
MonsterDetailWrapper(monster: monster)
.environment(\.managedObjectContext, context)
.previewDevice("iPod touch (7th generation)")
MonsterDetailWrapper(monster: monster)
.environment(\.managedObjectContext, context)
.previewDevice("iPad Pro (11-inch) (2nd generation)")
}
}
}