Rename smbIsAlwaysOff to smbIsScheduledOff

Also rewords "Last Hour SMBs are Off" to "First Hour SMBs are Resumed" to hopefully be a little clearer, and hides "Schedule when SMBs are Off" switch when "Disable SMBs" is switched on instead of disabling it when "Disable SMBs" is switched off.

Core_Data.xcdatamodeld/Core_Data.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21754" systemVersion="22F82" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22757" systemVersion="23E224" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="BGaverages" representedClassName="BGaverages" syncable="YES" codeGenerationType="class">
         <attribute name="average" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
         <attribute name="average_1" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
@@ -66,8 +66,8 @@
         <attribute name="isfAndCr" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="isPreset" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="percentage" optional="YES" attributeType="Double" defaultValueString="100" usesScalarValueType="YES"/>
-        <attribute name="smbIsAlwaysOff" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="smbIsOff" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+        <attribute name="smbIsScheduledOff" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="smbMinutes" optional="YES" attributeType="Decimal" defaultValueString="30"/>
         <attribute name="start" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
         <attribute name="target" optional="YES" attributeType="Decimal" defaultValueString="100"/>
@@ -85,8 +85,8 @@
         <attribute name="isfAndCr" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
         <attribute name="name" optional="YES" attributeType="String"/>
         <attribute name="percentage" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
-        <attribute name="smbIsAlwaysOff" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="smbIsOff" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
+        <attribute name="smbIsScheduledOff" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
         <attribute name="smbMinutes" optional="YES" attributeType="Decimal" defaultValueString="30"/>
         <attribute name="start" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
         <attribute name="target" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>

FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift

