introduce tabbar

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

@@ -148,16 +148,16 @@ extension AddCarbs {
                     }
                 }
                 .navigationTitle("Add Meal")
-                 .navigationBarTitleDisplayMode(.inline)
-                 .toolbar {
-                     ToolbarItem(placement: .topBarLeading) {
-                         Button {
-                             state.hideModal()
-                         } label: {
-                             Text("Close")
-                         }
-                     }
-                 }
+                .navigationBarTitleDisplayMode(.inline)
+                .toolbar {
+                    ToolbarItem(placement: .topBarLeading) {
+                        Button {
+                            state.hideModal()
+                        } label: {
+                            Text("Close")
+                        }
+                    }
+                }
         }
 
         private var presetPopover: some View {

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

@@ -159,7 +159,7 @@ extension AddTempTarget {
                     state.hbt = isEnabledArray.first?.hbt ?? 160
                 }
                 .navigationTitle("Enact Temp Target")
-                 .navigationBarTitleDisplayMode(.inline)
+                .navigationBarTitleDisplayMode(.inline)
                 .toolbar {
                     ToolbarItem(placement: .navigationBarLeading) {
                         Button("Close") {

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

@@ -203,30 +203,28 @@ extension Bolus {
             }.scrollContentBackground(.hidden).background(color)
                 .blur(radius: showInfo ? 3 : 0)
                 .navigationTitle("Enact Bolus")
-                 .navigationBarTitleDisplayMode(.inline)
-                 .toolbar {
-                     ToolbarItem(placement: .topBarLeading) {
-                         if fetch {
-                             Button {
-                                 keepForNextWiew = true
-                                 state.backToCarbsView(complexEntry: true, meal, override: false)
-                             } label: {
-                                 HStack {
-                                     Image(systemName: "chevron.backward")
-                                     Text("Meal")
-                                 }
-                             }
-                         }
-                         else {
-                             Button {
-                                 state.hideModal()
-                             } label: {
-                                 Text("Close")
-                             }
-
-                         }
-                     }
-                 }
+                .navigationBarTitleDisplayMode(.inline)
+                .toolbar {
+                    ToolbarItem(placement: .topBarLeading) {
+                        if fetch {
+                            Button {
+                                keepForNextWiew = true
+                                state.backToCarbsView(complexEntry: true, meal, override: false)
+                            } label: {
+                                HStack {
+                                    Image(systemName: "chevron.backward")
+                                    Text("Meal")
+                                }
+                            }
+                        } else {
+                            Button {
+                                state.hideModal()
+                            } label: {
+                                Text("Close")
+                            }
+                        }
+                    }
+                }
 
                 .onAppear {
                     configureView {

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

@@ -171,7 +171,7 @@ extension Bolus {
                 }
 
                 .navigationTitle("Enact Bolus")
-                 .navigationBarTitleDisplayMode(.inline)
+                .navigationBarTitleDisplayMode(.inline)
                 .toolbar {
                     ToolbarItem(placement: .topBarLeading) {
                         if fetch {
@@ -184,14 +184,12 @@ extension Bolus {
                                     Text("Meal")
                                 }
                             }
-                        }
-                        else {
+                        } else {
                             Button {
                                 state.hideModal()
                             } label: {
                                 Text("Close")
                             }
-
                         }
                     }
                 }

FreeAPS/Sources/Modules/ConfigEditor/View/ConfigEditorRootView.swift

@@ -55,7 +55,7 @@ extension ConfigEditor {
                         }
                     }
                     .navigationTitle(file)
-                     .navigationBarTitleDisplayMode(.automatic)
+                    .navigationBarTitleDisplayMode(.automatic)
                     .padding()
             }
             .scrollContentBackground(.hidden).background(color)

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

@@ -104,16 +104,8 @@ extension DataTable {
             }.background(color)
                 .onAppear(perform: configureView)
                 .navigationTitle("History")
-                 .navigationBarTitleDisplayMode(.inline)
+                .navigationBarTitleDisplayMode(.large)
                 .toolbar {
-                    ToolbarItem(placement: .topBarLeading) {
-                        Button {
-                            state.hideModal()
-                        } label: {
-                            Text("Close")
-                        }
-
-                    }
                     ToolbarItem(placement: .topBarTrailing) {
                         switch state.mode {
                         case .treatments: addButton({
@@ -467,7 +459,7 @@ extension DataTable {
                 }
                 .onAppear(perform: configureView)
                 .navigationTitle("External Insulin")
-                 .navigationBarTitleDisplayMode(.inline)
+                .navigationBarTitleDisplayMode(.inline)
                 .toolbar {
                     ToolbarItem(placement: .topBarLeading) {
                         Button("Close") {

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

@@ -405,15 +405,15 @@ extension MainChartView {
                         unit: .second
                     )
                 ).foregroundStyle(Color.clear)
-                ///temp basal rects
+                /// temp basal rects
                 ForEach(TempBasals) { temp in
-                    ///calculate end time of temp basal adding duration to start time
+                    /// calculate end time of temp basal adding duration to start time
                     let end = temp.timestamp + (temp.durationMin ?? 0).minutes.timeInterval
                     let now = Date()
-                    ///ensure that temp basals that are set cannot exceed current date -> i.e. scheduled temp basals are not shown
-                    ///we could display scheduled temp basals with opacity etc... in the future
+                    /// ensure that temp basals that are set cannot exceed current date -> i.e. scheduled temp basals are not shown
+                    /// we could display scheduled temp basals with opacity etc... in the future
                     let maxEndTime = min(end, now)
-                    
+
                     RectangleMark(
                         xStart: .value("start", temp.timestamp),
                         xEnd: .value("end", maxEndTime),
@@ -421,7 +421,7 @@ extension MainChartView {
                         yEnd: .value("rate-end", temp.rate ?? 0)
                     ).foregroundStyle(Color.insulin)
                 }
-                ///dashed profile line
+                /// dashed profile line
                 ForEach(BasalProfiles, id: \.self) { profile in
                     LineMark(
                         x: .value("Start Date", profile.startDate),

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

@@ -854,8 +854,6 @@ extension Home {
             GeometryReader { geo in
                 ZStack(alignment: .trailing) {
                     VStack(spacing: 0) {
-                        Spacer()
-
                         ZStack {
                             /// glucose bobble
                             glucoseView
@@ -871,7 +869,7 @@ extension Home {
                                 pumpView
                                 Spacer()
                             }.padding(.leading, 20)
-                            
+
                             HStack {
                                 Spacer()
                                 Button {
@@ -883,13 +881,9 @@ extension Home {
                                 }.padding(.trailing, 20).padding(.bottom, 110)
                             }
 
-                        }.padding(.top, 40)
+                        }.padding(.top, 70)
 
-                        Spacer()
-
-                        mealPanel(geo)
-
-                        Spacer()
+                        mealPanel(geo).padding(.vertical, 25)
 
                         profileView(geo).padding(.vertical)
 
@@ -905,18 +899,12 @@ extension Home {
                             .padding(.horizontal, 10)
                             .frame(maxHeight: UIScreen.main.bounds.height / 2.1)
 
-                        Spacer()
-
-                        timeInterval
+                        timeInterval.padding(.top, 25)
 
                         Spacer()
 
-                        ZStack(alignment: .bottom) {
-                            bottomPanel(geo)
-
-                            if let progress = state.bolusProgress {
-                                bolusProgressView(geo, progress)
-                            }
+                        if let progress = state.bolusProgress {
+                            bolusProgressView(geo, progress)
                         }
                     }
                 }
@@ -958,38 +946,42 @@ extension Home {
             }
         }
 
-//        @ViewBuilder func tabBar() -> some View {
-//            TabView(selection: $appState.currentTab) {
-//                mainView()
-//                    .tabItem { Label("Home", systemImage: "house") }
-//                    .tag(Tab.home)
-//
-//                NavigationStack { DataTable.RootView(resolver: resolver) }
-//                    .tabItem { Label("History", systemImage: historySFSymbol) }
-//                    .tag(Tab.history)
-//
-//                NavigationStack { AddCarbs.RootView(resolver: resolver, editMode: false, override: false) }
-//                    .tabItem { Label("Carbs", systemImage: "fork.knife") }
-//                    .tag(Tab.carbs)
-//
-//                NavigationStack { Bolus.RootView(resolver: resolver, waitForSuggestion: false, fetch: false, appState: appState)
-//                }
-//                .tabItem { Label("Bolus", systemImage: "syringe.fill") }
-//                .tag(Tab.bolus)
-//
-//                NavigationStack { OverrideProfilesConfig.RootView(resolver: resolver) }
-//                    .tabItem {
-//                        Label(
-//                            "Profile",
-//                            systemImage: state.isTempTargetActive || overrideString != nil ? "person.fill" : "person"
-//                        ) }
-//                    .tag(Tab.profile)
-//            }.tint(Color.tabBar)
-//        }
+        @ViewBuilder func tabBar() -> some View {
+            TabView(selection: $appState.currentTab) {
+                mainView()
+                    .tabItem { Label("Home", systemImage: "house") }
+                    .tag(Tab.home)
+
+                NavigationStack { DataTable.RootView(resolver: resolver) }
+                    .tabItem { Label("History", systemImage: historySFSymbol) }
+                    .tag(Tab.history)
+
+                NavigationStack { AddCarbs.RootView(resolver: resolver, editMode: false, override: false) }
+                    .tabItem { Label("Treatments", systemImage: "plus") }
+                    .tag(Tab.treatments)
+
+                NavigationStack { OverrideProfilesConfig.RootView(resolver: resolver) }
+                    .tabItem {
+                        Label(
+                            "Profile",
+                            systemImage: state.isTempTargetActive || overrideString != nil ? "person.fill" : "person"
+                        ) }
+                    .tag(Tab.profile)
+
+                NavigationStack { Settings.RootView(resolver: resolver) }
+                    .tabItem {
+                        Label(
+                            "Settings",
+                            systemImage: "gear"
+                        ) }
+                    .tag(Tab.settings)
+            }.tint(Color.tabBar)
+        }
 
         var body: some View {
             ZStack(alignment: .trailing) {
-                mainView()
+                // mainView()
+                tabBar()
                 // burger menu
                 if isMenuPresented {
                     HStack {
@@ -1035,7 +1027,7 @@ class AppState: ObservableObject {
 enum Tab {
     case home
     case history
-    case carbs
-    case bolus
+    case treatments
     case profile
+    case settings
 }

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

@@ -287,17 +287,7 @@ extension OverrideProfilesConfig {
                 .onAppear(perform: configureView)
                 .onAppear { state.savedSettings() }
                 .navigationBarTitle("Profiles")
-                 .navigationBarTitleDisplayMode(.inline)
-                 .toolbar {
-                     ToolbarItem(placement: .topBarLeading) {
-                         Button {
-                             state.hideModal()
-                         } label: {
-                             Text("Close")
-                         }
-                         
-                     }
-                 }
+                .navigationBarTitleDisplayMode(.large)
         }
 
         @ViewBuilder private func profilesView(for preset: OverridePresets) -> some View {

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

@@ -152,14 +152,7 @@ extension Settings {
                 }
                 .onAppear(perform: configureView)
                 .navigationTitle("Settings")
-                .toolbar {
-                    ToolbarItem(placement: .topBarLeading) {
-                        Button("Close") {
-                            state.hideSettingsModal()
-                        }
-                    }
-                }
-                 .navigationBarTitleDisplayMode(.inline)
+                .navigationBarTitleDisplayMode(.large)
                 .onDisappear(perform: { state.uploadProfileAndSettings(false) })
         }
     }

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

@@ -167,7 +167,7 @@ extension Stat {
             }.background(color)
                 .onAppear(perform: configureView)
                 .navigationBarTitle("Statistics")
-                 .navigationBarTitleDisplayMode(.inline)
+                .navigationBarTitleDisplayMode(.inline)
                 .toolbar {
                     ToolbarItem(placement: .topBarLeading) {
                         Button("Close") {