cleanup settings, add alarm volume control, fixes

App/AppState.swift

@@ -42,8 +42,9 @@ struct AppState: DirectState {
             UserDefaults.shared.transmitter = transmitter
         }
 
-        self.alarmHigh = UserDefaults.standard.alarmHigh ?? 180
-        self.alarmLow = UserDefaults.standard.alarmLow ?? 80
+        self.alarmHigh = UserDefaults.standard.alarmHigh
+        self.alarmLow = UserDefaults.standard.alarmLow
+        self.alarmVolume = UserDefaults.standard.alarmVolume
         self.appleCalendarExport = UserDefaults.standard.appleCalendarExport
         self.appleHealthExport = UserDefaults.standard.appleHealthExport
         self.bellmanAlarm = UserDefaults.standard.bellmanAlarm
@@ -75,7 +76,8 @@ struct AppState: DirectState {
         self.sensorInterval = UserDefaults.standard.sensorInterval
         self.showAnnotations = UserDefaults.standard.showAnnotations
         self.transmitter = UserDefaults.shared.transmitter
-        self.smoothChartValues = UserDefaults.standard.smoothChartValues
+        self.showSmoothedGlucose = UserDefaults.standard.showSmoothedGlucose
+        self.showInsulinInput = UserDefaults.standard.showInsulinInput
     }
 
     // MARK: Internal
