From 69cce8d4768314218088526f2d3ec6d16f05f265 Mon Sep 17 00:00:00 2001
From: Beingpax <prakashjoshipaxtek@gmail.com>
Date: Wed, 11 Jun 2025 17:48:43 +0545
Subject: [PATCH] Fix onboarding window and improve permissions

---
 .../OnboardingPermissionsView.swift           | 55 +++++++++++++++----
 VoiceInk/WindowManager.swift                  |  2 +-
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/VoiceInk/Views/Onboarding/OnboardingPermissionsView.swift b/VoiceInk/Views/Onboarding/OnboardingPermissionsView.swift
index 6e5e87c..ce297b7 100644
--- a/VoiceInk/Views/Onboarding/OnboardingPermissionsView.swift
+++ b/VoiceInk/Views/Onboarding/OnboardingPermissionsView.swift
@@ -150,7 +150,7 @@ struct OnboardingPermissionsView: View {
                                         Picker("Select Microphone", selection: Binding(
                                             get: { 
                                                 audioDeviceManager.selectedDeviceID ?? 
-                                                (audioDeviceManager.availableDevices.first?.id ?? 0)
+                                                audioDeviceManager.availableDevices.first?.id ?? 0
                                             },
                                             set: { newValue in
                                                 audioDeviceManager.selectDevice(id: newValue)
@@ -171,6 +171,24 @@ struct OnboardingPermissionsView: View {
                                         .padding(8)
                                         .background(Color.white.opacity(0.1))
                                         .cornerRadius(8)
+                                        .onAppear {
+                                            // Auto-select built-in microphone if no device is selected
+                                            if audioDeviceManager.selectedDeviceID == nil && !audioDeviceManager.availableDevices.isEmpty {
+                                                let builtInDevice = audioDeviceManager.availableDevices.first { device in
+                                                    device.name.lowercased().contains("built-in") || 
+                                                    device.name.lowercased().contains("internal")
+                                                }
+                                                let deviceToSelect = builtInDevice ?? audioDeviceManager.availableDevices.first
+                                                if let device = deviceToSelect {
+                                                    audioDeviceManager.selectDevice(id: device.id)
+                                                    audioDeviceManager.selectInputMode(.custom)
+                                                    withAnimation {
+                                                        permissionStates[currentPermissionIndex] = true
+                                                        showAnimation = true
+                                                    }
+                                                }
+                                            }
+                                        }
                                     }
                                     
                                     Text("For best results, using your Mac's built-in microphone is recommended.")
@@ -276,8 +294,8 @@ struct OnboardingPermissionsView: View {
         // Check microphone permission
         permissionStates[0] = AVCaptureDevice.authorizationStatus(for: .audio) == .authorized
         
-        // Check if device is selected
-        permissionStates[1] = audioDeviceManager.selectedDeviceID != nil
+        // Check if device is selected or system default mode is being used
+        permissionStates[1] = audioDeviceManager.selectedDeviceID != nil || audioDeviceManager.inputMode == .systemDefault
         
         // Check accessibility permission
         permissionStates[2] = AXIsProcessTrusted()
@@ -299,18 +317,21 @@ struct OnboardingPermissionsView: View {
         case .microphone:
             AVCaptureDevice.requestAccess(for: .audio) { granted in
                 DispatchQueue.main.async {
-                    permissionStates[currentPermissionIndex] = granted
+                    self.permissionStates[self.currentPermissionIndex] = granted
                     if granted {
                         withAnimation {
-                            showAnimation = true
+                            self.showAnimation = true
                         }
+                        self.audioDeviceManager.loadAvailableDevices()
                     }
                 }
             }
             
         case .audioDeviceSelection:
-            // If no device is selected, select the fallback device
+            audioDeviceManager.loadAvailableDevices()
+            
             if audioDeviceManager.availableDevices.isEmpty {
+                audioDeviceManager.selectInputMode(.systemDefault)
                 withAnimation {
                     permissionStates[currentPermissionIndex] = true
                     showAnimation = true
@@ -319,9 +340,17 @@ struct OnboardingPermissionsView: View {
                 return
             }
             
+            // If no device is selected yet, auto-select the built-in microphone or first available device
             if audioDeviceManager.selectedDeviceID == nil {
-                if let firstDevice = audioDeviceManager.availableDevices.first {
-                    audioDeviceManager.selectDevice(id: firstDevice.id)
+                let builtInDevice = audioDeviceManager.availableDevices.first { device in
+                    device.name.lowercased().contains("built-in") || 
+                    device.name.lowercased().contains("internal")
+                }
+                
+                let deviceToSelect = builtInDevice ?? audioDeviceManager.availableDevices.first
+                
+                if let device = deviceToSelect {
+                    audioDeviceManager.selectDevice(id: device.id)
                     audioDeviceManager.selectInputMode(.custom)
                     withAnimation {
                         permissionStates[currentPermissionIndex] = true
@@ -347,9 +376,13 @@ struct OnboardingPermissionsView: View {
             }
             
         case .screenRecording:
-            // Launch system preferences for screen recording
-            let prefpaneURL = URL(string: "x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenCapture")!
-            NSWorkspace.shared.open(prefpaneURL)
+            // First try to request permission programmatically
+            CGRequestScreenCaptureAccess()
+            
+            // Also open system preferences as fallback
+            if let prefpaneURL = URL(string: "x-apple.systempreferences:com.apple.preference.security?Privacy_ScreenCapture") {
+                NSWorkspace.shared.open(prefpaneURL)
+            }
             
             // Start checking for permission status
             Timer.scheduledTimer(withTimeInterval: 0.5, repeats: true) { timer in
diff --git a/VoiceInk/WindowManager.swift b/VoiceInk/WindowManager.swift
index 2719b86..de17ad5 100644
--- a/VoiceInk/WindowManager.swift
+++ b/VoiceInk/WindowManager.swift
@@ -24,7 +24,7 @@ class WindowManager {
     func configureOnboardingPanel(_ window: NSWindow) {
         window.styleMask = [.borderless, .fullSizeContentView, .resizable]
         window.isMovableByWindowBackground = true
-        window.level = .floating
+        window.level = .normal
         window.titlebarAppearsTransparent = true
         window.titleVisibility = .hidden
         window.backgroundColor = .clear