cleaned up chart selection with a function

Author: xan-m

Infini-iOS/View Components/Chart View Components/BatteryChart.swift

@@ -26,31 +26,30 @@ struct BatteryChart: View {
 		}
 	}
 
+	func setGraphType(data: LineChartData) -> some View {
+		if batChartFill {
+			return AnyView(FilledLineChart(chartData: data))
+		} else {
+			return AnyView(LineChart(chartData: data))
+		}
+	}
 
 	var body: some View {
 		let chartStyle = LineChartStyle(infoBoxPlacement: .floating, baseline: .minimumWithMaximum(of: 0), topLine: .maximum(of: 100))
 		let data = LineChartData(dataSets: LineDataSet(
 			dataPoints: ChartManager.shared.convert(results: chartPoints),
 			style: setLineStyle()),
+			metadata: ChartMetadata(title: " ", subtitle: " "),
 			chartStyle: chartStyle
 		)
 
 		if chartPoints.count > 1 {
-			if batChartFill {
-				FilledLineChart(chartData: data)
-					.animation(.easeIn)
-					.floatingInfoBox(chartData: data)
-					.touchOverlay(chartData: data, unit: .suffix(of: "%"))
-					.yAxisLabels(chartData: data)
-					.padding()
-			} else {
-				LineChart(chartData: data)
-					.animation(.easeIn)
-					.floatingInfoBox(chartData: data)
-					.touchOverlay(chartData: data, unit: .suffix(of: "%"))
-					.yAxisLabels(chartData: data)
-					.padding()
-			}
+			setGraphType(data: data)
+				.animation(.easeIn)
+				.floatingInfoBox(chartData: data)
+				.touchOverlay(chartData: data, unit: .suffix(of: "%"))
+				.yAxisLabels(chartData: data)
+				.padding()
 		} else {
 			VStack (alignment: .center) {
 				Spacer()

Infini-iOS/View Components/Chart View Components/HeartChart.swift

@@ -29,6 +29,13 @@ struct HeartChart: View {
 		}
 	}
 
+	func setGraphType(data: LineChartData) -> some View {
+		if heartChartFill {
+			return AnyView(FilledLineChart(chartData: data))
+		} else {
+			return AnyView(LineChart(chartData: data))
+		}
+	}
 
 	var body: some View {
 		let chartStyle = LineChartStyle(infoBoxPlacement: .floating, baseline: .minimumWithMaximum(of: 50), topLine: .maximum(of: 160))
@@ -39,22 +46,13 @@ struct HeartChart: View {
 		)
 
 		if chartPoints.count > 1 {
-			if heartChartFill {
-				FilledLineChart(chartData: data)
-					.animation(.easeIn)
-					.floatingInfoBox(chartData: data)
-					.touchOverlay(chartData: data, unit: .suffix(of: "BPM"))
-					.yAxisLabels(chartData: data)
-					.padding()
-				
-			} else {
-				LineChart(chartData: data)
-					.animation(.easeIn)
-					.floatingInfoBox(chartData: data)
-					.touchOverlay(chartData: data, unit: .suffix(of: "BPM"))
-					.yAxisLabels(chartData: data)
-					.padding()
-			}
+			setGraphType(data: data)
+				.animation(.easeIn)
+				.floatingInfoBox(chartData: data)
+				.touchOverlay(chartData: data, unit: .suffix(of: "BPM"))
+				.yAxisLabels(chartData: data)
+				.xAxisLabels(chartData: data)
+				.padding()
 		} else {
 			VStack (alignment: .center) {
 				Spacer()