Skip to content

feat(ui): redesign restart flow as side-by-side dashboard (v1.5.0) #30

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

Closed
ProduktEntdecker wants to merge 1 commit into from
Closed

feat(ui): redesign restart flow as side-by-side dashboard (v1.5.0) #30

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
4 changes: 2 additions & 2 deletions App/Resources/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.1</string>
<string>1.5.0</string>
<key>CFBundleVersion</key>
<string>5</string>
<string>6</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
Expand Down
81 changes: 16 additions & 65 deletions App/Sources/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ struct ContentView: View {
@StateObject private var touchBarManager = TouchBarManager()
@StateObject private var restartProgress = RestartProgress()
@State private var flowState: ContentViewFlowState = .idle
@State private var showingRestartOptions = false
@State private var showingAlert = false
@State private var alertMessage = ""
@State private var alertTitle = "Touch Bar Restart"
Expand All @@ -29,17 +28,21 @@ struct ContentView: View {
}

var body: some View {
ZStack {
mainContentView

// Overlay for progress view during restart
if case .restarting = flowState {
progressOverlay
}

// Overlay for restart options on partial failure
if showingRestartOptions {
optionsOverlay
Group {
if flowState == .idle {
mainContentView
} else {
// Dashboard view for all non-idle states
TouchBarDashboardView(
progress: restartProgress,
flowState: flowState,
onGrantAdmin: handleGrantAdmin,
onRestartComputer: handleRestartComputer,
onCancel: { resetToIdle() },
onDone: { quitApp() },
onTryAgain: { restartTouchBar() },
onShare: { shareSuccess() }
)
}
}
.alert(alertTitle, isPresented: $showingAlert) {
Expand Down Expand Up @@ -173,49 +176,6 @@ struct ContentView: View {
.background(Color.white)
}

// MARK: - Overlay Views

private var progressOverlay: some View {
ZStack {
Color.black.opacity(0.4)
.ignoresSafeArea()

RestartProgressView(
progress: restartProgress,
onComplete: { state in
handleProgressComplete(state)
},
onDismiss: {
resetToIdle()
}
)
}
.transition(.opacity)
}

private var optionsOverlay: some View {
ZStack {
Color.black.opacity(0.4)
.ignoresSafeArea()

RestartOptionsView(
onGrantAdmin: {
handleGrantAdmin()
},
onRestartComputer: {
handleRestartComputer()
},
onCancel: {
showingRestartOptions = false
resetToIdle()
}
)
.cornerRadius(16)
.shadow(color: .black.opacity(0.2), radius: 20, x: 0, y: 10)
}
.transition(.opacity)
}

// MARK: - Computed Properties for UI State

private var subtitleText: String {
Expand Down Expand Up @@ -322,9 +282,8 @@ struct ContentView: View {
switch result {
case .success(let touchBarResult):
if touchBarResult.needsAdmin {
// Partial failure - show options dialog
// Partial failure - dashboard will show admin options
flowState = .partialFailure(needsAdmin: true)
showingRestartOptions = true
} else if touchBarResult.overallSuccess {
// Full success
flowState = .success(usedAdmin: false)
Expand Down Expand Up @@ -385,9 +344,6 @@ struct ContentView: View {
flowState = .success(usedAdmin: false)
case .partialFailure(let needsAdmin):
flowState = .partialFailure(needsAdmin: needsAdmin)
if needsAdmin {
showingRestartOptions = true
}
case .failure(let message):
flowState = .failure(message)
default:
Expand All @@ -396,7 +352,6 @@ struct ContentView: View {
}

private func handleGrantAdmin() {
showingRestartOptions = false
flowState = .restarting

// Reset progress for admin restart
Expand All @@ -418,7 +373,6 @@ struct ContentView: View {
if case .userCancelled = error {
// User cancelled - go back to partial failure state
flowState = .partialFailure(needsAdmin: true)
showingRestartOptions = true
} else {
flowState = .failure(error.localizedDescription)
restartProgress.overallState = .failure(error.localizedDescription)
Expand All @@ -429,8 +383,6 @@ struct ContentView: View {
}

private func handleRestartComputer() {
showingRestartOptions = false

// Use AppleScript to trigger system restart
let script = """
tell application "System Events"
Expand All @@ -453,7 +405,6 @@ struct ContentView: View {
private func resetToIdle() {
flowState = .idle
restartProgress.reset()
showingRestartOptions = false
}

private func showSuccessAlert(usedAdmin: Bool) {
Expand Down
Loading