Added swipe left to delete to the history views.

msimms · May 22, 2024 · 4a62c5d · 4a62c5d
1 parent a5c890f
commit 4a62c5d
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 36 deletions.
diff --git a/Watch App/HistoryView.swift b/Watch App/HistoryView.swift
@@ -21,27 +21,38 @@ struct HistoryView: View {
 		}
 	}
 
+	private func delete(at offsets: IndexSet) {
+		for offset in offsets {
+			let item = self.historyVM.historicalActivities[offset]
+			let activityVM = StoredActivityVM(activitySummary: item)
+			let _ = activityVM.deleteActivity()
+		}
+	}
+
 	var body: some View {
 		switch self.historyVM.state {
 		case HistoryVM.VmState.loaded:
 			VStack(alignment: .leading) {
 				if self.historyVM.historicalActivities.count > 0 {
-					List(self.historyVM.historicalActivities, id: \.self) { item in
-						NavigationLink(destination: HistoryDetailsView(activityVM: StoredActivityVM(activitySummary: item))) {
-							VStack(alignment: .leading) {
-								if item.name.count > 0 {
-									Text(item.name)
-										.bold()
-								}
-								HStack() {
-									Image(systemName: HistoryVM.imageNameForActivityType(activityType: item.type))
-									Text(item.type)
-										.bold()
-									Spacer()
-									Text("\(self.dateFormatter.string(from: item.startTime))")
+					List {
+						ForEach(self.historyVM.historicalActivities) { item in
+							NavigationLink(destination: HistoryDetailsView(activityVM: StoredActivityVM(activitySummary: item))) {
+								VStack(alignment: .leading) {
+									if item.name.count > 0 {
+										Text(item.name)
+											.bold()
+									}
+									HStack() {
+										Image(systemName: HistoryVM.imageNameForActivityType(activityType: item.type))
+										Text(item.type)
+											.bold()
+										Spacer()
+										Text("\(self.dateFormatter.string(from: item.startTime))")
+									}
 								}
 							}
 						}
+						.onDelete(perform: delete)
 					}
 					.listStyle(.plain)
 				}

diff --git a/iPhone App/HistoryView.swift b/iPhone App/HistoryView.swift
@@ -25,6 +25,14 @@ struct HistoryView: View {
 		}
 	}
 
+	private func delete(at offsets: IndexSet) {
+		for offset in offsets {
+			let item = self.historyVM.historicalActivities[offset]
+			let activityVM = StoredActivityVM(activitySummary: item)
+			let _ = activityVM.deleteActivity()
+		}
+	}
+
 	var body: some View {
 		ZStack() {
 			// The user has connected the app to the server, but we don't have a valid session, move to the login screen.
@@ -45,34 +53,37 @@ struct HistoryView: View {
 				// The list of stored activities.
 				VStack(alignment: .center) {
 					if self.historyVM.historicalActivities.count > 0 {
-						List(self.historyVM.historicalActivities, id: \.self) { item in
-							NavigationLink(destination: HistoryDetailsView(activityVM: StoredActivityVM(activitySummary: item))) {
-								HStack() {
-									Image(systemName: HistoryVM.imageNameForActivityType(activityType: item.type))
-										.frame(width: 32)
-									VStack(alignment: .leading) {
-										if item.name.count > 0 {
-											Text(item.name)
-												.bold()
-												.font(Font.headline)
+						List {
+							ForEach(self.historyVM.historicalActivities) { item in
+								NavigationLink(destination: HistoryDetailsView(activityVM: StoredActivityVM(activitySummary: item))) {
+									HStack() {
+										Image(systemName: HistoryVM.imageNameForActivityType(activityType: item.type))
+											.frame(width: 32)
+										VStack(alignment: .leading) {
+											if item.name.count > 0 {
+												Text(item.name)
+													.bold()
+													.font(Font.headline)
+											}
+											Text("\(self.dateFormatter.string(from: item.startTime))")
+											if item.source == ActivitySummary.Source.healthkit {
+												Text("HealthKit")
+													.bold()
+													.foregroundColor(.gray)
+													.font(Font.subheadline)
+											}
 										}
-										Text("\(self.dateFormatter.string(from: item.startTime))")
-										if item.source == ActivitySummary.Source.healthkit {
-											Text("HealthKit")
-												.bold()
-												.foregroundColor(.gray)
-												.font(Font.subheadline)
+										.onAppear() {
+											item.requestMetadata()
+											self.displayedDates.insert(item.startTime)
+										}
+										.onDisappear {
+											self.displayedDates.remove(item.startTime)
 										}
-									}
-									.onAppear() {
-										item.requestMetadata()
-										self.displayedDates.insert(item.startTime)
-									}
-									.onDisappear {
-										self.displayedDates.remove(item.startTime)
 									}
 								}
 							}
+							.onDelete(perform: delete)
 						}
 						.listStyle(.plain)
 						.gesture(