fix: translation settings (#152)

Author: Livinglist

Gem/Extensions/LanguageExtension.swift

@@ -3,4 +3,5 @@ import Foundation
 extension Locale.Language {
     static let englishUS = Locale.Language(identifier: "en_US")
     static let chinese = Locale.Language(identifier: "zh")
+    static let spanish = Locale.Language(identifier: "es")
 }

Gem/ViewModels/SettingsViewModel.swift

@@ -91,12 +91,16 @@ fileprivate extension String {
             translationConfig = config
         }
     }
-    var translationTarget: Locale.Language = .init(languageCode: .spanish) {
+    var translationTarget: Locale.Language? {
         didSet {
-            UserDefaults.standard.setValue(translationTarget.languageCode?.identifier, forKey: .translationTargetKey)
-            CommentTranslator.cache.removeAllObjects()
-            let config = TranslationSession.Configuration(source: .englishUS, target: translationTarget)
-            translationConfig = config
+            if let translationTarget {
+                UserDefaults.standard.setValue(translationTarget.languageCode?.identifier, forKey: .translationTargetKey)
+                CommentTranslator.cache.removeAllObjects()
+                let config = TranslationSession.Configuration(source: .englishUS, target: translationTarget)
+                translationConfig = config
+            } else {
+                UserDefaults.standard.setValue(nil, forKey: .translationTargetKey)
+            }
         }
     }
     var translationConfig: TranslationSession.Configuration?
@@ -133,7 +137,7 @@ fileprivate extension String {
 #if targetEnvironment(simulator)
         translationTarget = .init(languageCode: .chinese)
 #else
-        translationTarget = targetLanguageIdentifier == nil ? .init(languageCode: .spanish) : .init(identifier: targetLanguageIdentifier!)
+        translationTarget = targetLanguageIdentifier == nil ? nil : .init(identifier: targetLanguageIdentifier!)
 #endif
 
         let downloadFrequencyRawValue = UserDefaults.standard.double(forKey: .downloadFrequencyKey)

Gem/ViewModels/ThreadViewModel.swift

@@ -395,9 +395,11 @@ import Translation
     }
 
     func translate() {
-        guard item != nil && status.isCompleted else { return }
+        guard item != nil && status.isCompleted,
+              let targetLanguage = SettingsViewModel.shared.translationTarget
+        else { return }
+        self.targetLanguage = targetLanguage
         translationStatus = .inProgress
-        targetLanguage = SettingsViewModel.shared.translationTarget
         guard let translator = CommentTranslator(targetLanguage: targetLanguage) else { return }
         factory = .init(processors: [
             translator,

Gem/Views/Settings.swift

@@ -7,6 +7,9 @@ struct Settings: View {
     @Bindable var vm = SettingsViewModel.shared
     @State var url: IdentifiableURL?
     @State var isLogsPresented: Bool = false
+    @State var isTranslationEnabledBuffer: Bool = false
+    @State var targetLanguageBuffer: Locale.Language
+    @State var translationConfigBuffer: TranslationSession.Configuration?
 
     private let githubRepoUrl = URL(string: "https://github.com/Livinglist/Gem")!
     private let githubIssuesUrl = URL(string: "https://github.com/Livinglist/Gem/issues")!
@@ -18,6 +21,13 @@ struct Settings: View {
         return "Version \(version) (\(build))"
     }
 
+    init() {
+        let vm = SettingsViewModel.shared
+        self.isTranslationEnabledBuffer = vm.isTranslationEnabled
+        self.targetLanguageBuffer = vm.translationTarget ?? .spanish
+        self.translationConfigBuffer = vm.translationConfig
+    }
+    
     var body: some View {
         List {
             Section {
@@ -52,17 +62,17 @@ struct Settings: View {
             }
 
             Section {
-                Toggle(isOn: $vm.isTranslationEnabled) {
+                Toggle(isOn: $isTranslationEnabledBuffer) {
                     Text("Translation")
                 }
                 .tint(.accent)
-                Picker("Target Language", selection: $vm.translationTarget) {
+                Picker("Target Language", selection: $targetLanguageBuffer) {
                     ForEach(vm.supportedLanguages, id: \.self) { language in
                         Text(Locale.current.localizedString(forLanguageCode: language.languageCode?.identifier ?? "") ?? "Unknown")
                             .tag(language)
                     }
                 }
-                .disabled(!vm.isTranslationEnabled)
+                .disabled(!isTranslationEnabledBuffer)
                 .pickerStyle(.menu)
                 .tint(.accent)
             }
@@ -149,18 +159,29 @@ struct Settings: View {
         }
         .navigationBarTitleDisplayMode(.inline)
         .navigationTitle("Settings")
-        .translationTask(vm.translationConfig) { session in
-            Task { @MainActor in
-                if vm.isTranslationEnabled {
-                    try? await session.prepareTranslation()
-                    if await !session.isReady {
-                        vm.translationTarget = .init(languageCode: .spanish)
-                        vm.isTranslationEnabled = false
-                    }
+        .onChange(of: targetLanguageBuffer) {
+            translationConfigBuffer = TranslationSession.Configuration(source: .englishUS, target: targetLanguageBuffer)
+        }
+        .onChange(of: isTranslationEnabledBuffer) {
+            if isTranslationEnabledBuffer {
+                translationConfigBuffer = TranslationSession.Configuration(source: .englishUS, target: targetLanguageBuffer)
+            } else {
+                vm.isTranslationEnabled = false
+            }
+        }
+        .translationTask(translationConfigBuffer) { session in
+            if isTranslationEnabledBuffer {
+                try? await session.prepareTranslation()
+                if await session.isReady {
+                    vm.translationTarget = targetLanguageBuffer
+                    vm.isTranslationEnabled = isTranslationEnabledBuffer
+                } else {
+                    isTranslationEnabledBuffer = vm.isTranslationEnabled
+                    targetLanguageBuffer = vm.translationTarget ?? .spanish
                 }
             }
         }
         .sensoryFeedback(.impact(weight: .heavy), trigger: vm.isDevModeEnabled)
-        .sensoryFeedback(.selection, trigger: vm.translationTarget)
+        .sensoryFeedback(.selection, trigger: targetLanguageBuffer)
     }
 }