maddiefuzz/TokiTrainer
1
0
Fork 1
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix crash on physical device

Browse Source
This commit is contained in:
Avery Pace
2021-11-05 21:04:03 -04:00
parent 6a81806abf
commit 17cc95188b
3 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Toki Trainer/Views/ContentView.swift
View File

@@ -16,7 +16,7 @@ struct ContentView: View {
@Environment(\.managedObjectContext) private var viewContext
@ObservedObject var tokiDictViewModel = TokiDictionaryViewModel()
@State private var selectedPartOfSpeech: String? = nil
@State private var selectedPartOfSpeech: String?
@State private var tokiInput: String = ""
var body: some View {
@@ -64,7 +64,7 @@ struct ContentView: View {
.background(.thinMaterial)
}
.sheet(item: $selectedPartOfSpeech) { selectedPOS in
PartsOfSpeechView(selectedPartOfSpeech: selectedPOS, tokiDictViewModel: self.tokiDictViewModel)
PartsOfSpeechView(selectedPartOfSpeech: selectedPOS, partsOfSpeech: tokiDictViewModel.partsOfSpeech)
}
}
}

9
Toki Trainer/Views/PartsOfSpeechView.swift
View File

@@ -10,7 +10,9 @@ import SwiftUI
struct PartsOfSpeechView: View {
var selectedPartOfSpeech: String? = nil
@ObservedObject var tokiDictViewModel: TokiDictionaryViewModel
@ObservedObject var tokiDictViewModel = TokiDictionaryViewModel()
var partsOfSpeech: [TokiPartOfSpeech]
// init(selectedPartOfSpeech: String) {
// _selectedPartOfSpeech = State(initialValue: selectedPartOfSpeech)
@@ -32,7 +34,7 @@ struct PartsOfSpeechView: View {
Spacer()
}
//.background(.blue)
.background((selectedPartOfSpeech == pos.pos) ? Color(UIColor.systemGray4) : .white)
.background((selectedPartOfSpeech == pos.pos) ? Color(UIColor.systemGray4) : Color(UIColor.systemBackground))
.cornerRadius(5.0)
.padding(2)
}
@@ -44,6 +46,7 @@ struct PartsOfSpeechView: View {
struct PartsOfSpeechView_Previews: PreviewProvider {
static var previews: some View {
PartsOfSpeechView(selectedPartOfSpeech: "sep", tokiDictViewModel: TokiDictionaryViewModel())
PartsOfSpeechView(selectedPartOfSpeech: "sep", partsOfSpeech: [TokiPartOfSpeech(pos: "sep", definition: "test")])
.preferredColorScheme(.dark)
}
}