@@ -111,6 +113,7 @@ struct AppState: DirectState {
 
     var alarmHigh: Int { didSet { UserDefaults.standard.alarmHigh = alarmHigh } }
     var alarmLow: Int { didSet { UserDefaults.standard.alarmLow = alarmLow } }
+    var alarmVolume: Float { didSet { UserDefaults.standard.alarmVolume = alarmVolume } }
     var appleCalendarExport: Bool { didSet { UserDefaults.standard.appleCalendarExport = appleCalendarExport } }
     var appleHealthExport: Bool { didSet { UserDefaults.standard.appleHealthExport = appleHealthExport } }
     var bellmanAlarm: Bool { didSet { UserDefaults.standard.bellmanAlarm = bellmanAlarm } }
@@ -142,5 +145,6 @@ struct AppState: DirectState {
     var sensorInterval: Int { didSet { UserDefaults.standard.sensorInterval = sensorInterval } }
     var showAnnotations: Bool { didSet { UserDefaults.standard.showAnnotations = showAnnotations } }
     var transmitter: Transmitter? { didSet { UserDefaults.shared.transmitter = transmitter } }
-    var smoothChartValues: Bool { didSet { UserDefaults.standard.smoothChartValues = smoothChartValues } }
+    var showSmoothedGlucose: Bool { didSet { UserDefaults.standard.showSmoothedGlucose = showSmoothedGlucose } }
+    var showInsulinInput: Bool { didSet { UserDefaults.standard.showInsulinInput = showInsulinInput } }
 }

App/Modules/Debug/Debug.swift

@@ -17,7 +17,7 @@ private func debugMiddleware(service: LazyService<DebugService>) -> Middleware<D
     return { state, action, _ in
         switch action {
         case .debugAlarm:
-            service.value.debugAlarm(sound: state.expiringAlarmSound, ignoreMute: state.ignoreMute)
+            service.value.debugAlarm(sound: state.expiringAlarmSound, volume: state.alarmVolume, ignoreMute: state.ignoreMute)
 
         case .debugNotification:
             service.value.debugNotification(sound: state.expiringAlarmSound, ignoreMute: state.ignoreMute)
@@ -49,13 +49,13 @@ private class DebugService {
         DirectNotifications.shared.removeNotification(identifier: Identifier.debugAlarm.rawValue)
     }
 
-    func debugAlarm(sound: NotificationSound, ignoreMute: Bool) {
+    func debugAlarm(sound: NotificationSound, volume: Float, ignoreMute: Bool) {
         DirectNotifications.shared.ensureCanSendNotification { state in
             guard state == .sound else {
                 return
             }
 
-            DirectNotifications.shared.playSound(sound: sound, ignoreMute: ignoreMute)
+            DirectNotifications.shared.playSound(sound: sound, volume: volume, ignoreMute: ignoreMute)
         }
     }
 

App/Modules/ExpiringNotification/ExpiringNotification.swift

@@ -37,12 +37,12 @@ private func expiringNotificationMiddelware(service: LazyService<ExpiringNotific
             if sensor.state == .expired { // expired
                 DirectLog.info("Sensor is expired")
 
-                service.value.setSensorExpiredAlarm(sound: state.expiringAlarmSound, ignoreMute: state.ignoreMute)
+                service.value.setSensorExpiredAlarm(sound: state.expiringAlarmSound, volume: state.alarmVolume, ignoreMute: state.ignoreMute)
 
             } else if sensor.remainingLifetime <= (24 * 60) { // less than 24 hours
                 DirectLog.info("Sensor is expiring in less than 24 hours")
 
-                service.value.setSensorExpiringAlarm(body: String(format: LocalizedString("Your sensor is about to expire. Replace sensor in %1$@."), sensor.remainingLifetime.inTimeSummary), sound: .none, ignoreMute: state.ignoreMute)
+                service.value.setSensorExpiringAlarm(body: String(format: LocalizedString("Your sensor is about to expire. Replace sensor in %1$@."), sensor.remainingLifetime.inTimeSummary), sound: .none, volume: state.alarmVolume, ignoreMute: state.ignoreMute)
             }
 
         default:
@@ -75,7 +75,7 @@ private class ExpiringNotificationService {
         DirectNotifications.shared.removeNotification(identifier: Identifier.sensorExpiringAlarm.rawValue)
     }
 
-    func setSensorExpiredAlarm(sound: NotificationSound, ignoreMute: Bool) {
+    func setSensorExpiredAlarm(sound: NotificationSound, volume: Float, ignoreMute: Bool) {
         guard nextExpiredAlert == nil || Date() >= nextExpiredAlert! else {
             return
         }
@@ -96,14 +96,14 @@ private class ExpiringNotificationService {
             notification.body = LocalizedString("Your sensor has expired and needs to be replaced as soon as possible")
 
             if state == .sound {
-                DirectNotifications.shared.playSound(sound: sound, ignoreMute: ignoreMute)
+                DirectNotifications.shared.playSound(sound: sound, volume: volume, ignoreMute: ignoreMute)
             }
 
             DirectNotifications.shared.addNotification(identifier: Identifier.sensorExpiringAlarm.rawValue, content: notification)
         }
     }
 
-    func setSensorExpiringAlarm(body: String, sound: NotificationSound, ignoreMute: Bool) {
+    func setSensorExpiringAlarm(body: String, sound: NotificationSound, volume: Float, ignoreMute: Bool) {
         guard lastExpiringAlert != body else {
             return
         }
@@ -128,7 +128,7 @@ private class ExpiringNotificationService {
             notification.body = body
 
             if state == .sound {
-                DirectNotifications.shared.playSound(sound: sound, ignoreMute: ignoreMute)
+                DirectNotifications.shared.playSound(sound: sound, volume: volume, ignoreMute: ignoreMute)
             }
 
             DirectNotifications.shared.addNotification(identifier: Identifier.sensorExpiringAlarm.rawValue, content: notification)

App/Modules/GlucoseNotification/GlucoseNotification.swift

@@ -44,7 +44,7 @@ private func glucoseNotificationMiddelware(service: LazyService<GlucoseNotificat
 
                 if !isSnoozed {
                     if state.hasLowGlucoseAlarm {
-                        service.value.setLowGlucoseAlarm(sound: state.lowGlucoseAlarmSound, ignoreMute: state.ignoreMute)
+                        service.value.setLowGlucoseAlarm(sound: state.lowGlucoseAlarmSound, volume: state.alarmVolume, ignoreMute: state.ignoreMute)
                     }
 
                     return Just(.setAlarmSnoozeUntil(untilDate: Date().addingTimeInterval(5 * 60).toRounded(on: 1, .minute), autosnooze: true))
@@ -61,7 +61,7 @@ private func glucoseNotificationMiddelware(service: LazyService<GlucoseNotificat
 
                 if !isSnoozed {
                     if state.hasHighGlucoseAlarm {
-                        service.value.setHighGlucoseAlarm(sound: state.highGlucoseAlarmSound, ignoreMute: state.ignoreMute)
+                        service.value.setHighGlucoseAlarm(sound: state.highGlucoseAlarmSound, volume: state.alarmVolume, ignoreMute: state.ignoreMute)
                     }
 
                     return Just(.setAlarmSnoozeUntil(untilDate: Date().addingTimeInterval(5 * 60).toRounded(on: 1, .minute), autosnooze: true))
@@ -131,8 +131,8 @@ private class GlucoseNotificationService {
         }
     }
 
-    func setLowGlucoseAlarm(sound: NotificationSound, ignoreMute: Bool) {
-        DirectNotifications.shared.playSound(sound: sound, ignoreMute: ignoreMute)
+    func setLowGlucoseAlarm(sound: NotificationSound, volume: Float, ignoreMute: Bool) {
+        DirectNotifications.shared.playSound(sound: sound, volume: volume, ignoreMute: ignoreMute)
     }
 
     func setLowGlucoseNotification(glucose: SensorGlucose, glucoseUnit: GlucoseUnit, isSnoozed: Bool) {
@@ -164,8 +164,8 @@ private class GlucoseNotificationService {
         }
     }
 
-    func setHighGlucoseAlarm(sound: NotificationSound, ignoreMute: Bool) {
-        DirectNotifications.shared.playSound(sound: sound, ignoreMute: ignoreMute)
+    func setHighGlucoseAlarm(sound: NotificationSound, volume: Float, ignoreMute: Bool) {
+        DirectNotifications.shared.playSound(sound: sound, volume: volume, ignoreMute: ignoreMute)
     }
 
     func setHighGlucoseNotification(glucose: SensorGlucose, glucoseUnit: GlucoseUnit, isSnoozed: Bool) {

App/Views/Lists/SensorGlucoseListView.swift

@@ -33,7 +33,7 @@ struct SensorGlucoseListView: View {
 
                             Spacer()
 
-                            if let glucoseValue = sensorGlucose.smoothGlucoseValue?.toInteger(), sensorGlucose.timestamp < store.state.smoothThreshold, DirectConfig.smoothSensorGlucoseValues {
+                            if let glucoseValue = sensorGlucose.smoothGlucoseValue?.toInteger(), sensorGlucose.timestamp < store.state.smoothThreshold, DirectConfig.showSmoothedGlucose {
                                 Text(verbatim: glucoseValue.asGlucose(glucoseUnit: store.state.glucoseUnit, withUnit: true))
                                     .monospacedDigit()
                                     .if(store.state.isAlarm(glucoseValue: glucoseValue) != .none) { text in

App/Views/ListsView.swift

@@ -14,14 +14,16 @@ struct ListsView: View {
 
     var body: some View {
         List {
-            Button("Add insulin", action: {
-                showingAddInsulinView = true
-            }).sheet(isPresented: $showingAddInsulinView, onDismiss: {
-                showingAddInsulinView = false
-            }) {
-                AddInsulinView { start, end, units, insulinType in
-                    let insulinDelivery = InsulinDelivery(id: UUID(), starts: start, ends: end, units: units, type: insulinType)
-                    store.dispatch(.addInsulinDelivery(insulinDeliveryValues: [insulinDelivery]))
+            if DirectConfig.showInsulinInput, store.state.showInsulinInput {
+                Button("Add insulin", action: {
+                    showingAddInsulinView = true
+                }).sheet(isPresented: $showingAddInsulinView, onDismiss: {
+                    showingAddInsulinView = false
+                }) {
+                    AddInsulinView { start, end, units, insulinType in
+                        let insulinDelivery = InsulinDelivery(id: UUID(), starts: start, ends: end, units: units, type: insulinType)
+                        store.dispatch(.addInsulinDelivery(insulinDeliveryValues: [insulinDelivery]))
+                    }
                 }
             }
 
@@ -42,7 +44,7 @@ struct ListsView: View {
                 BloodGlucoseListView()
             }
 
-            if DirectConfig.insulinDeliveryInput {
+            if DirectConfig.showInsulinInput, store.state.showInsulinInput {
                 InsulinDeliveryListView()
             }
 

App/Views/Overview/ChartView.swift

@@ -91,7 +91,7 @@ struct ChartView: View {
                                         .cornerRadius(5)
                                     }
 
-                                    if let selectedRawPoint = selectedRawSensorPoint, showUnsmoothedValues, store.state.smoothChartValues {
+                                    if let selectedRawPoint = selectedRawSensorPoint, showUnsmoothedValues, store.state.showSmoothedGlucose {
                                         VStack(alignment: .leading) {
                                             Text(selectedRawPoint.time.toLocalDateTime())
                                             Text(selectedRawPoint.info).bold()
@@ -257,7 +257,7 @@ struct ChartView: View {
                 }
             }
 
-            if showUnsmoothedValues, store.state.smoothChartValues {
+            if showUnsmoothedValues, store.state.showSmoothedGlucose {
                 if !rawSensorGlucoseSeries.isEmpty {
                     ForEach(rawSensorGlucoseSeries) { value in
                         LineMark(
@@ -335,7 +335,15 @@ struct ChartView: View {
             }
         }
         .id(Config.chartID)
-        .onChange(of: store.state.sensorGlucoseValues) { _ in
+        .onChange(of: store.state.showSmoothedGlucose) { _ in
+            if shouldRefresh {
+                DirectLog.info("onChange: sensorGlucoseValues")
+
+                updateSeriesMetadata()
+                updateSensorSeries()
+            }
+
+        }.onChange(of: store.state.sensorGlucoseValues) { _ in
             if shouldRefresh {
                 DirectLog.info("onChange: sensorGlucoseValues")
 
@@ -366,7 +374,7 @@ struct ChartView: View {
                 updateSeriesMetadata()
             }
 
-        }.onChange(of: store.state.smoothChartValues) { _ in
+        }.onChange(of: store.state.showSmoothedGlucose) { _ in
             showUnsmoothedValues = false
 
         }.onChange(of: store.state.selectedDate) { _ in
@@ -617,7 +625,7 @@ struct ChartView: View {
             var smoothSensorPointInfos: [Date: GlucoseDatapoint] = [:]
             var rawSensorPointInfos: [Date: GlucoseDatapoint] = [:]
 
-            let smoothSensorGlucoseSeries = DirectConfig.smoothSensorGlucoseValues && store.state.smoothChartValues
+            let smoothSensorGlucoseSeries = DirectConfig.showSmoothedGlucose && store.state.showSmoothedGlucose
                 ? populateSmoothValues(glucoseValues: store.state.sensorGlucoseValues)
                 : populateValues(glucoseValues: store.state.sensorGlucoseValues)
             smoothSensorGlucoseSeries.forEach { value in
@@ -626,7 +634,7 @@ struct ChartView: View {
                 }
             }
 
-            let rawSensorGlucoseSeries = store.state.smoothChartValues
+            let rawSensorGlucoseSeries = store.state.showSmoothedGlucose
                 ? populateValues(glucoseValues: store.state.sensorGlucoseValues.filter {
                     $0.timestamp < store.state.smoothThreshold
                 })

App/Views/Settings/AdditionalSettingsView.swift

@@ -0,0 +1,43 @@
+//
+//  AdditionalSettings.swift
+//  GlucoseDirectApp
+//
+//  Created by Reimar Metzen on 16.01.23.
+//
+
+import SwiftUI
+
+struct AdditionalSettingsView: View {
+    @EnvironmentObject var store: DirectStore
+
+    var body: some View {
+        Section(
+            content: {
+                if DirectConfig.showSmoothedGlucose {
+                    Toggle("Show smoothed glucose", isOn: showSmoothedGlucose).toggleStyle(SwitchToggleStyle(tint: Color.ui.accent))
+                }
+
+                if DirectConfig.showInsulinInput {
+                    Toggle("Show insulin input", isOn: showInsulinInput).toggleStyle(SwitchToggleStyle(tint: Color.ui.accent))
+                }
+            },
+            header: {
+                Label("Additional settings", systemImage: "gearshape")
+            }
+        )
+    }
+
+    private var showSmoothedGlucose: Binding<Bool> {
+        Binding(
+            get: { store.state.showSmoothedGlucose },
+            set: { store.dispatch(.setShowSmoothedGlucose(enabled: $0)) }
+        )
+    }
+
+    private var showInsulinInput: Binding<Bool> {
+        Binding(
+            get: { store.state.showInsulinInput },
+            set: { store.dispatch(.setShowInsulinInput(enabled: $0)) }
+        )
+    }
+}

App/Views/Settings/AlarmSettingsView.swift

@@ -38,6 +38,16 @@ struct AlarmSettingsView: View {
                         Text(info.localizedDescription)
                     }
                 }.pickerStyle(.menu)
+
+                VStack(alignment: .leading) {
+                    HStack {
+                        Text("Alarm volume")
+                        Spacer()
+                        Text((store.state.alarmVolume * 100).asPercent())
+                    }
+
+                    Slider(value: alarmVolume, in: 0...1, step: 0.05)
+                }
 
                 Toggle("Ignore mute", isOn: ignoreMute).toggleStyle(SwitchToggleStyle(tint: Color.ui.accent))
             },
@@ -55,6 +65,21 @@ struct AlarmSettingsView: View {
             set: { store.dispatch(.setIgnoreMute(enabled: $0)) }
         )
     }
+
+    private var alarmVolume: Binding<Float> {
+        Binding(
+            get: { store.state.alarmVolume },
+            set: {
+                store.dispatch(.setAlarmVolume(volume: $0))
+
+                if DirectNotifications.shared.isPlaying() {
+                    DirectNotifications.shared.setVolume(volume: $0)
+                } else {
+                    DirectNotifications.shared.testSound(sound: .alarm, volume: $0)
+                }
+            }
+        )
+    }
 
     private var selectedLowGlucoseAlarmSound: Binding<String> {
         Binding(
@@ -63,7 +88,7 @@ struct AlarmSettingsView: View {
                 let sound = NotificationSound(rawValue: $0)!
 
                 store.dispatch(.setLowGlucoseAlarmSound(sound: sound))
-                DirectNotifications.shared.testSound(sound: sound)
+                DirectNotifications.shared.testSound(sound: sound, volume: store.state.alarmVolume)
             }
         )
     }
@@ -75,7 +100,7 @@ struct AlarmSettingsView: View {
                 let sound = NotificationSound(rawValue: $0)!
 
                 store.dispatch(.setHighGlucoseAlarmSound(sound: sound))
-                DirectNotifications.shared.testSound(sound: sound)
+                DirectNotifications.shared.testSound(sound: sound, volume: store.state.alarmVolume)
             }
         )
     }
@@ -87,7 +112,7 @@ struct AlarmSettingsView: View {
                 let sound = NotificationSound(rawValue: $0)!
 
                 store.dispatch(.setConnectionAlarmSound(sound: sound))
-                DirectNotifications.shared.testSound(sound: sound)
+                DirectNotifications.shared.testSound(sound: sound, volume: store.state.alarmVolume)
             }
         )
     }
@@ -99,7 +124,7 @@ struct AlarmSettingsView: View {
                 let sound = NotificationSound(rawValue: $0)!
 
                 store.dispatch(.setExpiringAlarmSound(sound: sound))
-                DirectNotifications.shared.testSound(sound: sound)
+                DirectNotifications.shared.testSound(sound: sound, volume: store.state.alarmVolume)
             }
         )
     }