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

More robust dictionary search feature, styling tweaks for widgets

Browse Source
This commit is contained in:
Madeline
2022-10-26 15:46:50 -04:00
parent 5999cc3533
commit e893a04e13
5 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Toki Trainer/ViewModels/TokiDictionaryViewModel.swift
View File

@@ -40,6 +40,32 @@ class TokiDictionaryViewModel: ObservableObject {
}
}
func filterDictionaryEnglishMode(_ input: String) {
dictionary = []
for value in fullDictionary {
var entryMatch = false
// Check if word matches toki pona form, even partially
if value.word.hasPrefix(input) {
entryMatch = true
}
// Check if any part of the word definitions match in English, even partially
for definition in value.definitions {
if definition.definition.contains(input) {
entryMatch = true
}
}
// Add to dictionary
if entryMatch == true {
dictionary.append(value)
}
}
}
func translatePhrase(_ input: String) {
dictionary = []
translatedDictionary = []

8
Toki Trainer/Views/WordListViews/DictionaryView.swift
View File

@@ -10,8 +10,8 @@ import SwiftUI
struct DictionaryView: View {
@ObservedObject var tokiDictViewModel = TokiDictionaryViewModel()
@State var tokiInput: String = ""
@State var selectedPartOfSpeech: String?
@State private var tokiInput: String = ""
@State private var selectedPartOfSpeech: String?
var body: some View {
VStack {
@@ -30,7 +30,7 @@ struct DictionaryView: View {
PartsOfSpeechView(selectedPartOfSpeech: selectedPOS)
}
.onChange(of: tokiInput) { newValue in
tokiDictViewModel.filterDictionary(newValue)
tokiDictViewModel.filterDictionaryEnglishMode(newValue)
}
}
}
@@ -39,6 +39,6 @@ struct DictionaryView: View {
struct DictionaryView_Previews: PreviewProvider {
static var previews: some View {
DictionaryView(selectedPartOfSpeech: "n").previewLayout(.sizeThatFits).environment(\.managedObjectContext, PersistenceController.preview.container.viewContext)
DictionaryView().previewLayout(.sizeThatFits).environment(\.managedObjectContext, PersistenceController.preview.container.viewContext)
}
}

16
Toki Trainer/Views/WordListViews/TranslatorView.swift
View File

@@ -15,14 +15,14 @@ struct TranslatorView: View {
var body: some View {
VStack {
Button(action: changeTranslationDirection) {
// TODO: This needs to actually switch how the lookup happens
if translateToTokiPona == true {
LanguageDirectionView(from: "English", to: "Toki Pona", fromColor: .blue, toColor: .cyan)
} else {
LanguageDirectionView(from: "Toki Pona", to: "English", fromColor: .cyan, toColor: .blue)
}
}
// Button(action: changeTranslationDirection) {
// #warning("This needs to actually switch how the lookup happens")
// if translateToTokiPona == true {
// LanguageDirectionView(from: "English", to: "Toki Pona", fromColor: .blue, toColor: .cyan)
// } else {
// LanguageDirectionView(from: "Toki Pona", to: "English", fromColor: .cyan, toColor: .blue)
// }
// }
TextField("Enter Toki Pona Word or Phrase", text: $tokiInput)
.multilineTextAlignment(.center)
.textInputAutocapitalization(.never)