relocating files

rawandahmad698 · rawandahmad698 · commit 6293d6e9913d · 2025-08-05T23:54:14.000+03:00
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -11,6 +11,7 @@ jobs:
   lint:
     name: SwiftLint
     runs-on: macos-15
+    if: github.event.pull_request.draft == false
     
     steps:
     - name: Checkout code
@@ -27,6 +28,7 @@ jobs:
   build:
     name: Build
     runs-on: macos-15
+    if: github.event.pull_request.draft == false
     
     steps:
     - name: Checkout code
@@ -75,6 +77,7 @@ jobs:
     name: Test
     runs-on: macos-15
     needs: build
+    if: github.event.pull_request.draft == false
     
     steps:
     - name: Checkout code
diff --git a/.github/workflows/pr-tests.yml b/.github/workflows/pr-tests.yml
@@ -12,6 +12,7 @@ jobs:
   test:
     name: Test PR
     runs-on: macos-15
+    if: github.event.pull_request.draft == false
     
     steps:
     - name: Checkout code
diff --git a/Recap/Audio/Processing/AudioRecordingCoordinator/AudioRecordingCoordinator.swift b/Recap/Audio/Processing/AudioRecordingCoordinator/AudioRecordingCoordinator.swift
@@ -6,15 +6,15 @@ final class AudioRecordingCoordinator: AudioRecordingCoordinatorType {
     private let logger = Logger(subsystem: AppConstants.Logging.subsystem, category: String(describing: AudioRecordingCoordinator.self))
     
     private let configuration: RecordingConfiguration
-    private let microphoneCapture: MicrophoneCapture?
+    private let microphoneCapture: MicrophoneCaptureType?
     private let processTap: ProcessTap
     
     private var isRunning = false
     private var tapRecorder: ProcessTapRecorder?
     
     init(
         configuration: RecordingConfiguration,
-        microphoneCapture: MicrophoneCapture?,
+        microphoneCapture: MicrophoneCaptureType?,
         processTap: ProcessTap
     ) {
         self.configuration = configuration
diff --git a/Recap/Audio/Processing/Session/RecordingSessionManager.swift b/Recap/Audio/Processing/Session/RecordingSessionManager.swift
@@ -7,10 +7,10 @@ protocol RecordingSessionManaging {
 
 final class RecordingSessionManager: RecordingSessionManaging {
     private let logger = Logger(subsystem: AppConstants.Logging.subsystem, category: String(describing: RecordingSessionManager.self))
-    private let microphoneCapture: MicrophoneCapture
+    private let microphoneCapture: MicrophoneCaptureType
     private let permissionsHelper: PermissionsHelperType
     
-    init(microphoneCapture: MicrophoneCapture, permissionsHelper: PermissionsHelperType) {
+    init(microphoneCapture: MicrophoneCaptureType, permissionsHelper: PermissionsHelperType) {
         self.microphoneCapture = microphoneCapture
         self.permissionsHelper = permissionsHelper
     }
diff --git a/Recap/DependencyContainer/DependencyContainer+Coordinators.swift b/Recap/DependencyContainer/DependencyContainer+Coordinators.swift
diff --git a/Recap/DependencyContainer/DependencyContainer+Helpers.swift b/Recap/DependencyContainer/DependencyContainer+Helpers.swift
@@ -5,4 +5,4 @@ extension DependencyContainer {
     func makePermissionsHelper() -> PermissionsHelperType {
         PermissionsHelper()
     }
-}
+}
diff --git a/Recap/DependencyContainer/DependencyContainer+Managers.swift b/Recap/DependencyContainer/DependencyContainer+Managers.swift
diff --git a/Recap/DependencyContainer/DependencyContainer+Repositories.swift b/Recap/DependencyContainer/DependencyContainer+Repositories.swift
@@ -17,4 +17,4 @@ extension DependencyContainer {
     func makeUserPreferencesRepository() -> UserPreferencesRepositoryType {
         UserPreferencesRepository(coreDataManager: coreDataManager)
     }
-}
+}
diff --git a/Recap/DependencyContainer/DependencyContainer+Services.swift b/Recap/DependencyContainer/DependencyContainer+Services.swift
@@ -17,7 +17,7 @@ extension DependencyContainer {
         TranscriptionService(whisperModelRepository: whisperModelRepository)
     }
     
-    func makeMeetingDetectionService() -> MeetingDetectionServiceType {
+    func makeMeetingDetectionService() -> any MeetingDetectionServiceType {
         MeetingDetectionService(audioProcessController: audioProcessController)
     }
     
@@ -26,17 +26,15 @@ extension DependencyContainer {
     }
     
     func makeRecordingSessionManager() -> RecordingSessionManaging {
-        guard let micCapture = microphoneCapture as? MicrophoneCapture else {
-            fatalError("microphoneCapture is not of type MicrophoneCapture")
-        }
-        return RecordingSessionManager(microphoneCapture: micCapture, permissionsHelper: makePermissionsHelper())
+        RecordingSessionManager(microphoneCapture: microphoneCapture,
+                                       permissionsHelper: makePermissionsHelper())
     }
     
-    func makeMicrophoneCapture() -> MicrophoneCaptureType {
+    func makeMicrophoneCapture() -> any MicrophoneCaptureType {
         MicrophoneCapture()
     }
     
     func makeNotificationService() -> NotificationServiceType {
         NotificationService()
     }
-}
+}
diff --git a/Recap/DependencyContainer/DependencyContainer+ViewModels.swift b/Recap/DependencyContainer/DependencyContainer+ViewModels.swift
diff --git a/Recap/DependencyContainer/DependencyContainer.swift b/Recap/DependencyContainer/DependencyContainer.swift
@@ -20,6 +20,9 @@ final class DependencyContainer {
     lazy var processingCoordinator: ProcessingCoordinator = makeProcessingCoordinator()
     lazy var recordingFileManager: RecordingFileManaging = makeRecordingFileManager()
     lazy var generalSettingsViewModel: GeneralSettingsViewModel = makeGeneralSettingsViewModel()
+    lazy var recapViewModel: RecapViewModel = createRecapViewModel()
+    lazy var onboardingViewModel: OnboardingViewModel = makeOnboardingViewModel()
+    lazy var summaryViewModel: SummaryViewModel = createSummaryViewModel()
     lazy var transcriptionService: TranscriptionServiceType = makeTranscriptionService()
     lazy var warningManager: any WarningManagerType = makeWarningManager()
     lazy var providerWarningCoordinator: ProviderWarningCoordinator = makeProviderWarningCoordinator()
@@ -46,7 +49,12 @@ final class DependencyContainer {
             audioProcessController: audioProcessController,
             appSelectionViewModel: appSelectionViewModel,
             previousRecapsViewModel: previousRecapsViewModel,
-            dependencyContainer: self
+            recapViewModel: recapViewModel,
+            onboardingViewModel: onboardingViewModel,
+            summaryViewModel: summaryViewModel,
+            generalSettingsViewModel: generalSettingsViewModel,
+            userPreferencesRepository: userPreferencesRepository,
+            meetingDetectionService: meetingDetectionService
         )
     }
     
diff --git a/Recap/Helpers/Permissions/PermissionsHelperType.swift b/Recap/Helpers/Permissions/PermissionsHelperType.swift
@@ -15,4 +15,4 @@ protocol PermissionsHelperType: AnyObject {
     func checkMicrophonePermissionStatus() -> AVAuthorizationStatus
     func checkNotificationPermissionStatus() async -> Bool
     func checkScreenRecordingPermission() -> Bool
-}
+}
diff --git a/Recap/MenuBar/Manager/MenuBarPanelManager+Delegates.swift b/Recap/MenuBar/Manager/MenuBarPanelManager+Delegates.swift
@@ -38,4 +38,4 @@ extension MenuBarPanelManager: OnboardingDelegate {
             }
         }
     }
