From a8853f1690fae6b4911d51e14fad97a82351c556 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Mon, 31 Jul 2023 11:02:07 +0800 Subject: [PATCH] ios: Show self hosting values if already set --- .../App/Views/SelfHostSettingsView.swift | 6 +++--- .../Sources/Models/AppEnvironment.swift | 17 +++++++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/apple/OmnivoreKit/Sources/App/Views/SelfHostSettingsView.swift b/apple/OmnivoreKit/Sources/App/Views/SelfHostSettingsView.swift index 372dbed51..d9a0c0ba7 100644 --- a/apple/OmnivoreKit/Sources/App/Views/SelfHostSettingsView.swift +++ b/apple/OmnivoreKit/Sources/App/Views/SelfHostSettingsView.swift @@ -10,9 +10,9 @@ } struct SelfHostSettingsView: View { - @State var apiServerAddress = "" - @State var webServerAddress = "" - @State var ttsServerAddress = "" + @State var apiServerAddress = UserDefaults.standard.string(forKey: AppEnvironmentUserDefaultKey.serverBaseURL.rawValue) ?? "" + @State var webServerAddress = UserDefaults.standard.string(forKey: AppEnvironmentUserDefaultKey.webAppBaseURL.rawValue) ?? "" + @State var ttsServerAddress = UserDefaults.standard.string(forKey: AppEnvironmentUserDefaultKey.ttsBaseURL.rawValue) ?? "" @State var showConfirmAlert = false diff --git a/apple/OmnivoreKit/Sources/Models/AppEnvironment.swift b/apple/OmnivoreKit/Sources/Models/AppEnvironment.swift index 1bf4affc3..92016510b 100644 --- a/apple/OmnivoreKit/Sources/Models/AppEnvironment.swift +++ b/apple/OmnivoreKit/Sources/Models/AppEnvironment.swift @@ -32,7 +32,7 @@ private let devWebURL = "https://web-dev.omnivore.app" private let demoWebURL = "https://demo.omnivore.app" private let prodWebURL = "https://omnivore.app" -private enum AppEnvironmentUserDefaultKey: String { +public enum AppEnvironmentUserDefaultKey: String { case serverBaseURL = "AppEnvironment_serverBaseURL" case webAppBaseURL = "AppEnvironment_webAppBaseURL" case ttsBaseURL = "AppEnvironment_ttsBaseURL" @@ -40,9 +40,18 @@ private enum AppEnvironmentUserDefaultKey: String { public extension AppEnvironment { static func setCustom(serverBaseURL: String, webAppBaseURL: String, ttsBaseURL: String) { - UserDefaults.standard.set(serverBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines), forKey: AppEnvironmentUserDefaultKey.serverBaseURL.rawValue) - UserDefaults.standard.set(webAppBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines), forKey: AppEnvironmentUserDefaultKey.webAppBaseURL.rawValue) - UserDefaults.standard.set(ttsBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines), forKey: AppEnvironmentUserDefaultKey.ttsBaseURL.rawValue) + UserDefaults.standard.set( + serverBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines), + forKey: AppEnvironmentUserDefaultKey.serverBaseURL.rawValue + ) + UserDefaults.standard.set( + webAppBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines), + forKey: AppEnvironmentUserDefaultKey.webAppBaseURL.rawValue + ) + UserDefaults.standard.set( + ttsBaseURL.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines), + forKey: AppEnvironmentUserDefaultKey.ttsBaseURL.rawValue + ) } var graphqlPath: String {