Преглед изворни кода

Revert "Attempt to fix Iob Chart offset"

This reverts commit be342e25fa5c7d42e0f2c0d93d2b9e6450eba12c.
polscm32 aka Marvout пре 1 година
родитељ
комит
77656cf633

+ 2 - 2
FreeAPS/Sources/Modules/Home/View/Chart/BasalChart.swift

@@ -25,11 +25,11 @@ extension MainChartView {
                 drawTempBasals(dummy: false)
                 drawBasalProfile()
                 drawSuspensions()
-            }.onChange(of: state.tempBasals) {
+            }.onChange(of: state.tempBasals) { _ in
                 calculateBasals()
                 calculateTempBasalsInBackground()
             }
-            .onChange(of: state.maxBasal) {
+            .onChange(of: state.maxBasal) { _ in
                 calculateBasals()
             }
             .frame(minHeight: geo.size.height * 0.05)

+ 0 - 28
FreeAPS/Sources/Modules/Home/View/Chart/IobChart.swift

@@ -26,45 +26,17 @@ extension MainChartView {
                     }
                 }
             }
-            .offset(y: deviceOffset)
             .frame(minHeight: geo.size.height * 0.12)
             .frame(width: fullWidth(viewWidth: screenSize.width))
             .chartXScale(domain: startMarker ... endMarker)
             .backport.chartXSelection(value: $selection)
             .chartXAxis { basalChartXAxis }
-            .chartXAxis(.hidden)
             .chartYAxis { cobChartYAxis }
             .chartYScale(domain: state.minValueIobChart ... state.maxValueIobChart)
             .chartYAxis(.hidden)
         }
     }
 
-    var deviceOffset: CGFloat {
-        switch UIDevice.current.userInterfaceIdiom {
-        case .phone:
-            // Use the native screen height in pixels to calculate the offset for different devices
-            // The offset is based on the empirically determined offset for the iPhone 16 Pro simulator (2622 pixels in height, offset = 11)
-            // The offset for other devices is calculated proportionally to the iPhone 16 Pro:
-            // Offset for another device = (Height of the other device / Height of iPhone 16 Pro) * 11
-            let screenHeight = UIScreen.main.nativeBounds.height
-            if screenHeight == 2622 {
-                return 11 // iPhone 16 Pro
-            } else if screenHeight == 2868 {
-                return 12.1 // iPhone 16 Pro Max
-            } else if screenHeight == 2556 {
-                return 10.7 // iPhone 15 Pro
-            } else if screenHeight == 2796 {
-                return 11.7 // iPhone 15 Pro Max / 15 Plus / 16 Plus
-            } else if screenHeight == 2340 {
-                return 9.8 // iPhone 12 Mini
-            } else {
-                return 11 // Default for other phones
-            }
-        default:
-            return 11
-        }
-    }
-
     func drawIOB() -> some ChartContent {
         ForEach(state.enactedAndNonEnactedDeterminations) { iob in
             let rawAmount = iob.iob?.doubleValue ?? 0

+ 5 - 5
FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift

@@ -96,17 +96,17 @@ struct MainChartView: View {
                                 iobChart
                             }
 
-                        }.onChange(of: screenHours) {
+                        }.onChange(of: screenHours) { _ in
                             scroller.scrollTo("MainChart", anchor: .trailing)
                         }
-                        .onChange(of: state.glucoseFromPersistence.last?.glucose) {
+                        .onChange(of: state.glucoseFromPersistence.last?.glucose) { _ in
                             scroller.scrollTo("MainChart", anchor: .trailing)
                             updateStartEndMarkers()
                         }
-                        .onChange(of: state.enactedAndNonEnactedDeterminations.first?.deliverAt) {
+                        .onChange(of: state.enactedAndNonEnactedDeterminations.first?.deliverAt) { _ in
                             scroller.scrollTo("MainChart", anchor: .trailing)
                         }
-                        .onChange(of: units) {
+                        .onChange(of: units) { _ in
                             // TODO: - Refactor this to only update the Y Axis Scale
                             state.setupGlucoseArray()
                         }
@@ -224,7 +224,7 @@ extension MainChartView {
                 }
             }
             .id("MainChart")
-            .onChange(of: state.insulinFromPersistence) {
+            .onChange(of: state.insulinFromPersistence) { _ in
                 state.roundedTotalBolus = state.calculateTINS()
             }
             .frame(minHeight: geo.size.height * 0.28)