remove comments and test code; remove top alignment in zstack in HomeRootView

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

@@ -58,163 +58,6 @@ extension Home {
 
         // TODO: end todo
 
-        func sendTestRepeat(storedMessages: [MessageContent], repeats: Bool = false) { // TODO: REMOVE!!!
-            if repeats == true {
-                for _ in 0 ... 5 {
-                    for _ in 0 ... storedMessages.count - 1 {
-                        var count = 0
-                        _ = Timer.scheduledTimer(withTimeInterval: 2, repeats: true) { t in
-                            print(count)
-                            print(storedMessages[count].content)
-                            router.alertMessage.send(storedMessages[count])
-                            count += 1
-                            if count >= storedMessages.count {
-                                t.invalidate()
-                            }
-                        }
-                    }
-                }
-            } else {
-                for i in 0 ... storedMessages.count - 1 {
-                    print(i)
-                    print(storedMessages[i].content)
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
-                        router.alertMessage.send(storedMessages[i])
-                    }
-                }
-            }
-        }
-
-        func sendTestTriggerMessage() { // TODO: REMOVE!!!
-            var storedMessages: [MessageContent] = []
-            var messageCont: MessageContent
-
-            let firstInterval = 1 // min
-            let secondInterval = 2 // min
-            let firstTrigger = UNTimeIntervalNotificationTrigger(timeInterval: 60 * TimeInterval(firstInterval), repeats: false)
-            messageCont = MessageContent(
-                content: "Last Loop was more than 20 min ago - TEST",
-                type: MessageType.error,
-                subtype: .algorithm,
-                title: "Trio Not Active",
-                useAPN: true,
-                trigger: firstTrigger
-            )
-            debug(
-                .default,
-                "TEST \(messageCont.title) \(messageCont.content) \(messageCont.type) \(messageCont.subtype)"
-            )
-            storedMessages.append(messageCont)
-
-            let secondTrigger = UNTimeIntervalNotificationTrigger(timeInterval: 60 * TimeInterval(secondInterval), repeats: false)
-            messageCont = MessageContent(
-                content: "Last Loop was more than 40 min ago - TEST",
-                type: MessageType.error,
-                subtype: .algorithm,
-                title: "Trio Not Active",
-                useAPN: true,
-                trigger: secondTrigger
-            )
-            debug(
-                .default,
-                "TEST \(messageCont.title) \(messageCont.content) \(messageCont.type) \(messageCont.subtype)"
-            )
-            storedMessages.append(messageCont)
-
-            sendTestRepeat(storedMessages: storedMessages, repeats: true)
-        }
-
-        func sendTestNotifications() { // TODO: REMOVE!!!
-            var storedMessages: [MessageContent] = []
-            var messageCont: MessageContent
-
-            sendTestTriggerMessage()
-
-            messageCont = MessageContent(
-                content: "68 mg/dL" + "↔︎" + "-1" + "\n" + "Plugin CGM Source",
-                type: MessageType.warning,
-                subtype: .glucose,
-                title: "LOWALERT! 68 mg/dL" + "↔︎" + "-1",
-                useAPN: true,
-                action: .snooze
-            )
-            router.alertMessage.send(messageCont)
-            messageCont = MessageContent(
-                content: "83 mg/dL" + "↔︎" + "-1", // + "\n" + "Plugin CGM Source",
-                type: MessageType.info,
-                subtype: .glucose,
-                title: "Glucose 83 mg/dL" + "↔︎" + "-1",
-                action: .snooze
-            )
-            router.alertMessage.send(messageCont)
-
-            messageCont = MessageContent(
-                content: "Insulin delivery stopped. Change Pod now.",
-                type: MessageType.error, // errorPump
-                subtype: .pump,
-                title: "Critical Pod Fault 008",
-                useAPN: true,
-                action: .pumpConfig
-            )
-            storedMessages.append(messageCont)
-
-            messageCont = MessageContent(
-                content: "Pod expires in 68 hours.",
-                type: MessageType.warning,
-                subtype: .pump,
-                title: "Pod Expiration Reminder"
-            )
-            storedMessages.append(messageCont)
-            messageCont = MessageContent(
-                content: "10 U insulin or less remaining in Pod. Change Pod soon.",
-                type: MessageType.warning,
-                subtype: .pump,
-                title: "Low Reservoir",
-                useAPN: true
-            )
-            storedMessages.append(messageCont)
-
-            messageCont = MessageContent(
-                content: "To prevent LOW required 30 g of carbs",
-                type: MessageType.warning,
-                subtype: .carb,
-                title: "Carbs required: 30 g"
-            )
-            storedMessages.append(messageCont)
-
-            messageCont = MessageContent(
-                content: "83 mg/dL" + "↔︎" + "-1", // + "\n" + "Plugin CGM Source",
-                type: MessageType.info,
-                subtype: .glucose,
-                title: "Glucose 83 mg/dL" + "↔︎" + "-1",
-                action: .snooze
-            )
-            storedMessages.append(messageCont)
-
-            messageCont = MessageContent(
-                content: "Error: Invalid glucose: Not enough glucose data",
-                type: MessageType.info,
-                subtype: .algorithm
-            )
-            storedMessages.append(messageCont)
-            messageCont = MessageContent(
-                content: "Temp Basal failed with error",
-                type: MessageType.info,
-                subtype: .algorithm
-            )
-            storedMessages.append(messageCont)
-
-//            info(.apsManager, "Not enough glucose data")
-//            info(.apsManager, "Glucose data is stale")
-//            info(.apsManager, "Glucose data is too flat")
-//            info(.apsManager, "Glucose validation failed")
-//            info(.apsManager, "Loop not possible during the manual basal temp")
-//            info(.apsManager, "Temp Basal failed with error")
-//            info(.apsManager, "Pump not suspended by Announcement")
-
-            sendTestRepeat(storedMessages: storedMessages, repeats: false)
-        }
-
         var bolusProgressFormatter: NumberFormatter {
             let formatter = NumberFormatter()
             formatter.numberStyle = .decimal
@@ -904,7 +747,7 @@ extension Home {
                     alertSafetyNotificationsView(geo: geo)
                         .padding(.top, UIDevice.adjustPadding(min: nil, max: 40))
                 }
-                ZStack(alignment: .top) {
+                ZStack {
                     /// glucose bobble
                     glucoseView
 
@@ -984,7 +827,6 @@ extension Home {
                     )
                     .onTapGesture {
                         state.isStatusPopupPresented = false
-                        sendTestNotifications() // TODO: Remove!
                     }
                     .gesture(
                         DragGesture(minimumDistance: 10, coordinateSpace: .local)

FreeAPS/Sources/Modules/Settings/View/Subviews/NotificationsView.swift

@@ -77,11 +77,8 @@ struct NotificationsView: BaseView {
             Section(
                 header: Text("Notification Center"),
                 content: {
-//                    if !notificationsDisabled {
-                    // Text("Glucose Notifications").navigationLink(to: .glucoseNotificationSettings, from: self)//TODO: add MessageType settings
                     Text("Trio Notifications")
-                        .navigationLink(to: .glucoseNotificationSettings, from: self) // Glucose Notifications
-//                    }
+                        .navigationLink(to: .glucoseNotificationSettings, from: self)
 
                     if #available(iOS 16.2, *) {
                         Text("Live Activity").navigationLink(to: .liveActivitySettings, from: self)