-}
+}
diff --git a/Recap/MenuBar/Manager/MenuBarPanelManager+Onboarding.swift b/Recap/MenuBar/Manager/MenuBarPanelManager+Onboarding.swift
@@ -4,9 +4,8 @@ import AppKit
 extension MenuBarPanelManager {
     @MainActor
     func createOnboardingPanel() -> SlidingPanel {
-        let onboardingViewModel = dependencyContainer.makeOnboardingViewModel()
         onboardingViewModel.delegate = self
-        let contentView = OnboardingView<OnboardingViewModel>(viewModel: onboardingViewModel)
+        let contentView = OnboardingView(viewModel: onboardingViewModel)
         let hostingController = NSHostingController(rootView: contentView)
         hostingController.view.wantsLayer = true
         hostingController.view.layer?.cornerRadius = 12
diff --git a/Recap/MenuBar/Manager/MenuBarPanelManager+PreviousRecaps.swift b/Recap/MenuBar/Manager/MenuBarPanelManager+PreviousRecaps.swift
@@ -10,11 +10,9 @@ extension MenuBarPanelManager {
         guard let statusButton = statusBarManager.statusButton,
               let windowManager = previousRecapsWindowManager else { return }
         
-        let viewModel = previousRecapsViewModel
-        
         windowManager.showRecapsWindow(
             relativeTo: statusButton,
-            viewModel: viewModel,
+            viewModel: previousRecapsViewModel,
             onRecordingSelected: { [weak self] recording in
                 self?.handleRecordingSelection(recording)
             },
diff --git a/Recap/MenuBar/Manager/MenuBarPanelManager+Settings.swift b/Recap/MenuBar/Manager/MenuBarPanelManager+Settings.swift
@@ -3,12 +3,11 @@ import AppKit
 
 extension MenuBarPanelManager {
     func createSettingsPanel() -> SlidingPanel? {
-        let generalSettingsViewModel = dependencyContainer.createGeneralSettingsViewModel()
-        let contentView = SettingsView<GeneralSettingsViewModel>(
+        let contentView = SettingsView(
             whisperModelsViewModel: whisperModelsViewModel,
             generalSettingsViewModel: generalSettingsViewModel,
-            meetingDetectionService: dependencyContainer.meetingDetectionService,
-            userPreferencesRepository: dependencyContainer.userPreferencesRepository
+            meetingDetectionService: meetingDetectionService,
+            userPreferencesRepository: userPreferencesRepository
         ) { [weak self] in
             self?.hideSettingsPanel()
         }
diff --git a/Recap/MenuBar/Manager/MenuBarPanelManager+Summary.swift b/Recap/MenuBar/Manager/MenuBarPanelManager+Summary.swift
@@ -7,7 +7,7 @@ extension MenuBarPanelManager {
             onClose: { [weak self] in
                 self?.hideSummaryPanel()
             },
-            viewModel: dependencyContainer.createSummaryViewModel(),
+            viewModel: summaryViewModel,
             recordingID: recordingID
         )
         let hostingController = NSHostingController(rootView: contentView)
diff --git a/Recap/MenuBar/Manager/MenuBarPanelManager.swift b/Recap/MenuBar/Manager/MenuBarPanelManager.swift
@@ -24,8 +24,12 @@ final class MenuBarPanelManager: MenuBarPanelManagerType, ObservableObject {
     let appSelectionViewModel: AppSelectionViewModel
     let previousRecapsViewModel: PreviousRecapsViewModel
     let whisperModelsViewModel: WhisperModelsViewModel
+    let recapViewModel: RecapViewModel
+    let onboardingViewModel: OnboardingViewModel
+    let summaryViewModel: SummaryViewModel
+    let generalSettingsViewModel: GeneralSettingsViewModel
     let userPreferencesRepository: UserPreferencesRepositoryType
-    let dependencyContainer: DependencyContainer
+    let meetingDetectionService: any MeetingDetectionServiceType
     
     init(
         statusBarManager: StatusBarManagerType,
@@ -34,15 +38,23 @@ final class MenuBarPanelManager: MenuBarPanelManagerType, ObservableObject {
         audioProcessController: AudioProcessController,
         appSelectionViewModel: AppSelectionViewModel,
         previousRecapsViewModel: PreviousRecapsViewModel,
+        recapViewModel: RecapViewModel,
+        onboardingViewModel: OnboardingViewModel,
+        summaryViewModel: SummaryViewModel,
+        generalSettingsViewModel: GeneralSettingsViewModel,
         userPreferencesRepository: UserPreferencesRepositoryType,
-        dependencyContainer: DependencyContainer
+        meetingDetectionService: any MeetingDetectionServiceType
     ) {
         self.statusBarManager = statusBarManager
         self.audioProcessController = audioProcessController
         self.appSelectionViewModel = appSelectionViewModel
         self.whisperModelsViewModel = whisperModelsViewModel
+        self.recapViewModel = recapViewModel
+        self.onboardingViewModel = onboardingViewModel
+        self.summaryViewModel = summaryViewModel
+        self.generalSettingsViewModel = generalSettingsViewModel
         self.userPreferencesRepository = userPreferencesRepository
-        self.dependencyContainer = dependencyContainer
+        self.meetingDetectionService = meetingDetectionService
         self.previousRecapsViewModel = previousRecapsViewModel
         setupDelegates()
     }
@@ -52,9 +64,8 @@ final class MenuBarPanelManager: MenuBarPanelManagerType, ObservableObject {
     }
     
     func createMainPanel() -> SlidingPanel {
-        let viewModel = dependencyContainer.createRecapViewModel()
-        viewModel.delegate = self
-        let contentView = RecapHomeView(viewModel: viewModel)
+        recapViewModel.delegate = self
+        let contentView = RecapHomeView(viewModel: recapViewModel)
         let hostingController = NSHostingController(rootView: contentView)
         hostingController.view.wantsLayer = true
         hostingController.view.layer?.cornerRadius = 12
diff --git a/Recap/Repositories/UserPreferences/UserPreferencesRepositoryType.swift b/Recap/Repositories/UserPreferences/UserPreferencesRepositoryType.swift
@@ -16,4 +16,4 @@ protocol UserPreferencesRepositoryType {
     func updateAutoSummarize(_ enabled: Bool) async throws
     func updateSummaryPromptTemplate(_ template: String?) async throws
     func updateOnboardingStatus(_ completed: Bool) async throws
-}
+}
diff --git a/Recap/Services/MeetingDetection/Core/MeetingDetectionServiceType.swift b/Recap/Services/MeetingDetection/Core/MeetingDetectionServiceType.swift
@@ -42,4 +42,4 @@ enum MeetingState: Equatable {
             return false
         }
     }
-}
+}
diff --git a/Recap/UseCases/Onboarding/ViewModel/OnboardingViewModelType.swift b/Recap/UseCases/Onboarding/ViewModel/OnboardingViewModelType.swift
@@ -12,7 +12,7 @@ protocol OnboardingViewModelType: ObservableObject {
     var isAutoSummarizeEnabled: Bool { get }
     var isLiveTranscriptionEnabled: Bool { get }
     var hasRequiredPermissions: Bool { get }
-    var showErrorToast: Bool { get }
+    var showErrorToast: Bool { get set }
     var errorMessage: String { get }
     var canContinue: Bool { get }
     var delegate: OnboardingDelegate? { get set }
diff --git a/Recap/UseCases/Summary/SummaryView.swift b/Recap/UseCases/Summary/SummaryView.swift
@@ -1,14 +1,14 @@
 import SwiftUI
 import MarkdownUI
 
-struct SummaryView: View {
+struct SummaryView<ViewModel: SummaryViewModelType>: View {
     let onClose: () -> Void
-    @ObservedObject var viewModel: SummaryViewModel
+    @ObservedObject var viewModel: ViewModel
     let recordingID: String?
     
     init(
         onClose: @escaping () -> Void,
-        viewModel: SummaryViewModel,
+        viewModel: ViewModel,
         recordingID: String? = nil
     ) {
         self.onClose = onClose

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,4 @@ extension DependencyContainer {`
`5`	`5`	`func makePermissionsHelper() -> PermissionsHelperType {`
`6`	`6`	`PermissionsHelper()`
`7`	`7`	`}`
`8`		`-}`
	`8`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,4 @@ extension DependencyContainer {`
`17`	`17`	`func makeUserPreferencesRepository() -> UserPreferencesRepositoryType {`
`18`	`18`	`UserPreferencesRepository(coreDataManager: coreDataManager)`
`19`	`19`	`}`
`20`		`-}`
	`20`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ extension DependencyContainer {`
`17`	`17`	`TranscriptionService(whisperModelRepository: whisperModelRepository)`
`18`	`18`	`}`
`19`	`19`
`20`		`- func makeMeetingDetectionService() -> MeetingDetectionServiceType {`
	`20`	`+ func makeMeetingDetectionService() -> any MeetingDetectionServiceType {`
`21`	`21`	`MeetingDetectionService(audioProcessController: audioProcessController)`
`22`	`22`	`}`
`23`	`23`
`@@ -26,17 +26,15 @@ extension DependencyContainer {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func makeRecordingSessionManager() -> RecordingSessionManaging {`
`29`		`- guard let micCapture = microphoneCapture as? MicrophoneCapture else {`
`30`		`- fatalError("microphoneCapture is not of type MicrophoneCapture")`
`31`		`- }`
`32`		`- return RecordingSessionManager(microphoneCapture: micCapture, permissionsHelper: makePermissionsHelper())`
	`29`	`+ RecordingSessionManager(microphoneCapture: microphoneCapture,`
	`30`	`+ permissionsHelper: makePermissionsHelper())`
`33`	`31`	`}`
`34`	`32`
`35`		`- func makeMicrophoneCapture() -> MicrophoneCaptureType {`
	`33`	`+ func makeMicrophoneCapture() -> any MicrophoneCaptureType {`
`36`	`34`	`MicrophoneCapture()`
`37`	`35`	`}`
`38`	`36`
`39`	`37`	`func makeNotificationService() -> NotificationServiceType {`
`40`	`38`	`NotificationService()`
`41`	`39`	`}`
`42`		`-}`
	`40`	`+}`