Skip to content

Reorganize toolbars #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
austin-smith merged 1 commit into from
Jul 13, 2026
Merged

Reorganize toolbars #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ComputerSolitaire/Feedback/HapticManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ final class HapticManager {
case invalidDrop
case undoMove
case settingsSelection
case autoFinishStart
case gameWon
}

private(set) var trigger: UInt64 = 0
Expand Down Expand Up @@ -55,6 +57,10 @@ private extension HapticManager.Event {
return .error
case .settingsSelection:
return .impact
case .autoFinishStart:
return .impact
case .gameWon:
return .success
}
}
}
130 changes: 81 additions & 49 deletions ComputerSolitaire/Views/Shared/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,27 +231,59 @@ struct ContentView: View {
view
.toolbar {
#if os(iOS)
ToolbarItemGroup(placement: .bottomBar) {
ToolbarItem(placement: .bottomBar) {
Menu {
Button("New Game", systemImage: "plus") {
startNewGameFromUI()
Section {
Button("New Game", systemImage: "plus") {
startNewGameFromUI()
}
Button("Redeal", systemImage: "arrow.clockwise") {
redealFromUI()
}
.disabled(!viewModel.canRedeal)
}
Button("Redeal", systemImage: "arrow.clockwise") {
redealFromUI()
Section {
Button("Statistics", systemImage: "chart.bar") {
isShowingStats = true
}
Button("Rules & Scoring", systemImage: "book") {
presentRulesAndScoring(initialSection: .rules)
}
}
.disabled(!viewModel.canRedeal)
Button("Auto Finish", systemImage: "bolt") {
Section {
Button("Settings", systemImage: "gearshape") {
isShowingSettings = true
}
}
} label: {
Label("More", systemImage: "ellipsis")
}
}
ToolbarSpacer(.flexible, placement: .bottomBar)
if viewModel.isAutoFinishAvailable {
ToolbarItem(placement: .bottomBar) {
Button {
startAutoFinish()
} label: {
// The bottom bar renders Labels icon-only.
HStack(spacing: 5) {
Image(systemName: "bolt")
Text("Auto")
}
}
.accessibilityLabel("Auto Finish")
.disabled(isAutoFinishDisabled)
if isHintButtonVisible {
Button("Hint", systemImage: "lightbulb") {
triggerHint()
}
.disabled(isHintDisabled)
}
ToolbarSpacer(.fixed, placement: .bottomBar)
}
ToolbarItemGroup(placement: .bottomBar) {
if isHintButtonVisible {
Button {
triggerHint()
} label: {
Label("Hint", systemImage: "lightbulb")
}
} label: {
Label("Game", systemImage: "ellipsis.circle")
.disabled(isHintDisabled)
}
Button {
stopAutoFinish()
Expand All @@ -260,39 +292,26 @@ struct ContentView: View {
Label("Undo", systemImage: "arrow.uturn.backward")
}
.disabled(isUndoDisabled)
Spacer(minLength: 0)
Button {
isShowingStats = true
} label: {
Label("Statistics", systemImage: "chart.bar")
}
Button {
isShowingSettings = true
} label: {
Label("Settings", systemImage: "gearshape")
}
}
#endif
#if os(macOS)
ToolbarSpacer(.flexible)
ToolbarItemGroup(placement: .primaryAction) {
Button {
startNewGameFromUI()
} label: {
Label("New Game", systemImage: "plus")
}
.labelStyle(.iconOnly)
.help("New Game")
Button {
redealFromUI()
} label: {
Label("Redeal", systemImage: "arrow.clockwise")
if viewModel.isAutoFinishAvailable {
ToolbarItem(placement: .primaryAction) {
Button {
startAutoFinish()
} label: {
HStack(spacing: 5) {
Image(systemName: "bolt")
Text("Auto")
}
}
.accessibilityLabel("Auto Finish")
.help("Auto Finish")
.disabled(isAutoFinishDisabled)
}
.labelStyle(.iconOnly)
.help("Redeal")
.disabled(!viewModel.canRedeal)
ToolbarSpacer(.fixed)
}
ToolbarSpacer(.fixed)
ToolbarItemGroup(placement: .primaryAction) {
Button {
stopAutoFinish()
Expand All @@ -303,14 +322,6 @@ struct ContentView: View {
.labelStyle(.iconOnly)
.help("Undo")
.disabled(isUndoDisabled)
Button {
startAutoFinish()
} label: {
Label("Auto Finish", systemImage: "bolt")
}
.labelStyle(.iconOnly)
.help("Auto Finish")
.disabled(isAutoFinishDisabled)
if isHintButtonVisible {
Button {
triggerHint()
Expand All @@ -321,6 +332,25 @@ struct ContentView: View {
.help("Hint")
.disabled(isHintDisabled)
}
}
ToolbarSpacer(.fixed)
ToolbarItem(placement: .primaryAction) {
Menu {
Button("New Game", systemImage: "plus") {
startNewGameFromUI()
}
Button("Redeal", systemImage: "arrow.clockwise") {
redealFromUI()
}
.disabled(!viewModel.canRedeal)
} label: {
Label("New Game", systemImage: "plus")
}
.labelStyle(.iconOnly)
.help("New Game or Redeal")
}
ToolbarSpacer(.fixed)
ToolbarItemGroup(placement: .primaryAction) {
Button {
isShowingStats = true
} label: {
Expand Down Expand Up @@ -683,6 +713,7 @@ struct ContentView: View {
.onChange(of: viewModel.isWin) { _, isWin in
guard !isHydratingGame else { return }
if isWin {
HapticManager.shared.play(.gameWon)
winCelebration.beginIfNeededForWin(
launchPiles: winCascadeLaunchPiles,
launchTargets: winCascadeLaunchTargets,
Expand Down Expand Up @@ -1040,6 +1071,7 @@ struct ContentView: View {

private func startAutoFinish() {
guard !isAutoFinishDisabled else { return }
HapticManager.shared.play(.autoFinishStart)
isAutoFinishing = true
queueAutoFinishStepIfPossible()
}
Expand Down