Attempt to make the watch buttons line up better on iOS18

msimms · Sep 20, 2024 · bd2f0c2 · bd2f0c2
1 parent 136330c
commit bd2f0c2
Showing 1 changed file with 37 additions and 20 deletions.
diff --git a/Watch App/ContentView.swift b/Watch App/ContentView.swift
@@ -11,32 +11,49 @@ struct ContentView: View {
 	var body: some View {
 		NavigationStack() {
 			ScrollView() {
-				// Start button
-				Button("Start") {
-					self.showingActivitySelection = true
-				}
-				.confirmationDialog("Select the workout to perform", isPresented: self.$showingActivitySelection, titleVisibility: .visible) {
-					ForEach(CommonApp.activityTypes, id: \.self) { item in
-						NavigationLink(item, destination: ActivityView(activityVM: LiveActivityVM(activityType: item, recreateOrphanedActivities: false), activityType: item))
+				Group() {
+					// Start button
+					Button(action: {
+						self.showingActivitySelection = true
+					}) {
+						HStack {
+							Text("Start")
+							Image(systemName: "play")
+						}
 					}
-				}
-
-				// History button
-				NavigationLink("History", destination: HistoryView())
-
-				// Settings and About buttons
-				HStack() {
-					NavigationLink(destination: SettingsView()) {
-						ZStack {
-							Image(systemName: "gear")
+					.confirmationDialog("Select the workout to perform", isPresented: self.$showingActivitySelection, titleVisibility: .visible) {
+						ForEach(CommonApp.activityTypes, id: \.self) { item in
+							NavigationLink(item, destination: ActivityView(activityVM: LiveActivityVM(activityType: item, recreateOrphanedActivities: false), activityType: item))
+						}
+					}
+					.frame(minWidth: 0, maxWidth: .infinity)
+
+					// History button
+					NavigationLink(destination: HistoryView()) {
+						HStack {
+							Text("History")
+							Image(systemName: "list.bullet.clipboard")
 						}
 					}
-					NavigationLink(destination: AboutView()) {
-						ZStack {
-							Image(systemName: "questionmark.circle")
+					.frame(minWidth: 0, maxWidth: .infinity)
+
+					// Settings and About buttons
+					HStack() {
+						NavigationLink(destination: SettingsView()) {
+							ZStack {
+								Image(systemName: "gear")
+							}
+						}
+						.frame(minWidth: 0, maxWidth: .infinity)
+						NavigationLink(destination: AboutView()) {
+							ZStack {
+								Image(systemName: "questionmark.circle")
+							}
 						}
+						.frame(minWidth: 0, maxWidth: .infinity)
 					}
 				}
+				.padding(.horizontal)
 
 				// iPhone connectivity status
 				Image(systemName: "iphone")