Move to FreeAPSSettings, update copy

FreeAPS/Sources/Models/FreeAPSSettings.swift

@@ -75,6 +75,7 @@ struct FreeAPSSettings: JSON, Equatable {
     var useLiveActivity: Bool = false
     var lockScreenView: LockScreenView = .simple
     var bolusShortcut: BolusShortcutLimit = .notAllowed
+    var useSwiftOref: Bool = false
 }
 
 extension FreeAPSSettings: Decodable {
@@ -327,6 +328,10 @@ extension FreeAPSSettings: Decodable {
             settings.bolusShortcut = bolusShortcut
         }
 
+        if let useSwiftOref = try? container.decode(Bool.self, forKey: .useSwiftOref) {
+            settings.useSwiftOref = useSwiftOref
+        }
+
         self = settings
     }
 }

FreeAPS/Sources/Models/Preferences.swift

@@ -53,7 +53,6 @@ struct Preferences: JSON, Equatable {
     var enableSMB_high_bg_target: Decimal = 110
     var threshold_setting: Decimal = 60
     var updateInterval: Decimal = 20
-    var useSwiftOref: Bool = true
 }
 
 extension Preferences {
@@ -109,7 +108,6 @@ extension Preferences {
         case enableSMB_high_bg_target
         case threshold_setting
         case updateInterval
-        case useSwiftOref
     }
 }
 
@@ -330,10 +328,6 @@ extension Preferences: Decodable {
             preferences.updateInterval = updateInterval
         }
 
-        if let useSwiftOref = try? container.decode(Bool.self, forKey: .useSwiftOref) {
-            preferences.useSwiftOref = useSwiftOref
-        }
-
         self = preferences
     }
 }

FreeAPS/Sources/Modules/AlgorithmAdvancedSettings/AlgorithmAdvancedSettingsStateModel.swift

@@ -21,7 +21,7 @@ extension AlgorithmAdvancedSettings {
         @Published var remainingCarbsFraction: Decimal = 1.0
         @Published var remainingCarbsCap: Decimal = 90
         @Published var noisyCGMTargetMultiplier: Decimal = 1.3
-        @Published var useSwiftOref: Bool = true
+        @Published var useSwiftOref: Bool = false
 
         var insulinActionCurve: Decimal = 10
 
@@ -46,7 +46,7 @@ extension AlgorithmAdvancedSettings {
             subscribePreferencesSetting(\.remainingCarbsCap, on: $remainingCarbsCap) { remainingCarbsCap = $0 }
             subscribePreferencesSetting(\.noisyCGMTargetMultiplier, on: $noisyCGMTargetMultiplier) {
                 noisyCGMTargetMultiplier = $0 }
-            subscribePreferencesSetting(\.useSwiftOref, on: $useSwiftOref) {
+            subscribeSetting(\.useSwiftOref, on: $useSwiftOref) {
                 useSwiftOref = $0 }
 
             insulinActionCurve = pumpSettings.insulinActionCurve

FreeAPS/Sources/Modules/AlgorithmAdvancedSettings/View/AlgorithmAdvancedSettingsRootView.swift

@@ -352,15 +352,15 @@ extension AlgorithmAdvancedSettings {
                     units: state.units,
                     type: .boolean,
                     label: NSLocalizedString("Use Swift Oref", comment: "Use Swift Oref"),
-                    miniHint: "Enables the Swift implementation of the Oref algorithm",
+                    miniHint: "Use new Swift OpenAPS Oref algorithm",
                     verboseHint:
                     VStack(alignment: .leading, spacing: 10) {
-                        Text("Default: ON").bold()
+                        Text("Default: OFF").bold()
                         Text(
-                            "The Use Swift Oref option enables our native implementation of the Oref algorithm."
+                            "This experimental option uses a new version of the OpenAPS Oref algorithm written directly in Swift programming language, replacing the current JavaScript version."
                         )
                         Text(
-                            "Note: When enabled, we log anonymous information about differences between the Swift and Javascript Oref implementations for development."
+                            "When enabled, we'll securely log anonymous technical data comparing the Swift and existing JavaScript algorithms to improve calculation accuracy."
                         )
                     }
                 )