@@ -259,7 +259,7 @@ final class OpenAPS {
                     isfAndCr: overrideArray.first?.isfAndCr ?? false,
                     isf: overrideArray.first?.isf ?? false,
                     cr: overrideArray.first?.cr ?? false,
-                    smbIsAlwaysOff: overrideArray.first?.smbIsAlwaysOff ?? false,
+                    smbIsScheduledOff: overrideArray.first?.smbIsScheduledOff ?? false,
                     start: (overrideArray.first?.start ?? 0) as Decimal,
                     end: (overrideArray.first?.end ?? 0) as Decimal,
                     smbMinutes: (overrideArray.first?.smbMinutes ?? smbMinutes) as Decimal,
@@ -287,7 +287,7 @@ final class OpenAPS {
                     isfAndCr: overrideArray.first?.isfAndCr ?? false,
                     isf: overrideArray.first?.isf ?? false,
                     cr: overrideArray.first?.cr ?? false,
-                    smbIsAlwaysOff: overrideArray.first?.smbIsAlwaysOff ?? false,
+                    smbIsScheduledOff: overrideArray.first?.smbIsScheduledOff ?? false,
                     start: (overrideArray.first?.start ?? 0) as Decimal,
                     end: (overrideArray.first?.end ?? 0) as Decimal,
                     smbMinutes: (overrideArray.first?.smbMinutes ?? smbMinutes) as Decimal,

FreeAPS/Sources/Models/Oref2_variables.swift

@@ -18,7 +18,7 @@ struct Oref2_variables: JSON, Equatable {
     var isfAndCr: Bool
     var isf: Bool
     var cr: Bool
-    var smbIsAlwaysOff: Bool
+    var smbIsScheduledOff: Bool
     var start: Decimal
     var end: Decimal
     var smbMinutes: Decimal
@@ -42,7 +42,7 @@ struct Oref2_variables: JSON, Equatable {
         isfAndCr: Bool,
         isf: Bool,
         cr: Bool,
-        smbIsAlwaysOff: Bool,
+        smbIsScheduledOff: Bool,
         start: Decimal,
         end: Decimal,
         smbMinutes: Decimal,
@@ -65,7 +65,7 @@ struct Oref2_variables: JSON, Equatable {
         self.isfAndCr = isfAndCr
         self.isf = isf
         self.cr = cr
-        self.smbIsAlwaysOff = smbIsAlwaysOff
+        self.smbIsScheduledOff = smbIsScheduledOff
         self.start = start
         self.end = end
         self.smbMinutes = smbMinutes
@@ -92,7 +92,7 @@ extension Oref2_variables {
         case isfAndCr
         case isf
         case cr
-        case smbIsAlwaysOff
+        case smbIsScheduledOff
         case start
         case end
         case smbMinutes

FreeAPS/Sources/Modules/OverrideProfilesConfig/OverrideProfilesStateModel.swift

@@ -19,7 +19,7 @@ extension OverrideProfilesConfig {
         @Published var isfAndCr: Bool = true
         @Published var isf: Bool = true
         @Published var cr: Bool = true
-        @Published var smbIsAlwaysOff: Bool = false
+        @Published var smbIsScheduledOff: Bool = false
         @Published var start: Decimal = 0
         @Published var end: Decimal = 23
         @Published var smbMinutes: Decimal = 0
@@ -66,11 +66,11 @@ extension OverrideProfilesConfig {
                         saveOverride.isf = isf
                         saveOverride.cr = cr
                     } else { saveOverride.isfAndCr = true }
-                    if smbIsAlwaysOff {
-                        saveOverride.smbIsAlwaysOff = true
+                    if smbIsScheduledOff {
+                        saveOverride.smbIsScheduledOff = true
                         saveOverride.start = start as NSDecimalNumber
                         saveOverride.end = end as NSDecimalNumber
-                    } else { saveOverride.smbIsAlwaysOff = false }
+                    } else { saveOverride.smbIsScheduledOff = false }
 
                     saveOverride.smbMinutes = smbMinutes as NSDecimalNumber
                     saveOverride.uamMinutes = uamMinutes as NSDecimalNumber
@@ -107,11 +107,11 @@ extension OverrideProfilesConfig {
                         saveOverride.isf = isf
                         saveOverride.cr = cr
                     } else { saveOverride.isfAndCr = true }
-                    if smbIsAlwaysOff {
-                        saveOverride.smbIsAlwaysOff = true
+                    if smbIsScheduledOff {
+                        saveOverride.smbIsScheduledOff = true
                         saveOverride.start = start as NSDecimalNumber
                         saveOverride.end = end as NSDecimalNumber
-                    } else { smbIsAlwaysOff = false }
+                    } else { smbIsScheduledOff = false }
 
                     saveOverride.smbMinutes = smbMinutes as NSDecimalNumber
                     saveOverride.uamMinutes = uamMinutes as NSDecimalNumber
@@ -147,11 +147,11 @@ extension OverrideProfilesConfig {
                         saveOverride.isf = profile.isf
                         saveOverride.cr = profile.cr
                     } else { saveOverride.isfAndCr = true }
-                    if profile.smbIsAlwaysOff {
-                        saveOverride.smbIsAlwaysOff = true
+                    if profile.smbIsScheduledOff {
+                        saveOverride.smbIsScheduledOff = true
                         saveOverride.start = profile.start
                         saveOverride.end = profile.end
-                    } else { saveOverride.smbIsAlwaysOff = false }
+                    } else { saveOverride.smbIsScheduledOff = false }
 
                     saveOverride.smbMinutes = (profile.smbMinutes ?? 0) as NSDecimalNumber
                     saveOverride.uamMinutes = (profile.uamMinutes ?? 0) as NSDecimalNumber
@@ -175,14 +175,14 @@ extension OverrideProfilesConfig {
                 smbIsOff = overrideArray.first?.smbIsOff ?? false
                 advancedSettings = overrideArray.first?.advancedSettings ?? false
                 isfAndCr = overrideArray.first?.isfAndCr ?? true
-                smbIsAlwaysOff = overrideArray.first?.smbIsAlwaysOff ?? false
+                smbIsScheduledOff = overrideArray.first?.smbIsScheduledOff ?? false
 
                 if advancedSettings {
                     if !isfAndCr {
                         isf = overrideArray.first?.isf ?? false
                         cr = overrideArray.first?.cr ?? false
                     }
-                    if smbIsAlwaysOff {
+                    if smbIsScheduledOff {
                         start = (overrideArray.first?.start ?? 0) as Decimal
                         end = (overrideArray.first?.end ?? 0) as Decimal
                     }

FreeAPS/Sources/Modules/OverrideProfilesConfig/View/OverrideProfilesRootView.swift

@@ -123,21 +123,23 @@ extension OverrideProfilesConfig {
                                 Text("Disable SMBs")
                             }
                         }
-                        HStack {
-                            Toggle(isOn: $state.smbIsAlwaysOff) {
-                                Text("Schedule when SMBs are Off")
-                            }.disabled(!state.smbIsOff)
-                        }
-                        if state.smbIsAlwaysOff {
+                        if !state.smbIsOff {
                             HStack {
-                                Text("First Hour SMBs are Off (24 hours)")
-                                DecimalTextField("0", value: $state.start, formatter: formatter, cleanInput: false)
-                                Text("hour").foregroundColor(.secondary)
+                                Toggle(isOn: $state.smbIsScheduledOff) {
+                                    Text("Schedule when SMBs are Off")
+                                }
                             }
-                            HStack {
-                                Text("Last Hour SMBs are Off (24 hours)")
-                                DecimalTextField("0", value: $state.end, formatter: formatter, cleanInput: false)
-                                Text("hour").foregroundColor(.secondary)
+                            if state.smbIsScheduledOff {
+                                HStack {
+                                    Text("First Hour SMBs are Off (24 hours)")
+                                    DecimalTextField("0", value: $state.start, formatter: formatter, cleanInput: false)
+                                    Text("hour").foregroundColor(.secondary)
+                                }
+                                HStack {
+                                    Text("First Hour SMBs are Resumed (24 hours)")
+                                    DecimalTextField("0", value: $state.end, formatter: formatter, cleanInput: false)
+                                    Text("hour").foregroundColor(.secondary)
+                                }
                             }
                         }
                         HStack {
@@ -281,7 +283,7 @@ extension OverrideProfilesConfig {
             let percent = preset.percentage / 100
             let perpetual = preset.indefinite
             let durationString = perpetual ? "" : "\(formatter.string(from: duration as NSNumber)!)"
-            let scheduledSMBstring = (preset.smbIsOff && preset.smbIsAlwaysOff) ? "Scheduled SMBs" : ""
+            let scheduledSMBstring = (preset.smbIsOff && preset.smbIsScheduledOff) ? "Scheduled SMBs" : ""
             let smbString = (preset.smbIsOff && scheduledSMBstring == "") ? "SMBs are off" : ""
             let targetString = target != 0 ? "\(glucoseFormatter.string(from: target as NSNumber)!)" : ""
             let maxMinutesSMB = (preset.smbMinutes as Decimal?) != nil ? (preset.smbMinutes ?? 0) as Decimal : 0