Various updates

- Run calculation of total insulin on scope only on change of picker panel, on appearance of the app and on change of boluses
	* to do: fix tins not updating on Pump History change

- Dynamic Island updates
	* add cob to lockscreen widget
	* add iob to lockscreen widget and adjust padding/spacing
	* to do: fix delay of updating cob and iob

- Change gradient of custom background color

FreeAPS.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -30,7 +30,7 @@
       },
       {
         "package": "SwiftCharts",
-        "repositoryURL": "https://github.com/ivanschuetz/SwiftCharts.git",
+        "repositoryURL": "https://github.com/ivanschuetz/SwiftCharts",
         "state": {
           "branch": "master",
           "revision": "c354c1945bb35a1f01b665b22474f6db28cba4a2",

FreeAPS/Sources/Modules/AddCarbs/View/AddCarbsRootView.swift

@@ -164,13 +164,17 @@ extension AddCarbs {
         }
 
         private var color: LinearGradient {
-            colorScheme == .dark ? LinearGradient(
+            colorScheme == .dark ?  LinearGradient(
                 gradient: Gradient(colors: [
+                    // RGB(10, 34, 55)
+                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745),
+                    // RGB(3, 15, 28)
                     Color(red: 0.011, green: 0.058, blue: 0.109),
+                    // RGB(10, 34, 55)
                     Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745)
                 ]),
-                startPoint: .bottom,
-                endPoint: .top
+                startPoint: .top,
+                endPoint: .bottom
             )
                 :
                 LinearGradient(gradient: Gradient(colors: [Color.gray.opacity(0.1)]), startPoint: .top, endPoint: .bottom)

FreeAPS/Sources/Modules/AddTempTarget/View/AddTempTargetRootView.swift

@@ -206,13 +206,17 @@ extension AddTempTarget {
         }
 
         private var color: LinearGradient {
-            colorScheme == .dark ? LinearGradient(
+            colorScheme == .dark ?  LinearGradient(
                 gradient: Gradient(colors: [
+                    // RGB(10, 34, 55)
+                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745),
+                    // RGB(3, 15, 28)
                     Color(red: 0.011, green: 0.058, blue: 0.109),
+                    // RGB(10, 34, 55)
                     Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745)
                 ]),
-                startPoint: .bottom,
-                endPoint: .top
+                startPoint: .top,
+                endPoint: .bottom
             )
                 :
                 LinearGradient(gradient: Gradient(colors: [Color.gray.opacity(0.1)]), startPoint: .top, endPoint: .bottom)

FreeAPS/Sources/Modules/Bolus/View/AlternativeBolusCalcRootView.swift

@@ -216,13 +216,17 @@ extension Bolus {
         }
 
         private var color: LinearGradient {
-            colorScheme == .dark ? LinearGradient(
+            colorScheme == .dark ?  LinearGradient(
                 gradient: Gradient(colors: [
+                    // RGB(10, 34, 55)
+                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745),
+                    // RGB(3, 15, 28)
                     Color(red: 0.011, green: 0.058, blue: 0.109),
+                    // RGB(10, 34, 55)
                     Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745)
                 ]),
-                startPoint: .bottom,
-                endPoint: .top
+                startPoint: .top,
+                endPoint: .bottom
             )
                 :
                 LinearGradient(gradient: Gradient(colors: [Color.gray.opacity(0.1)]), startPoint: .top, endPoint: .bottom)

FreeAPS/Sources/Modules/Bolus/View/DefaultBolusCalcRootView.swift

@@ -34,6 +34,23 @@ extension Bolus {
                 return 1
             } else { return 0 }
         }
+        
+        private var color: LinearGradient {
+            colorScheme == .dark ?  LinearGradient(
+                gradient: Gradient(colors: [
+                    // RGB(10, 34, 55)
+                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745),
+                    // RGB(3, 15, 28)
+                    Color(red: 0.011, green: 0.058, blue: 0.109),
+                    // RGB(10, 34, 55)
+                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745)
+                ]),
+                startPoint: .top,
+                endPoint: .bottom
+            )
+                :
+                LinearGradient(gradient: Gradient(colors: [Color.gray.opacity(0.1)]), startPoint: .top, endPoint: .bottom)
+        }
 
         var body: some View {
             Form {
@@ -120,7 +137,7 @@ extension Bolus {
                         label: { Text("Continue without bolus") }.frame(maxWidth: .infinity, alignment: .center)
                     }
                 }
-            }
+            }.scrollContentBackground(.hidden).background(color)
             .alert(isPresented: $displayError) {
                 Alert(
                     title: Text("Warning!"),

FreeAPS/Sources/Modules/DataTable/View/DataTableRootView.swift

@@ -57,6 +57,23 @@ extension DataTable {
             return formatter
         }
 
+        private var color: LinearGradient {
+            colorScheme == .dark ?  LinearGradient(
+                gradient: Gradient(colors: [
+                    // RGB(10, 34, 55)
+                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745),
+                    // RGB(3, 15, 28)
+                    Color(red: 0.011, green: 0.058, blue: 0.109),
+                    // RGB(10, 34, 55)
+                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745)
+                ]),
+                startPoint: .top,
+                endPoint: .bottom
+            )
+                :
+                LinearGradient(gradient: Gradient(colors: [Color.gray.opacity(0.1)]), startPoint: .top, endPoint: .bottom)
+        }
+        
         var body: some View {
             VStack {
                 Picker("Mode", selection: $state.mode) {
@@ -213,19 +230,6 @@ extension DataTable {
             }
         }
 
-        private var color: LinearGradient {
-            colorScheme == .dark ? LinearGradient(
-                gradient: Gradient(colors: [
-                    Color(red: 0.011, green: 0.058, blue: 0.109),
-                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745)
-                ]),
-                startPoint: .bottom,
-                endPoint: .top
-            )
-                :
-                LinearGradient(gradient: Gradient(colors: [Color.gray.opacity(0.1)]), startPoint: .top, endPoint: .bottom)
-        }
-
         private var filterEntriesButton: some View {
             Button(action: { showFutureEntries.toggle() }, label: {
                 HStack {

FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -68,11 +68,11 @@ extension Home {
         @Published var isTempTargetActive: Bool = false
 
         @Published var cob: Decimal = 0
+        @Published var roundedTotalBolus: String = ""
 
         let coredataContext = CoreDataStack.shared.persistentContainer.viewContext
 
         override func subscribe() {
-            calculateTINS()
             setupGlucose()
             setupBasals()
             setupBoluses()
@@ -278,27 +278,20 @@ extension Home {
             }
         }
 
-        // MARK: WORKS....BUT MAYBE TIMEZONE PROBLEMS COULD OCCUR
-
         func calculateTINS() -> String {
             let date = Date()
             let calendar = Calendar.current
             let offset = hours
 
             var offsetComponents = DateComponents()
-            //        offsetComponents.hour = -offset.rawValue
             offsetComponents.hour = -Int(offset)
-
             let startTime = calendar.date(byAdding: offsetComponents, to: date)!
-//            print("******************")
-//            print("die voll krasse start time ist: \(startTime)")
 
             let bolusesForCurrentDay = boluses.filter { $0.timestamp >= startTime && $0.type == .bolus }
-
             let totalBolus = bolusesForCurrentDay.map { $0.amount ?? 0 }.reduce(0, +)
-            let roundedTotalBolus = Decimal(round(100 * Double(totalBolus)) / 100)
+            roundedTotalBolus = Decimal(round(100 * Double(totalBolus)) / 100).formatted()
 
-            return "\(roundedTotalBolus)"
+            return roundedTotalBolus
         }
 
         private func setupSuspensions() {

FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift

@@ -83,6 +83,8 @@ struct MainChartView: View {
     @Binding var thresholdLines: Bool
     @Binding var isTempTargetActive: Bool
 
+    @StateObject var state = Home.StateModel()
+
     @State var didAppearTrigger = false
     @State private var BasalProfiles: [BasalProfile] = []
     @State private var TempBasals: [PumpHistoryEvent] = []
@@ -333,6 +335,7 @@ extension MainChartView {
                 }
                 .onChange(of: boluses) { _ in
                     calculateBoluses()
+                    state.roundedTotalBolus = state.calculateTINS()
                 }
                 .onChange(of: tempTargets) { _ in
                     calculateTTs()

FreeAPS/Sources/Modules/Home/View/HomeRootView.swift

@@ -23,7 +23,7 @@ extension Home {
         @State var timeButtons: [Buttons] = [
             Buttons(label: "2 hours", number: "2", active: false, hours: 2),
             Buttons(label: "4 hours", number: "4", active: false, hours: 4),
-            Buttons(label: "6 hours", number: "6", active: true, hours: 6),
+            Buttons(label: "6 hours", number: "6", active: false, hours: 6),
             Buttons(label: "12 hours", number: "12", active: false, hours: 12),
             Buttons(label: "24 hours", number: "24", active: false, hours: 24)
         ]
@@ -731,10 +731,18 @@ extension Home {
                     Spacer()
                     HStack {
                         Text(
-                            "TINS: \(state.calculateTINS())" +
+                            "TINS: \(state.roundedTotalBolus)" +
                                 NSLocalizedString(" U", comment: "Unit in number of units delivered (keep the space character!)")
                         )
                         .font(.system(size: 16, weight: .bold))
+                        .onChange(of: state.hours) { _ in
+                            state.roundedTotalBolus = state.calculateTINS()
+                        }
+                        .onAppear {
+                            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                                state.roundedTotalBolus = state.calculateTINS()
+                            }
+                        }
                     }
                 }
             }.padding(.horizontal, 10)
@@ -815,17 +823,19 @@ extension Home {
 
         var body: some View {
             let colorBackground = colorScheme == .dark ? LinearGradient(
-                gradient: Gradient(colors: [
-                    // RGB(3, 15, 28)
-                    Color(red: 0.011, green: 0.058, blue: 0.109),
-                    // RGB(10, 34, 55)
-                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745)
-                ]),
-                startPoint: .bottom,
-                endPoint: .top
-            )
-                :
-                LinearGradient(gradient: Gradient(colors: [Color.gray.opacity(0.1)]), startPoint: .top, endPoint: .bottom)
+                            gradient: Gradient(colors: [
+                                // RGB(10, 34, 55)
+                                Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745),
+                                // RGB(3, 15, 28)
+                                Color(red: 0.011, green: 0.058, blue: 0.109),
+                                // RGB(10, 34, 55)
+                                Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745)
+                            ]),
+                            startPoint: .top,
+                            endPoint: .bottom
+                        )
+                            :
+                            LinearGradient(gradient: Gradient(colors: [Color.gray.opacity(0.1)]), startPoint: .top, endPoint: .bottom)
             let colourChart: Color = colorScheme == .dark ? Color(
                 red: 0.05490196078,
                 green: 0.05490196078,

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

@@ -41,6 +41,23 @@ extension OverrideProfilesConfig {
             formatter.roundingMode = .halfUp
             return formatter
         }
+        
+        private var color: LinearGradient {
+            colorScheme == .dark ?  LinearGradient(
+                gradient: Gradient(colors: [
+                    // RGB(10, 34, 55)
+                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745),
+                    // RGB(3, 15, 28)
+                    Color(red: 0.011, green: 0.058, blue: 0.109),
+                    // RGB(10, 34, 55)
+                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745)
+                ]),
+                startPoint: .top,
+                endPoint: .bottom
+            )
+                :
+                LinearGradient(gradient: Gradient(colors: [Color.gray.opacity(0.1)]), startPoint: .top, endPoint: .bottom)
+        }
 
         var presetPopover: some View {
             Form {
@@ -368,18 +385,5 @@ extension OverrideProfilesConfig {
                 // To do: add error
             }
         }
-
-        private var color: LinearGradient {
-            colorScheme == .dark ? LinearGradient(
-                gradient: Gradient(colors: [
-                    Color(red: 0.011, green: 0.058, blue: 0.109),
-                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745)
-                ]),
-                startPoint: .bottom,
-                endPoint: .top
-            )
-                :
-                LinearGradient(gradient: Gradient(colors: [Color.gray.opacity(0.1)]), startPoint: .top, endPoint: .bottom)
-        }
     }
 }

FreeAPS/Sources/Modules/Settings/View/SettingsRootView.swift

@@ -9,6 +9,23 @@ extension Settings {
         @State private var showShareSheet = false
 
         @Environment(\.colorScheme) var colorScheme
+        
+        private var color: LinearGradient {
+            colorScheme == .dark ?  LinearGradient(
+                gradient: Gradient(colors: [
+                    // RGB(10, 34, 55)
+                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745),
+                    // RGB(3, 15, 28)
+                    Color(red: 0.011, green: 0.058, blue: 0.109),
+                    // RGB(10, 34, 55)
+                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745)
+                ]),
+                startPoint: .top,
+                endPoint: .bottom
+            )
+                :
+                LinearGradient(gradient: Gradient(colors: [Color.gray.opacity(0.1)]), startPoint: .top, endPoint: .bottom)
+        }
 
         var body: some View {
             Form {
@@ -139,18 +156,5 @@ extension Settings {
                 .navigationBarTitleDisplayMode(.inline)
                 .onDisappear(perform: { state.uploadProfileAndSettings(false) })
         }
-
-        private var color: LinearGradient {
-            colorScheme == .dark ? LinearGradient(
-                gradient: Gradient(colors: [
-                    Color(red: 0.011, green: 0.058, blue: 0.109),
-                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745)
-                ]),
-                startPoint: .bottom,
-                endPoint: .top
-            )
-                :
-                LinearGradient(gradient: Gradient(colors: [Color.gray.opacity(0.1)]), startPoint: .top, endPoint: .bottom)
-        }
     }
 }

FreeAPS/Sources/Modules/Stat/View/StatRootView.swift

@@ -36,6 +36,23 @@ extension Stat {
         @State var days: Double = 0
         @State var pointSize: CGFloat = 3
         @State var conversionFactor = 0.0555
+        
+        private var color: LinearGradient {
+            colorScheme == .dark ?  LinearGradient(
+                gradient: Gradient(colors: [
+                    // RGB(10, 34, 55)
+                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745),
+                    // RGB(3, 15, 28)
+                    Color(red: 0.011, green: 0.058, blue: 0.109),
+                    // RGB(10, 34, 55)
+                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745)
+                ]),
+                startPoint: .top,
+                endPoint: .bottom
+            )
+                :
+                LinearGradient(gradient: Gradient(colors: [Color.gray.opacity(0.1)]), startPoint: .top, endPoint: .bottom)
+        }
 
         @ViewBuilder func stats() -> some View {
             ZStack {
@@ -153,18 +170,5 @@ extension Stat {
                 .navigationBarTitleDisplayMode(.inline)
                 .navigationBarItems(trailing: Button("Close", action: state.hideModal))
         }
-
-        private var color: LinearGradient {
-            colorScheme == .dark ? LinearGradient(
-                gradient: Gradient(colors: [
-                    Color(red: 0.011, green: 0.058, blue: 0.109),
-                    Color(red: 0.03921568627, green: 0.1333333333, blue: 0.2156862745)
-                ]),
-                startPoint: .bottom,
-                endPoint: .top
-            )
-                :
-                LinearGradient(gradient: Gradient(colors: [Color.gray.opacity(0.1)]), startPoint: .top, endPoint: .bottom)
-        }
     }
 }

