Initial migratable Settings

Signed-off-by: DigiH <17110652+DigiH@users.noreply.github.com>

Author: DigiH

OpenHABCore/Sources/OpenHABCore/Util/Preferences.swift

@@ -87,12 +87,31 @@ public struct UserDefaultObject<T: Codable & Sendable> {
     }
 }
 
-@MainActor
-public struct HomePreferences: Codable, Equatable {
+public struct HomePreferences: Codable, Equatable, Sendable {
+    private enum CodingKeys: String, CodingKey {
+        case id
+        case defaultView
+        case demomode
+        case realTimeSliders
+        case showSearchField
+        case iconType
+        case defaultSitemap
+        case sortSitemapsBy
+        case defaultMainUIPath
+        case alwaysAllowWebRTC
+        case sitemapForWatch
+        case localConnectionConfig
+        case remoteConnectionConfig
+        case sitemapForWatchLabel
+        case homeName
+        case sseCommandItem
+    }
+
     public let id: UUID
     public var defaultView = "web"
     public var demomode = true
     public var realTimeSliders = false
+    public var showSearchField = true
     public var iconType = 0
     public var defaultSitemap = "demo"
     public var sortSitemapsBy = 0
@@ -108,25 +127,30 @@ public struct HomePreferences: Codable, Equatable {
     fileprivate init(id: UUID) {
         self.id = id
     }
-}
 
-@MainActor
-public struct ApplicationPreferences: Codable, Equatable {
-    public var showSearchField = true
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        id = (try? container.decode(UUID.self, forKey: .id)) ?? UUID()
+        defaultView = try container.decodeIfPresent(String.self, forKey: .defaultView) ?? "web"
+        demomode = try container.decodeIfPresent(Bool.self, forKey: .demomode) ?? true
+        realTimeSliders = try container.decodeIfPresent(Bool.self, forKey: .realTimeSliders) ?? false
+        showSearchField = try container.decodeIfPresent(Bool.self, forKey: .showSearchField) ?? true
+        iconType = try container.decodeIfPresent(Int.self, forKey: .iconType) ?? 0
+        defaultSitemap = try container.decodeIfPresent(String.self, forKey: .defaultSitemap) ?? "demo"
+        sortSitemapsBy = try container.decodeIfPresent(Int.self, forKey: .sortSitemapsBy) ?? 0
+        defaultMainUIPath = try container.decodeIfPresent(String.self, forKey: .defaultMainUIPath) ?? ""
+        alwaysAllowWebRTC = try container.decodeIfPresent(Bool.self, forKey: .alwaysAllowWebRTC) ?? false
+        sitemapForWatch = try container.decodeIfPresent(String.self, forKey: .sitemapForWatch) ?? "watch"
+        localConnectionConfig = try container.decodeIfPresent(ConnectionConfiguration.self, forKey: .localConnectionConfig) ?? .localDefault
+        remoteConnectionConfig = try container.decodeIfPresent(ConnectionConfiguration.self, forKey: .remoteConnectionConfig) ?? .remoteDefault
+        sitemapForWatchLabel = try container.decodeIfPresent(String.self, forKey: .sitemapForWatchLabel) ?? "watch"
+        homeName = try container.decodeIfPresent(String.self, forKey: .homeName) ?? "Home"
+        sseCommandItem = try container.decodeIfPresent(String.self, forKey: .sseCommandItem) ?? ""
+    }
 }
 
 // MARK: Retrieving preference from user defaults, reacting to preference change
 
-// MARK: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-// MARK: !!
-
-// MARK: When making changes to Preferences, always consider a migration for existing users. Otherwise, they risk to loose their existing preferences.
-
-// MARK: !!
-
-// MARK: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 private enum PreferencesAccess {
     @MainActor fileprivate static func getPreference<T>(key: String, defaultValue: T, encoder: (T) -> (some Sendable)?, decoder: (Any?) -> T?) -> T {
         let preferenceValue = sharedDefaults.object(forKey: key)
@@ -176,12 +200,8 @@ public actor Preferences {
     @UserDefault("idleOff", defaultValue: false)
     public var idleOff: Bool
 
-    @UserDefaultObject(
-        "applicationPreferences",
-        defaultValue:
-        ApplicationPreferences()
-    )
-    public private(set) var applicationPreferences: ApplicationPreferences
+    @UserDefault("showSearchField", defaultValue: true)
+    public var showSearchField: Bool
 
     @UserDefault("screensaverEnabled", defaultValue: false)
     public var screensaverEnabled: Bool
@@ -355,12 +375,6 @@ public extension Preferences {
         currentHomePreferences = homePreferences
         storeActiveHome()
     }
-
-    func modifyApplicationPreferences(modificationFunction: @MainActor (inout ApplicationPreferences) -> Void) {
-        var applicationPreferences = applicationPreferences
-        modificationFunction(&applicationPreferences)
-        self.applicationPreferences = applicationPreferences
-    }
 }
 
 @MainActor
@@ -404,6 +418,7 @@ public extension Preferences {
             currentHomePreferences.remoteConnectionConfig.ignoreSSL = UserDefaults.standard.object(forKey: "ignoreSSL") as? Bool ?? currentHomePreferences.remoteConnectionConfig.ignoreSSL
             currentHomePreferences.demomode = UserDefaults.standard.object(forKey: "demomode") as? Bool ?? currentHomePreferences.demomode
             currentHomePreferences.realTimeSliders = UserDefaults.standard.object(forKey: "realTimeSliders") as? Bool ?? currentHomePreferences.realTimeSliders
+            currentHomePreferences.showSearchField = UserDefaults.standard.object(forKey: "showSearchField") as? Bool ?? currentHomePreferences.showSearchField
             currentHomePreferences.iconType = UserDefaults.standard.object(forKey: "iconType") as? Int ?? currentHomePreferences.iconType
             currentHomePreferences.defaultSitemap = UserDefaults.standard.string(forKey: "defaultSitemap") ?? currentHomePreferences.defaultSitemap
         }
@@ -446,6 +461,7 @@ public extension Preferences {
             currentHomePreferences.defaultView = sharedDefaults.string(forKey: "defaultView") ?? currentHomePreferences.defaultView
             currentHomePreferences.demomode = sharedDefaults.object(forKey: "demomode") as? Bool ?? currentHomePreferences.demomode
             currentHomePreferences.realTimeSliders = sharedDefaults.object(forKey: "realTimeSliders") as? Bool ?? currentHomePreferences.realTimeSliders
+            currentHomePreferences.showSearchField = sharedDefaults.object(forKey: "showSearchField") as? Bool ?? currentHomePreferences.showSearchField
             currentHomePreferences.iconType = sharedDefaults.object(forKey: "iconType") as? Int ?? currentHomePreferences.iconType
             currentHomePreferences.defaultSitemap = sharedDefaults.string(forKey: "defaultSitemap") ?? currentHomePreferences.defaultSitemap
             currentHomePreferences.sortSitemapsBy = sharedDefaults.object(forKey: "sortSitemapsBy") as? Int ?? currentHomePreferences.sortSitemapsBy

openHAB/Models/SitemapPageViewModel.swift

@@ -70,7 +70,7 @@ class SitemapPageViewModel: ObservableObject {
     @Published var isLoading = true
     @Published var isUpdating = false
     @Published var openHABRootUrl: String?
-    @Published var showSearchField = false
+    @Published var showSearchField = true
     @Published private(set) var commandStates: [String: WidgetCommandLifecycleState] = [:]
     @Published private(set) var trackerStatus: NetworkStatus = .stopped
     @Published private(set) var widgetUpdateVersions: [String: Int] = [:]
@@ -329,7 +329,7 @@ class SitemapPageViewModel: ObservableObject {
 extension SitemapPageViewModel {
     func loadSettings() {
         defaultSitemap = Preferences.shared.currentHomePreferences.defaultSitemap
-        showSearchField = Preferences.shared.applicationPreferences.showSearchField
+        showSearchField = Preferences.shared.currentHomePreferences.showSearchField
     }
 
     func stopPageHandling() {

openHAB/UI/SettingsView/SettingsView.swift

@@ -122,7 +122,7 @@ struct SettingsView: View {
         settingsDemomode = Preferences.shared.currentHomePreferences.demomode
         settingsIdleOff = Preferences.shared.idleOff
         settingsRealTimeSliders = Preferences.shared.currentHomePreferences.realTimeSliders
-        settingsShowSearchField = Preferences.shared.applicationPreferences.showSearchField
+        settingsShowSearchField = Preferences.shared.currentHomePreferences.showSearchField
         settingsSendCrashReports = Preferences.shared.sendCrashReports
         settingsIconType = IconType(rawValue: Preferences.shared.currentHomePreferences.iconType) ?? .svg
         settingsSortSitemapsBy = SortSitemapsOrder(rawValue: Preferences.shared.currentHomePreferences.sortSitemapsBy) ?? .label
@@ -139,6 +139,7 @@ struct SettingsView: View {
         Preferences.shared.modifyActiveHome { @MainActor homePreferences in
             homePreferences.demomode = settingsDemomode
             homePreferences.realTimeSliders = settingsRealTimeSliders
+            homePreferences.showSearchField = settingsShowSearchField
             homePreferences.iconType = settingsIconType.rawValue
             homePreferences.sortSitemapsBy = settingsSortSitemapsBy.rawValue
             homePreferences.defaultMainUIPath = settingsDefaultMainUIPath
@@ -152,10 +153,6 @@ struct SettingsView: View {
         Preferences.shared.idleOff = settingsIdleOff
         Preferences.shared.sendCrashReports = settingsSendCrashReports
 
-        Preferences.shared.modifyApplicationPreferences { @MainActor applicationPreferences in
-            applicationPreferences.showSearchField = settingsShowSearchField
-        }
-
         // Apply global UI changes immediately (status bar visibility)
         UIApplication.shared.connectedScenes
             .compactMap { $0 as? UIWindowScene }