feat: simplify onboarding to 3 steps with permission UX improvements

ScreenTranslate/Features/Onboarding/OnboardingCompleteStepView.swift

@@ -2,6 +2,7 @@ import SwiftUI
 
 struct OnboardingCompleteStepView: View {
     let onStart: () -> Void
+    let hasSkippedPermissions: Bool
 
     var body: some View {
         VStack(spacing: 24) {
@@ -23,6 +24,13 @@ struct OnboardingCompleteStepView: View {
             }
 
             VStack(alignment: .leading, spacing: 12) {
+                OnboardingInfoRow(
+                    icon: "menubar.rectangle",
+                    text: NSLocalizedString("onboarding.complete.menubar.hint", comment: "")
+                )
+
+                Divider()
+
                 OnboardingInfoRow(
                     icon: "command",
                     text: NSLocalizedString("onboarding.complete.shortcuts", comment: "")
@@ -38,6 +46,19 @@ struct OnboardingCompleteStepView: View {
             }
             .padding(.vertical, 8)
 
+            if hasSkippedPermissions {
+                HStack(spacing: 8) {
+                    Image(systemName: "exclamationmark.triangle.fill")
+                        .foregroundStyle(.orange)
+                    Text(NSLocalizedString("onboarding.complete.permissions.warning", comment: ""))
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                }
+                .padding(12)
+                .background(Color(nsColor: .controlBackgroundColor))
+                .clipShape(.rect(cornerRadius: 8))
+            }
+
             Spacer()
 
             Button {

ScreenTranslate/Features/Onboarding/OnboardingComponents.swift

@@ -77,6 +77,7 @@ struct OnboardingNavigationButtons: View {
 struct OnboardingPermissionRow: View {
     let icon: String
     let title: String
+    let subtitle: String
     let isGranted: Bool
     let requestAction: () -> Void
     let openSettingsAction: () -> Void
@@ -91,6 +92,9 @@ struct OnboardingPermissionRow: View {
             VStack(alignment: .leading, spacing: 4) {
                 Text(title)
                     .font(.headline)
+                Text(subtitle)
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
                 Text(isGranted
                      ? NSLocalizedString("onboarding.permission.granted", comment: "")
                      : NSLocalizedString("onboarding.permission.not.granted", comment: ""))
@@ -106,7 +110,6 @@ struct OnboardingPermissionRow: View {
                     .font(.title2)
             } else {
                 Button {
-                    openSettingsAction()
                     requestAction()
                 } label: {
                     Text(NSLocalizedString("onboarding.permission.grant", comment: ""))

ScreenTranslate/Features/Onboarding/OnboardingPermissionsStepView.swift

@@ -6,12 +6,14 @@ struct OnboardingPermissionsStepView: View {
     let canGoPrevious: Bool
     let canGoNext: Bool
     let isLastStep: Bool
+    let permissionCheckTimedOut: Bool
     let onRequestScreenRecording: () -> Void
     let onOpenScreenRecordingSettings: () -> Void
     let onRequestAccessibility: () -> Void
     let onOpenAccessibilitySettings: () -> Void
     let onPrevious: () -> Void
     let onNext: () -> Void
+    let onSkip: () -> Void
 
     var body: some View {
         VStack(spacing: 24) {
@@ -36,6 +38,7 @@ struct OnboardingPermissionsStepView: View {
                 OnboardingPermissionRow(
                     icon: "video.fill",
                     title: NSLocalizedString("onboarding.permission.screen.recording", comment: ""),
+                    subtitle: NSLocalizedString("onboarding.permission.screen.recording.subtitle", comment: ""),
                     isGranted: hasScreenRecordingPermission,
                     requestAction: onRequestScreenRecording,
                     openSettingsAction: onOpenScreenRecordingSettings
@@ -44,25 +47,55 @@ struct OnboardingPermissionsStepView: View {
                 OnboardingPermissionRow(
                     icon: "command.square.fill",
                     title: NSLocalizedString("onboarding.permission.accessibility", comment: ""),
+                    subtitle: NSLocalizedString("onboarding.permission.accessibility.subtitle", comment: ""),
                     isGranted: hasAccessibilityPermission,
                     requestAction: onRequestAccessibility,
                     openSettingsAction: onOpenAccessibilitySettings
                 )
             }
 
+            if permissionCheckTimedOut {
+                Text(NSLocalizedString("onboarding.permissions.timeout.hint", comment: ""))
+                    .font(.caption)
+                    .foregroundStyle(.orange)
+                    .multilineTextAlignment(.center)
+            }
+
             Spacer()
 
             Text(NSLocalizedString("onboarding.permissions.hint", comment: ""))
                 .font(.caption)
                 .foregroundStyle(.secondary)
 
-            OnboardingNavigationButtons(
-                canGoPrevious: canGoPrevious,
-                canGoNext: canGoNext,
-                isLastStep: isLastStep,
-                onPrevious: onPrevious,
-                onNext: onNext
-            )
+            HStack(spacing: 16) {
+                if canGoPrevious {
+                    Button {
+                        onPrevious()
+                    } label: {
+                        Text(NSLocalizedString("onboarding.back", comment: ""))
+                    }
+                    .buttonStyle(.bordered)
+                }
+
+                Spacer()
+
+                Button {
+                    onSkip()
+                } label: {
+                    Text(NSLocalizedString("onboarding.skip.permissions", comment: ""))
+                }
+                .buttonStyle(.bordered)
+                .tint(.secondary)
+
+                if canGoNext && !isLastStep {
+                    Button {
+                        onNext()
+                    } label: {
+                        Text(NSLocalizedString("onboarding.continue", comment: ""))
+                    }
+                    .buttonStyle(.borderedProminent)
+                }
+            }
         }
         .padding(32)
     }

ScreenTranslate/Features/Onboarding/OnboardingView.swift

@@ -28,17 +28,20 @@ struct OnboardingView: View {
                         canGoPrevious: viewModel.canGoPrevious,
                         canGoNext: viewModel.canGoNext,
                         isLastStep: viewModel.isLastStep,
+                        permissionCheckTimedOut: viewModel.permissionCheckTimedOut,
                         onRequestScreenRecording: { viewModel.requestScreenRecordingPermission() },
                         onOpenScreenRecordingSettings: { viewModel.openScreenRecordingSettings() },
                         onRequestAccessibility: { viewModel.requestAccessibilityPermission() },
                         onOpenAccessibilitySettings: { viewModel.openAccessibilitySettings() },
                         onPrevious: { viewModel.goToPreviousStep() },
-                        onNext: { viewModel.goToNextStep() }
+                        onNext: { viewModel.goToNextStep() },
+                        onSkip: { viewModel.skipPermissions() }
                     )
                 case 2:
-                    OnboardingConfigurationStepView(viewModel: viewModel)
-                case 3:
-                    OnboardingCompleteStepView(onStart: { viewModel.goToNextStep() })
+                    OnboardingCompleteStepView(
+                        onStart: { viewModel.goToNextStep() },
+                        hasSkippedPermissions: viewModel.hasSkippedPermissions
+                    )
                 default:
                     OnboardingWelcomeStepView(
                         onContinue: { viewModel.goToNextStep() },
@@ -48,7 +51,7 @@ struct OnboardingView: View {
             }
             .frame(maxWidth: .infinity, maxHeight: .infinity)
         }
-        .frame(width: 600, height: 620)
+        .frame(width: 600, height: 580)
         .onReceive(NotificationCenter.default.publisher(for: .onboardingCompleted)) { _ in
             dismiss()
         }