Merge branch 'test' into burger

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

@@ -11,6 +11,7 @@ extension Home {
         @StateObject var state = StateModel()
         @State var isStatusPopupPresented = false
         @State var showCancelAlert = false
+        @State var isMenuPresented = false
 
         struct Buttons: Identifiable {
             let label: String
@@ -138,22 +139,24 @@ extension Home {
                 lowGlucose: $state.lowGlucose,
                 highGlucose: $state.highGlucose
             ).scaleEffect(0.9)
-                .onTapGesture {
-                    if state.alarm == nil {
-                        state.openCGM()
-                    } else {
-                        state.showModal(for: .snooze)
-                    }
-                }
-                .onLongPressGesture {
-                    let impactHeavy = UIImpactFeedbackGenerator(style: .heavy)
-                    impactHeavy.impactOccurred()
-                    if state.alarm == nil {
-                        state.showModal(for: .snooze)
-                    } else {
-                        state.openCGM()
-                    }
-                }
+            /*
+                 .onTapGesture {
+                     if state.alarm == nil {
+                         state.openCGM()
+                     } else {
+                         state.showModal(for: .snooze)
+                     }
+                 }
+                 .onLongPressGesture {
+                     let impactHeavy = UIImpactFeedbackGenerator(style: .heavy)
+                     impactHeavy.impactOccurred()
+                     if state.alarm == nil {
+                         state.showModal(for: .snooze)
+                     } else {
+                         state.openCGM()
+                     }
+                 }
+             */
         }
 
         var pumpView: some View {
@@ -166,11 +169,6 @@ extension Home {
                 timeZone: $state.timeZone,
                 state: state
             )
-            .onTapGesture {
-                if state.pumpDisplayState != nil {
-                    state.setupPump = true
-                }
-            }
         }
 
         var tempBasalString: String? {
@@ -396,6 +394,25 @@ extension Home {
                     .padding([.leading, .trailing], 10)
 
                 HStack {
+                    Button {
+                        state.showModal(for: .dataTable)
+                    }
+                    label: {
+                        if #available(iOS 17.0, *) {
+                            Image(systemName: "book.pages")
+                                .font(.system(size: 24))
+                                .foregroundColor(colorIcon)
+                                .padding(8)
+                        } else {
+                            Image(systemName: "book")
+                                .font(.system(size: 24))
+                                .foregroundColor(colorIcon)
+                                .padding(8)
+                        }
+                    }
+                    .foregroundColor(colorIcon)
+                    .buttonStyle(.borderless)
+                    Spacer()
                     Button { state.showModal(for: .addCarbs(editMode: false, override: false)) }
                     label: {
                         ZStack(alignment: Alignment(horizontal: .trailing, vertical: .bottom)) {
@@ -461,43 +478,13 @@ extension Home {
                     .buttonStyle(.borderless)
                     Spacer()
                     Button {
-                        state.showModal(for: .dataTable)
-                    }
-                    label: {
-                        if #available(iOS 17.0, *) {
-                            Image(systemName: "book.pages")
-                                .font(.system(size: 24))
-                                .foregroundColor(colorIcon)
-                                .padding(8)
-                        } else {
-                            Image(systemName: "book")
-                                .font(.system(size: 24))
-                                .foregroundColor(colorIcon)
-                                .padding(8)
-                        }
-                    }
-                    .foregroundColor(colorIcon)
-                    .buttonStyle(.borderless)
-                    Spacer()
-                    Button { state.showModal(for: .statistics)
-                    }
-                    label: {
-                        Image(systemName: "chart.bar")
-                            .font(.system(size: 24))
-                            .foregroundColor(colorIcon)
-                            .padding(8)
-                    }
-                    .foregroundColor(colorIcon)
-                    .buttonStyle(.borderless)
-                    Spacer()
-                    Button { state.showModal(for: .settings) }
-                    label: {
-                        Image(systemName: "gear")
-                            .font(.system(size: 24))
-                            .foregroundColor(colorIcon)
+                        isMenuPresented.toggle()
+                    } label: {
+                        Image(systemName: "text.justify")
+                            .font(.system(size: 26))
                             .padding(8)
                     }
-                    .foregroundColor(colorIcon)
+                    .foregroundColor((state.isTempTargetActive || (overrideString != nil)) ? Color.purple : colorIcon)
                     .buttonStyle(.borderless)
                 }
                 .padding(.horizontal, 24)
@@ -754,60 +741,137 @@ extension Home {
             }
         }
 
+        @ViewBuilder func menuElements(action: @escaping () -> Void, systemName: String, title: String) -> some View {
+            Button(
+                action: action,
+                label: {
+                    HStack {
+                        Image(systemName: systemName)
+                            .font(.system(size: 21))
+                        Text(title)
+                            .font(.system(size: 19))
+                    }.padding(.top, 1)
+                }
+            )
+        }
+
+        @ViewBuilder func sideMenuView() -> some View {
+            VStack(alignment: .leading, spacing: 25) {
+                HStack {
+                    Button {
+                        isMenuPresented.toggle()
+                    } label: {
+                        Image(systemName: "xmark.app")
+                            .font(.system(size: 30))
+                    }
+                }.padding(.horizontal, 1).padding(.top, 60)
+                Text("Menu")
+                    .font(.system(size: 30)).fontWeight(.bold).padding(.top, 20)
+
+                menuElements(action: { state.showModal(for: .statistics) }, systemName: "chart.bar", title: "Statistics")
+                    .padding(.top, 20)
+
+                menuElements(action: {
+                    if state.pumpDisplayState != nil {
+                        state.setupPump = true
+                    }
+                }, systemName: "cross.vial.fill", title: "Pump Settings")
+
+                menuElements(action: {
+                    if state.alarm == nil {
+                        state.openCGM()
+                    } else {
+                        state.showModal(for: .snooze)
+                    }
+                }, systemName: "textformat.123", title: "CGM")
+
+                menuElements(action: { state.showModal(for: .addTempTarget) }, systemName: "target", title: "Temp targets")
+
+                menuElements(action: { state.showModal(for: .settings) }, systemName: "gear", title: "Settings")
+
+                /* HStack {
+                     Image(systemName: "applewatch.watchface")
+                         .font(.system(size: 21))
+                         .foregroundColor(Color.insulinTintColor)
+                     Text("Watch Settings")
+                         .font(.system(size: 19))
+                 }.padding(.horizontal, 1)
+
+                 */
+
+                Spacer()
+            }.padding(.trailing, 70)
+                .frame(width: UIScreen.main.bounds.width / 1.2, height: UIScreen.main.bounds.height - 20)
+                .overlay {
+                    RoundedRectangle(cornerRadius: 8).stroke(Color.primary.opacity(0.2), lineWidth: 2).shadow(radius: 3)
+                        .ignoresSafeArea(edges: .all)
+                }
+        }
+
         var body: some View {
             GeometryReader { geo in
-                VStack(spacing: 0) {
-                    Spacer()
+                ZStack(alignment: .trailing) {
+                    VStack(spacing: 0) {
+                        Spacer()
 
-                    ZStack {
-                        /// glucose bobble
-                        glucoseView
+                        ZStack {
+                            /// glucose bobble
+                            glucoseView
 
-                        /// right panel with loop status and evBG
-                        HStack {
-                            Spacer()
-                            rightHeaderPanel(geo)
-                        }.padding(.trailing, 20)
+                            /// right panel with loop status and evBG
+                            HStack {
+                                Spacer()
+                                rightHeaderPanel(geo)
+                            }.padding(.trailing, 20)
 
-                        /// left panel with pump related info
-                        HStack {
-                            pumpView
-                            Spacer()
-                        }.padding(.leading, 20)
+                            /// left panel with pump related info
+                            HStack {
+                                pumpView
 
-                    }.padding(.top, 40)
+                                Spacer()
+                            }.padding(.leading, 20)
 
-                    Spacer()
+                        }.padding(.top, 40)
 
-                    mealPanel(geo)
+                        Spacer()
 
-                    Spacer()
+                        mealPanel(geo)
 
-                    profileView(geo).padding(.vertical)
+                        Spacer()
 
-                    RoundedRectangle(cornerRadius: 15)
-                        .fill(Color("Chart"))
-                        .overlay(mainChart)
-                        .clipShape(RoundedRectangle(cornerRadius: 15))
-                        .shadow(
-                            color: colorScheme == .dark ? Color(red: 0.02745098039, green: 0.1098039216, blue: 0.1411764706) :
-                                Color.black.opacity(0.33),
-                            radius: 3
-                        )
-                        .padding(.horizontal, 10)
-                        .frame(maxHeight: UIScreen.main.bounds.height / 2.1)
+                        profileView(geo).padding(.vertical)
 
-                    Spacer()
+                        RoundedRectangle(cornerRadius: 15)
+                            .fill(Color("Chart"))
+                            .overlay(mainChart)
+                            .clipShape(RoundedRectangle(cornerRadius: 15))
+                            .shadow(
+                                color: colorScheme == .dark ? Color(red: 0.02745098039, green: 0.1098039216, blue: 0.1411764706) :
+                                    Color.black.opacity(0.33),
+                                radius: 3
+                            )
+                            .padding(.horizontal, 10)
+                            .frame(maxHeight: UIScreen.main.bounds.height / 2.1)
 
-                    timeInterval
+                        Spacer()
 
-                    Spacer()
+                        timeInterval
 
-                    ZStack(alignment: .bottom) {
-                        bottomPanel(geo)
+                        Spacer()
+
+                        ZStack(alignment: .bottom) {
+                            bottomPanel(geo)
 
-                        if let progress = state.bolusProgress {
-                            bolusProgressView(geo, progress)
+                            if let progress = state.bolusProgress {
+                                bolusProgressView(geo, progress)
+                            }
+                        }
+                    }
+
+                    // burger menu
+                    if isMenuPresented {
+                        HStack {
+                            sideMenuView().background(Color.chart).ignoresSafeArea(.all)
                         }
                     }
                 }

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

@@ -20,7 +20,7 @@ extension OverrideProfilesConfig {
             colorScheme == .dark ? LinearGradient(
                 gradient: Gradient(colors: [
                     Color.bgDarkBlue,
-                   Color.bgDarkerDarkBlue
+                    Color.bgDarkerDarkBlue
                 ]),
                 startPoint: .top,
                 endPoint: .bottom
@@ -268,24 +268,7 @@ extension OverrideProfilesConfig {
                     }
                 }
 
-                header: {
-                    HStack {
-                        Text("Insulin")
-                        Spacer()
-
-                        Button {
-                            state.showModal(for: .addTempTarget)
-                        } label: {
-                            HStack {
-                                Image(systemName: "plus.circle.fill")
-                                    .font(.system(size: 20))
-                                Text("add temp target")
-                                    .font(.caption)
-                                    .foregroundStyle(Color.blue)
-                            }
-                        }
-                    }
-                }
+                header: { Text("Insulin") }
                 footer: {
                     Text(
                         "Your profile basal insulin will be adjusted with the override percentage and your profile ISF and CR will be inversly adjusted with the percentage."