3.0.1 (#519)

Missing commit. Confirm bolus quicker on Apple Watch.
Fix for UI glitch (for saving active override illustration before replacing with a new remote override).

---------

Co-authored-by: MikePlante1 <82073483+MikePlante1@users.noreply.github.com>

FreeAPS/Resources/json/defaults/freeaps/freeaps_settings.json

@@ -44,6 +44,7 @@
  "rulerMarks" : false,
  "maxCarbs": 1000,
  "displayFatAndProteinOnWatch": false,
+ "confirmBolusFaster": false,
  "overrideFactor": 0.8,
  "useCalc": false,
  "fattyMeals": false,

FreeAPS/Sources/APS/APSManager.swift

@@ -661,6 +661,11 @@ final class BaseAPSManager: APSManager, Injectable {
  }
 
  guard let override = CoreDataStorage().fetchProfile(name) else { return }
+
+ // Cancel current active first (for the UI to update)
+ if CoreDataStorage().isActive() {
+ OverrideStorage().cancelProfile()
+ }
  CoreDataStorage().activateOverride(override)
  announcementsStorage.storeAnnouncements([announcement], enacted: true)
  debug(.apsManager, "Remote Override by Announcement succeeded.")

FreeAPS/Sources/APS/Storage/CoreDataStorage.swift

@@ -87,4 +87,19 @@ final class CoreDataStorage {
  try? coredataContext.save()
  }
  }
+
+ func isActive() -> Bool {
+ var overrideArray = [Override]()
+ coredataContext.performAndWait {
+ let requestOverrides = Override.fetchRequest() as NSFetchRequest<Override>
+ let sortOverride = NSSortDescriptor(key: "date", ascending: false)
+ requestOverrides.sortDescriptors = [sortOverride]
+ requestOverrides.fetchLimit = 1
+ try? overrideArray = self.coredataContext.fetch(requestOverrides)
+ }
+ guard let lastOverride = overrideArray.first else {
+ return false
+ }
+ return lastOverride.enabled
+ }
 }

FreeAPS/Sources/Models/FreeAPSSettings.swift

@@ -44,6 +44,7 @@ struct FreeAPSSettings: JSON, Equatable {
  var rulerMarks: Bool = false
  var maxCarbs: Decimal = 1000
  var displayFatAndProteinOnWatch: Bool = false
+ var confirmBolusFaster: Bool = false
  var onlyAutotuneBasals: Bool = false
  var overrideFactor: Decimal = 0.8
  var useCalc: Bool = false
@@ -255,6 +256,10 @@ extension FreeAPSSettings: Decodable {
  settings.displayFatAndProteinOnWatch = displayFatAndProteinOnWatch
  }
 
+ if let confirmBolusFaster = try? container.decode(Bool.self, forKey: .confirmBolusFaster) {
+ settings.confirmBolusFaster = confirmBolusFaster
+ }
+
  if let onlyAutotuneBasals = try? container.decode(Bool.self, forKey: .onlyAutotuneBasals) {
  settings.onlyAutotuneBasals = onlyAutotuneBasals
  }

FreeAPS/Sources/Modules/WatchConfig/View/WatchConfigRootView.swift

@@ -21,6 +21,8 @@ extension WatchConfig {
 
  Toggle("Display Protein & Fat", isOn: $state.displayFatAndProteinOnWatch)
 
+ Toggle("Confirm Bolus Faster", isOn: $state.confirmBolusFaster)
+
  Section(header: Text("Garmin Watch")) {
  List {
  ForEach(state.devices, id: \.uuid) { device in

FreeAPS/Sources/Modules/WatchConfig/WatchConfigStateModel.swift

@@ -31,13 +31,15 @@ extension WatchConfig {
  @Published var devices: [IQDevice] = []
  @Published var selectedAwConfig: AwConfig = .HR
  @Published var displayFatAndProteinOnWatch = false
+ @Published var confirmBolusFaster = false
 
  private(set) var preferences = Preferences()
 
  override func subscribe() {
  preferences = provider.preferences
 
  subscribeSetting(\.displayFatAndProteinOnWatch, on: $displayFatAndProteinOnWatch) { displayFatAndProteinOnWatch = $0 }
+ subscribeSetting(\.confirmBolusFaster, on: $confirmBolusFaster) { confirmBolusFaster = $0 }
  subscribeSetting(\.displayOnWatch, on: $selectedAwConfig) { selectedAwConfig = $0 }
  didSet: { [weak self] value in
  // for compatibility with old displayHR

FreeAPS/Sources/Services/WatchManager/WatchManager.swift

@@ -118,6 +118,7 @@ final class BaseWatchManager: NSObject, WatchManager, Injectable {
  self.state.bolusAfterCarbs = !self.settingsManager.settings.skipBolusScreenAfterCarbs
  self.state.displayOnWatch = self.settingsManager.settings.displayOnWatch
  self.state.displayFatAndProteinOnWatch = self.settingsManager.settings.displayFatAndProteinOnWatch
+ self.state.confirmBolusFaster = self.settingsManager.settings.confirmBolusFaster
 
  let eBG = self.eventualBGString()
  self.state.eventualBG = eBG.map { "⇢ " + $0 }

FreeAPSWatch WatchKit Extension/DataFlow.swift

@@ -22,6 +22,7 @@ struct WatchState: Codable {
  var eventualBGRaw: String?
  var displayOnWatch: AwConfig?
  var displayFatAndProteinOnWatch: Bool?
+ var confirmBolusFaster: Bool?
  var useNewCalc: Bool?
  var isf: Decimal?
  var override: String?

FreeAPSWatch WatchKit Extension/Views/BolusConfirmationView.swift

@@ -75,7 +75,7 @@ struct BolusConfirmationView: View {
  $crownProgress,
  from: 0.0,
  through: 100.0,
- by: 0.5,
+ by: state.confirmBolusFaster ? 5 : 0.5,
  sensitivity: .high,
  isContinuous: false,
  isHapticFeedbackEnabled: true

FreeAPSWatch WatchKit Extension/WatchStateModel.swift

@@ -34,6 +34,7 @@ class WatchStateModel: NSObject, ObservableObject {
  @Published var isBolusViewActive = false
  @Published var displayOnWatch: AwConfig = .BGTarget
  @Published var displayFatAndProteinOnWatch = false
+ @Published var confirmBolusFaster = false
  @Published var useNewCalc = false
  @Published var eventualBG = ""
  @Published var isConfirmationViewActive = false {
@@ -175,6 +176,7 @@ class WatchStateModel: NSObject, ObservableObject {
  eventualBG = state.eventualBG ?? ""
  displayOnWatch = state.displayOnWatch ?? .BGTarget
  displayFatAndProteinOnWatch = state.displayFatAndProteinOnWatch ?? false
+ confirmBolusFaster = state.confirmBolusFaster ?? false
  useNewCalc = state.useNewCalc ?? false
  isf = state.isf
  override = state.override