UI tidying, made "insufficient [x] data" appear when selected time range does not have enough points, fixed selectable range on end date to not allow any time before start date,

Author: xan-m

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

@@ -35,14 +35,15 @@ struct BatteryChart: View {
 	}
 
 	var body: some View {
+		let dataPoints = ChartManager.shared.convert(results: chartPoints)
 		let chartStyle = LineChartStyle(infoBoxPlacement: .floating, baseline: .minimumWithMaximum(of: 0), topLine: .maximum(of: 100))
 		let data = LineChartData(dataSets: LineDataSet(
-			dataPoints: ChartManager.shared.convert(results: chartPoints),
+			dataPoints: dataPoints,
 			style: setLineStyle()),
 			chartStyle: chartStyle
 		)
 
-		if chartPoints.count > 1 {
+		if dataPoints.count > 1 {
 			setGraphType(data: data)
 				.animation(.easeIn)
 				.floatingInfoBox(chartData: data)

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

@@ -21,6 +21,7 @@ struct HeartChart: View {
 	@FetchRequest(sortDescriptors: [NSSortDescriptor(keyPath: \ChartDataPoint.timestamp, ascending: true)], predicate: NSPredicate(format: "chart == 0"))
 	private var chartPoints: FetchedResults<ChartDataPoint>
 
+	
 	func setLineStyle() -> LineStyle {
 		if heartChartFill {
 			return LineStyle(lineColour: ColourStyle(colours: [Color.red.opacity(0.7), Color.red.opacity(0.3)], startPoint: .top, endPoint: .bottom), lineType: .curvedLine, ignoreZero: false)
@@ -38,14 +39,15 @@ struct HeartChart: View {
 	}
 
 	var body: some View {
+		let dataPoints = ChartManager.shared.convert(results: chartPoints)
 		let chartStyle = LineChartStyle(infoBoxPlacement: .floating, baseline: .minimumWithMaximum(of: 50), topLine: .maximum(of: 160))
 		let data = LineChartData(dataSets: LineDataSet(
 			dataPoints: ChartManager.shared.convert(results: chartPoints),
 			style: setLineStyle()),
 			chartStyle: chartStyle
 		)
 
-		if chartPoints.count > 1 {
+		if dataPoints.count > 1 {
 			setGraphType(data: data)
 				.animation(.easeIn)
 				.floatingInfoBox(chartData: data)

Infini-iOS/View Components/Sheets/ChartSettingsSheet/ChartSettingsSheetDatePicker.swift

@@ -12,24 +12,22 @@ import SwiftUI
 struct ChartSettingsSheetDatePicker: View {
 	let today = Date()
 	let oneMonthAgo = Calendar.current.date(byAdding: .month, value: -1, to: Date()) ?? (Date() - 2419200)
-
-//	@Binding var endDate: Date// = Date()
-//	@Binding var startDate: Date// = Calendar.current.date(byAdding: .month, value: -1, to: Date())!
 
 	@Binding var chartRangeState: ChartManager.DateSelectionState
+	let oldestPoint: Date?
 
 	var body: some View {
 		List {
 			DatePicker(
 				"Start Date",
 				selection: $chartRangeState.startDate,
-				in: oneMonthAgo...today,
+				in: (oldestPoint ?? oneMonthAgo)...today,
 				displayedComponents: [.date, .hourAndMinute]
 			)
 			DatePicker(
 				"End Date",
 				selection: $chartRangeState.endDate,
-				in: oneMonthAgo...today,
+				in: chartRangeState.startDate...today,
 				displayedComponents: [.date, .hourAndMinute]
 			)
 		}.listStyle(.insetGrouped)

Infini-iOS/View Components/Sheets/ChartSettingsSheet/ChartSettingsSheetMain.swift

@@ -14,7 +14,7 @@ struct ChartSettingsSheet: View {
 	@AppStorage("heartChartFill") var heartChartFill: Bool = true
 	@AppStorage("batChartFill") var batChartFill: Bool = true
 	@FetchRequest(sortDescriptors: [NSSortDescriptor(keyPath: \ChartDataPoint.timestamp, ascending: true)])
-	private var chartPoints: FetchedResults<ChartDataPoint>
+	var chartPoints: FetchedResults<ChartDataPoint>
 
 	@State var chartRangeState: ChartManager.DateSelectionState = ChartManager.DateSelectionState(dateRangeSelection: 1)
 
@@ -29,48 +29,59 @@ struct ChartSettingsSheet: View {
 	var body: some View {
 		VStack {
 			SheetCloseButton()
+			Divider()
+				.padding(.horizontal)
 			VStack {
 				if chartManager.currentChart == .battery {
 					Toggle("Filled Battery Graph", isOn: $batChartFill)
-						.padding()
+						.padding(.horizontal)
 						.frame(maxWidth: .infinity)
+					Divider()
+						.padding(.horizontal)
 					Button (action: {
 						ChartManager.shared.deleteAll(dataSet: chartPoints, chart: ChartsAsInts.battery.rawValue)
 					}) {
 						(Text("Clear All Battery Chart Data"))
 					}
 					.frame(maxWidth: .infinity, alignment: .leading)
-					.padding(.horizontal)
+					.padding()
 				} else {
 					Toggle("Filled HRM Graph", isOn: $heartChartFill)
-						.padding()
+						.padding(.horizontal)
 						.frame(maxWidth: .infinity)
+					Divider()
+						.padding(.horizontal)
 					Button (action: {
 						ChartManager.shared.deleteAll(dataSet: chartPoints, chart: ChartsAsInts.heart.rawValue)
 					}) {
 						(Text("Clear All HRM Chart Data"))
 					}
 					.frame(maxWidth: .infinity, alignment: .leading)
-					.padding(.horizontal)
+					.padding()
 				}
-			}.padding()
+			}
+			Divider()
+				.padding(.horizontal)
 			Text("Select Date Range")
-				.font(.title2)
+//				.font(.title2)
 				.padding()
-				.frame(alignment: .leading)
+				.frame(maxWidth: .infinity, alignment: .leading)
 			Picker("Date Range Selection", selection: $chartRangeState.dateRangeSelection) {
 				Text("Show All").tag(0)
 				Text("Sliders").tag(1)
 				Text("Select Dates").tag(2)
 			}.pickerStyle(.segmented)
-				.padding()
+				.padding(.bottom)
+				.padding(.horizontal)
 			switch chartRangeState.dateRangeSelection {
 			case 0:
-				EmptyView()
+				Text("All Data Selected")
+					.padding()
+					.font(.title)
 			case 1:
 				ChartSettingsSheetSliders(chartRangeState: self.$chartRangeState)
 			case 2:
-				ChartSettingsSheetDatePicker(chartRangeState: self.$chartRangeState)
+				ChartSettingsSheetDatePicker(chartRangeState: self.$chartRangeState, oldestPoint: chartPoints[0].timestamp)
 			default:
 				EmptyView()
 			}

Infini-iOS/View Components/Sheets/ChartSettingsSheet/ChartSettingsSheetSliders.swift

@@ -10,14 +10,9 @@
 import SwiftUI
 
 struct ChartSettingsSheetSliders: View {
-//	@Binding var hours: Float// = 1
-//	@Binding var days: Float// = 0
-//	@Binding var weeks: Float// = 0
-
 	@Binding var chartRangeState: ChartManager.DateSelectionState
 
 	var body: some View{
-//		VStack {
 		List{
 			Slider(value: $chartRangeState.hours, in: 0...23, step: 1) {
 				Text("Hours")
@@ -42,10 +37,7 @@ struct ChartSettingsSheetSliders: View {
 			} maximumValueLabel: {
 				Text("")
 			}
-//			}
-//			Spacer()
 		}
 		.listStyle(.insetGrouped)
-//		.padding()
 	}
 }