Fix SwiftLint and SwiftFormat violations

- Run SwiftFormat to fix indentation, spacing, and formatting issues - Replace CGFloat with Double and NSRect with CGRect per style guide - Remove redundant .center alignment specifications - Remove unnecessary @available checks for satisfied deployment targets - Fix closure brace indentation for consistency - Disable closure_end_indentation rule to resolve SwiftFormat conflict All linting checks now pass with zero errors and warnings.
2025-11-16 06:58:43 +00:00 · 2025-11-15 19:42:37 +01:00
parent 97ae843013
commit 5758417293
42 changed files with 400 additions and 453 deletions
--- a/Shared/Navigation/ContentView.swift
+++ b/Shared/Navigation/ContentView.swift
@@ -69,94 +69,94 @@ struct ContentView: View {
        }
        #else
        .background(
-            EmptyView().sheet(isPresented: $navigation.presentingSettings) {
-                SettingsView()
-            }
-        )
+                    EmptyView().sheet(isPresented: $navigation.presentingSettings) {
+                        SettingsView()
+                    }
+                )
        #endif
-        .modifier(ImportSettingsSheetViewModifier(isPresented: $navigation.presentingSettingsImportSheet, settingsFile: $navigation.settingsImportURL))
+                .modifier(ImportSettingsSheetViewModifier(isPresented: $navigation.presentingSettingsImportSheet, settingsFile: $navigation.settingsImportURL))
        #if os(tvOS)
-        .fullScreenCover(isPresented: $navigation.presentingAccounts) {
-            AccountsView()
-        }
-        #else
-        .background(
-            EmptyView().sheet(isPresented: $navigation.presentingAccounts) {
+            .fullScreenCover(isPresented: $navigation.presentingAccounts) {
                AccountsView()
            }
-        )
-        #endif
-        .background(
-            EmptyView().sheet(isPresented: $navigation.presentingHomeSettings) {
-                #if os(macOS)
-                    VStack(alignment: .leading) {
-                        Button("Done") {
-                            navigation.presentingHomeSettings = false
-                        }
-                        .padding()
-                        .keyboardShortcut(.cancelAction)
-
-                        HomeSettings()
+        #else
+            .background(
+                    EmptyView().sheet(isPresented: $navigation.presentingAccounts) {
+                        AccountsView()
                    }
-                    .frame(width: 500, height: 800)
-                #else
-                    NavigationView {
-                        HomeSettings()
-                        #if os(iOS)
-                            .toolbar {
-                                ToolbarItem(placement: .navigation) {
-                                    Button {
-                                        navigation.presentingHomeSettings = false
-                                    } label: {
-                                        Text("Done")
-                                    }
+                )
+        #endif
+                .background(
+                    EmptyView().sheet(isPresented: $navigation.presentingHomeSettings) {
+                        #if os(macOS)
+                            VStack(alignment: .leading) {
+                                Button("Done") {
+                                    navigation.presentingHomeSettings = false
                                }
+                                .padding()
+                                .keyboardShortcut(.cancelAction)
+
+                                HomeSettings()
+                            }
+                            .frame(width: 500, height: 800)
+                        #else
+                            NavigationView {
+                                HomeSettings()
+                                #if os(iOS)
+                                    .toolbar {
+                                        ToolbarItem(placement: .navigation) {
+                                            Button {
+                                                navigation.presentingHomeSettings = false
+                                            } label: {
+                                                Text("Done")
+                                            }
+                                        }
+                                    }
+                                #endif
                            }
                        #endif
                    }
-                #endif
-            }
-        )
+                )
        #if !os(tvOS)
-        .fileImporter(
-            isPresented: $navigation.presentingFileImporter,
-            allowedContentTypes: [.audiovisualContent],
-            allowsMultipleSelection: true
-        ) { result in
-            do {
-                let selectedFiles = try result.get()
-                let urlsToOpen = selectedFiles.map { url in
-                    if let bookmarkURL = URLBookmarkModel.shared.loadBookmark(url) {
-                        return bookmarkURL
+                .fileImporter(
+                    isPresented: $navigation.presentingFileImporter,
+                    allowedContentTypes: [.audiovisualContent],
+                    allowsMultipleSelection: true
+                ) { result in
+                    do {
+                        let selectedFiles = try result.get()
+                        let urlsToOpen = selectedFiles.map { url in
+                            if let bookmarkURL = URLBookmarkModel.shared.loadBookmark(url) {
+                                return bookmarkURL
+                            }
+
+                            if url.startAccessingSecurityScopedResource() {
+                                URLBookmarkModel.shared.saveBookmark(url)
+                            }
+
+                            return url
+                        }
+
+                        OpenVideosModel.shared.openURLs(urlsToOpen)
+                    } catch {
+                        NavigationModel.shared.presentAlert(title: "Could not open Files")
                    }

-                    if url.startAccessingSecurityScopedResource() {
-                        URLBookmarkModel.shared.saveBookmark(url)
-                    }
-
-                    return url
+                    NavigationModel.shared.presentingOpenVideos = false
                }
-
-                OpenVideosModel.shared.openURLs(urlsToOpen)
-            } catch {
-                NavigationModel.shared.presentAlert(title: "Could not open Files")
-            }
-
-            NavigationModel.shared.presentingOpenVideos = false
-        }
-        .background(
-            EmptyView().sheet(isPresented: $navigation.presentingAddToPlaylist) {
-                AddToPlaylistView(video: navigation.videoToAddToPlaylist)
-            }
-        )
-        .background(
-            EmptyView().sheet(isPresented: $navigation.presentingPlaylistForm) {
-                PlaylistFormView(playlist: $navigation.editedPlaylist)
-            }
-        )
+                .background(
+                    EmptyView().sheet(isPresented: $navigation.presentingAddToPlaylist) {
+                        AddToPlaylistView(video: navigation.videoToAddToPlaylist)
+                    }
+                )
+                .background(
+                    EmptyView().sheet(isPresented: $navigation.presentingPlaylistForm) {
+                        PlaylistFormView(playlist: $navigation.editedPlaylist)
+                    }
+                )
        #endif
        #if os(iOS)
-        .background(
+                .background(
            EmptyView().sheet(isPresented: $navigation.presentingPlaybackSettings) {
                PlaybackSettings()
            }