FreeAPS/Sources/Services/LiveActivity/LiveActitiyShared.swift

@@ -12,6 +12,8 @@ struct LiveActivityAttributes: ActivityAttributes {
         let rotationDegrees: Double
         let highGlucose: Double
         let lowGlucose: Double
+        let cob: Decimal
+        let iob: Decimal
     }
 
     let startDate: Date

FreeAPS/Sources/Services/LiveActivity/LiveActivityBridge.swift

@@ -21,7 +21,14 @@ extension LiveActivityAttributes.ContentState {
             .string(from: mmol ? value.asMmolL as NSNumber : NSNumber(value: value))!
     }
 
-    init?(new bg: BloodGlucose, prev: BloodGlucose?, mmol: Bool, chart: [Readings], settings: FreeAPSSettings) {
+    init?(
+        new bg: BloodGlucose,
+        prev: BloodGlucose?,
+        mmol: Bool,
+        chart: [Readings],
+        settings: FreeAPSSettings,
+        suggestion: Suggestion
+    ) {
         guard let glucose = bg.glucose,
               bg.dateString.timeIntervalSinceNow > -TimeInterval(minutes: 6)
         else {
@@ -80,6 +87,9 @@ extension LiveActivityAttributes.ContentState {
         let highGlucose = settings.highGlucose
         let lowGlucose = settings.lowGlucose
 
+        let cob = suggestion.cob ?? 0
+        let iob = suggestion.iob ?? 0
+
         self.init(
             bg: formattedBG,
             trendSystemImage: trendString,
@@ -89,7 +99,9 @@ extension LiveActivityAttributes.ContentState {
             chartDate: chartDate,
             rotationDegrees: rotationDegrees,
             highGlucose: Double(highGlucose),
-            lowGlucose: Double(lowGlucose)
+            lowGlucose: Double(lowGlucose),
+            cob: cob,
+            iob: iob
         )
     }
 }
@@ -118,11 +130,16 @@ extension LiveActivityAttributes.ContentState {
     @Injected() private var settingsManager: SettingsManager!
     @Injected() private var glucoseStorage: GlucoseStorage!
     @Injected() private var broadcaster: Broadcaster!
+    @Injected() private var storage: FileStorage!
 
     private var settings: FreeAPSSettings {
         settingsManager.settings
     }
 
+    var suggestion: Suggestion? {
+        storage.retrieve(OpenAPS.Enact.suggested, as: Suggestion.self)
+    }
+
     private var currentActivity: ActiveActivity?
     private var latestGlucose: BloodGlucose?
 
@@ -221,25 +238,31 @@ extension LiveActivityBridge: GlucoseObserver {
         defer {
             self.latestGlucose = glucose.last
         }
-//        fetch glucose for chart from Core Data
+
+        // fetch glucose for chart from Core Data
         let coreDataStorage = CoreDataStorage()
         let sixHoursAgo = Calendar.current.date(byAdding: .hour, value: -6, to: Date()) ?? Date()
         let fetchGlucose = coreDataStorage.fetchGlucose(interval: sixHoursAgo as NSDate)
 
-        guard let bg = glucose.last, let content = LiveActivityAttributes.ContentState(
-            new: bg,
-            prev: latestGlucose,
-            mmol: settings.units == .mmolL,
-
-            chart: fetchGlucose, settings: settings
-
-        ) else {
-            // no bg or value stale. Don't update the activity if there already is one, just let it turn stale so that it can still be used once current bg is available again
+        guard let bg = glucose.last else {
             return
         }
 
-        Task {
-            await self.pushUpdate(content)
+        if let suggestion = suggestion {
+            let content = LiveActivityAttributes.ContentState(
+                new: bg,
+                prev: latestGlucose,
+                mmol: settings.units == .mmolL,
+                chart: fetchGlucose,
+                settings: settings,
+                suggestion: suggestion
+            )
+
+            if let content = content {
+                Task {
+                    await self.pushUpdate(content)
+                }
+            }
         }
     }
 }

LiveActivity/LiveActivity.swift

@@ -11,6 +11,21 @@ struct LiveActivity: Widget {
         return f
     }()
 
+    private var bolusFormatter: NumberFormatter {
+        let formatter = NumberFormatter()
+        formatter.numberStyle = .decimal
+        formatter.maximumFractionDigits = 2
+        formatter.decimalSeparator = "."
+        return formatter
+    }
+
+    private var carbsFormatter: NumberFormatter {
+        let formatter = NumberFormatter()
+        formatter.numberStyle = .decimal
+        formatter.maximumFractionDigits = 0
+        return formatter
+    }
+
     func changeLabel(context: ActivityViewContext<LiveActivityAttributes>) -> Text {
         if !context.isStale && !context.state.change.isEmpty {
             Text(context.state.change)
@@ -20,7 +35,7 @@ struct LiveActivity: Widget {
     }
 
     func updatedLabel(context: ActivityViewContext<LiveActivityAttributes>) -> Text {
-        Text("Updated: \(dateFormatter.string(from: context.state.date))")
+        Text("Updated: \(dateFormatter.string(from: context.state.date))").italic()
     }
 
     func bgLabel(context: ActivityViewContext<LiveActivityAttributes>) -> Text {
@@ -31,6 +46,25 @@ struct LiveActivity: Widget {
         }
     }
 
+    @ViewBuilder func mealLabel(context: ActivityViewContext<LiveActivityAttributes>) -> some View {
+        VStack(alignment: .leading, spacing: 1, content: {
+            HStack {
+                Text("COB: ").font(.caption)
+                Text(
+                    (carbsFormatter.string(from: context.state.cob as NSNumber) ?? "--") +
+                        NSLocalizedString(" g", comment: "grams of carbs")
+                ).font(.caption).fontWeight(.bold)
+            }
+            HStack {
+                Text("IOB: ").font(.caption)
+                Text(
+                    (bolusFormatter.string(from: context.state.iob as NSNumber) ?? "--") +
+                        NSLocalizedString(" U", comment: "Unit in number of units delivered (keep the space character!)")
+                ).font(.caption).fontWeight(.bold)
+            }
+        })
+    }
+
     @ViewBuilder func trend(context: ActivityViewContext<LiveActivityAttributes>) -> some View {
         if context.isStale {
             Text("--")
@@ -118,25 +152,26 @@ struct LiveActivity: Widget {
             HStack(spacing: 2) {
                 VStack {
                     chart(context: context).frame(width: UIScreen.main.bounds.width / 1.8)
-                }.padding(.vertical, 5).padding(.horizontal, 15)
+                }.padding(.all, 15)
                 Divider().foregroundStyle(Color.white)
-                VStack {
+                VStack(alignment: .center) {
+                    Spacer()
                     ZStack {
                         bobble(context: context)
                             .scaleEffect(0.6)
                             .clipped()
                         VStack {
-//                            bgAndTrend(context: context).imageScale(.small).font(.title2)
                             bgLabel(context: context).font(.title2).imageScale(.small)
                             changeLabel(context: context).font(.callout)
                         }
-                    }.padding(.trailing, 10).padding(.top, 5)
-                    updatedLabel(context: context).font(.caption).padding(.bottom).padding(.trailing, 5)
+                    }.scaleEffect(0.85).offset(y: 15)
+                    mealLabel(context: context).padding(.bottom, 8)
+                    updatedLabel(context: context).font(.caption).padding(.bottom, 50)
                 }
             }
             .privacySensitive()
             .imageScale(.small)
-            .padding(.all, 15)
+//            .padding(.all, 15)
             .background(Color.white.opacity(0.2))
             .foregroundColor(Color.white)
             .activityBackgroundTint(Color.black.opacity(0.7))