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

Replace magic numbers for MainChartHelper.Config constants

Deniz Cengiz пре 1 година
родитељ
комит
ffa8c5575e

+ 2 - 1
FreeAPS/Sources/Helpers/MainChartHelper.swift

@@ -38,8 +38,9 @@ enum MainChartHelper {
 
     enum Config {
         static let bolusSize: CGFloat = 5
-        static let bolusScale: CGFloat = 1
+        static let bolusScale: CGFloat = 1.8
         static let carbsSize: CGFloat = 5
+        static let maxCarbSize: CGFloat = 30
         static let carbsScale: CGFloat = 0.3
         static let fpuSize: CGFloat = 10
         static let maxGlucose = 270

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

@@ -25,15 +25,17 @@ struct CarbView: ChartContent {
             )?.glucose {
                 let yPosition = (units == .mgdL ? Decimal(glucose) : Decimal(glucose).asMmolL) - MainChartHelper
                     .bolusOffset(units: units)
-                let size = (MainChartHelper.Config.carbsSize + CGFloat(carbAmount) * MainChartHelper.Config.carbsScale)
-                let limitedSize = size > 30 ? 30 : size
+                let size = min(
+                    MainChartHelper.Config.carbsSize + CGFloat(carbAmount) * MainChartHelper.Config.carbsScale,
+                    MainChartHelper.Config.maxCarbSize
+                )
 
                 PointMark(
                     x: .value("Time", carbDate, unit: .second),
                     y: .value("Value", yPosition)
                 )
                 .symbol {
-                    Image(systemName: "arrowtriangle.down.fill").font(.system(size: limitedSize)).foregroundStyle(Color.orange)
+                    Image(systemName: "arrowtriangle.down.fill").font(.system(size: size)).foregroundStyle(Color.orange)
                         .rotationEffect(.degrees(180))
                 }
                 .annotation(position: .bottom) {

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

@@ -22,8 +22,7 @@ struct InsulinView: ChartContent {
             )?.glucose {
                 let yPosition = (units == .mgdL ? Decimal(glucose) : Decimal(glucose).asMmolL) + MainChartHelper
                     .bolusOffset(units: units)
-                let size = (MainChartHelper.Config.bolusSize + CGFloat(truncating: amount) * MainChartHelper.Config.bolusScale) *
-                    1.8
+                let size = (MainChartHelper.Config.bolusSize + CGFloat(truncating: amount) * MainChartHelper.Config.bolusScale)
 
                 PointMark(
                     x: .value("Time", bolusDate, unit: .second),