chore: use official swift-format

.github/workflows/lint.yml

@@ -14,35 +14,28 @@ on:
   pull_request:
     branches:
       - main
-  push:
-    branches:
-      - main
 
 jobs:
-  swiftlint:
-    runs-on: ubuntu-latest
-    container:
-      image: swift:5.10-noble
+  lint:
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set Up swiftlint
-        run: |
-          sudo apt-get update && sudo apt-get install -y unzip curl
-          unzip ci/swiftlint.zip -d /usr/local/bin/
-          chmod +x /usr/local/bin/swiftlint
-      - name: Lint Using swiftlint
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Set Up SwiftLint
+        run: brew install swiftlint
+
+      - name: Lint Using SwiftLint
         run: swiftlint lint --strict .
 
-  swiftformat:
-    runs-on: ubuntu-latest
-    container:
-      image: swift:5.10-noble
+  format:
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Set Up swiftformat
-        run: |
-          sudo apt-get update && sudo apt-get install -y unzip curl
-          unzip ci/swiftformat.zip -d /usr/local/bin/
-          chmod +x /usr/local/bin/swiftformat
-      - name: Lint Using swiftformat
-        run: swiftformat --lint .
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Set Up swift-format
+        run: brew install swift-format
+
+      - name: Lint Using swift-format
+        run: swift format lint -r .

.swift-format

@@ -0,0 +1,6 @@
+{
+  "version": 1,
+  "indentation": {
+    "spaces": 4
+  }
+}

Sources/Helpers/Color+Hex.swift

@@ -15,12 +15,18 @@ extension Color {
         let hex = hex.trimmingCharacters(in: .alphanumerics.inverted)
         var int = UInt64()
         Scanner(string: hex).scanHexInt64(&int)
-        let red, green, blue: Double
+        let red: Double
+        let green: Double
+        let blue: Double
         switch hex.count {
-        case 6: // RGB (24-bit)
-            (red, green, blue) = (Double((int >> 16) & 0xFF), Double((int >> 8) & 0xFF), Double(int & 0xFF))
-        case 8: // ARGB (32-bit)
-            (red, green, blue) = (Double((int >> 16) & 0xFF), Double((int >> 8) & 0xFF), Double(int & 0xFF))
+        case 6:  // RGB (24-bit)
+            (red, green, blue) = (
+                Double((int >> 16) & 0xFF), Double((int >> 8) & 0xFF), Double(int & 0xFF)
+            )
+        case 8:  // ARGB (32-bit)
+            (red, green, blue) = (
+                Double((int >> 16) & 0xFF), Double((int >> 8) & 0xFF), Double(int & 0xFF)
+            )
         default:
             (red, green, blue) = (0, 0, 0)
         }

Sources/Helpers/Fake.swift

@@ -20,16 +20,22 @@ enum Fake {
         moreInfo: "http://voltaserve.com"
     )
 
-    static func serverCall<T>(_ code: @escaping (CheckedContinuation<T, any Error>) -> Void) async throws -> T {
-        try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<T, any Error>) in
+    static func serverCall<T>(_ code: @escaping (CheckedContinuation<T, any Error>) -> Void)
+        async throws -> T
+    {
+        try await withCheckedThrowingContinuation {
+            (continuation: CheckedContinuation<T, any Error>) in
             DispatchQueue.main.asyncAfter(deadline: .now() + 2.5) {
                 code(continuation)
             }
         }
     }
 
-    static func serverCall(_ code: @escaping (CheckedContinuation<Void, any Error>) -> Void) async throws {
-        try await withCheckedThrowingContinuation { (continuation: CheckedContinuation<Void, any Error>) in
+    static func serverCall(_ code: @escaping (CheckedContinuation<Void, any Error>) -> Void)
+        async throws
+    {
+        try await withCheckedThrowingContinuation {
+            (continuation: CheckedContinuation<Void, any Error>) in
             DispatchQueue.main.asyncAfter(deadline: .now() + 2.5) {
                 code(continuation)
             }

Sources/Helpers/FileExtension.swift

@@ -18,7 +18,7 @@ extension String {
     func isImage() -> Bool {
         let imageExtensions = [
             ".xpm", ".png", ".jpg", ".jpeg", ".jp2", ".gif", ".webp",
-            ".tiff", ".tif", ".bmp", ".ico", ".heif", ".xcf", ".svg"
+            ".tiff", ".tif", ".bmp", ".ico", ".heif", ".xcf", ".svg",
         ]
         return imageExtensions.contains(self)
     }
@@ -72,15 +72,15 @@ extension String {
     func isVideo() -> Bool {
         let videoExtensions = [
             ".ogv", ".ogg", ".mpeg", ".mov", ".mqv", ".mp4", ".webm",
-            ".3gp", ".3g2", ".avi", ".flv", ".mkv", ".asf", ".m4v"
+            ".3gp", ".3g2", ".avi", ".flv", ".mkv", ".asf", ".m4v",
         ]
         return videoExtensions.contains(self)
     }
 
     func isAudio() -> Bool {
         let audioExtensions = [
             ".oga", ".mp3", ".flac", ".midi", ".ape", ".mpc", ".amr",
-            ".wav", ".aiff", ".au", ".aac", "voc", ".m4a", ".qcp"
+            ".wav", ".aiff", ".au", ".aac", "voc", ".m4a", ".qcp",
         ]
         return audioExtensions.contains(self)
     }
@@ -98,7 +98,7 @@ extension String {
         let codeExtensions = [
             ".html", ".js", "jsx", ".ts", ".tsx", ".css", ".sass",
             ".scss", ".go", ".py", ".rb", ".java", ".c", ".h", ".cpp",
-            ".hpp", ".json", ".yml", ".yaml", ".toml", ".md"
+            ".hpp", ".json", ".yml", ".yaml", ".toml", ".md",
         ]
         return codeExtensions.contains(self)
     }

Sources/Infrastructure/KeychainManager.swift

@@ -21,7 +21,7 @@ class KeychainManager {
         let query: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,
             kSecAttrAccount as String: key,
-            kSecValueData as String: data
+            kSecValueData as String: data,
         ]
 
         SecItemAdd(query as CFDictionary, nil)
@@ -32,7 +32,7 @@ class KeychainManager {
             kSecClass as String: kSecClassGenericPassword,
             kSecAttrAccount as String: key,
             kSecReturnData as String: true,
-            kSecMatchLimit as String: kSecMatchLimitOne
+            kSecMatchLimit as String: kSecMatchLimitOne,
         ]
 
         var item: CFTypeRef?
@@ -45,7 +45,7 @@ class KeychainManager {
     func delete(_ key: String) {
         let query: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,
-            kSecAttrAccount as String: key
+            kSecAttrAccount as String: key,
         ]
 
         SecItemDelete(query as CFDictionary)

Sources/Infrastructure/TokenStorage.swift

@@ -14,7 +14,8 @@ import VoltaserveCore
 extension KeychainManager {
     func saveToken(_ token: VOToken.Value, forKey key: String) {
         if let data = try? JSONEncoder().encode(token),
-           let serialized = String(data: data, encoding: .utf8) {
+            let serialized = String(data: data, encoding: .utf8)
+        {
             saveString(serialized, for: key)
         }
     }

Sources/Library/Modifiers/Button.swift

@@ -74,28 +74,34 @@ extension View {
         modifier(VOButton(color: .blue500, width: width, isDisabled: isDisabled))
     }
 
-    func voSecondaryButton(colorScheme: ColorScheme, width: CGFloat? = nil, isDisabled: Bool = false) -> some View {
-        modifier(VOButton(
-            color: colorScheme == .dark ? .gray700 : .gray200,
-            width: width,
-            isDisabled: isDisabled
-        ))
+    func voSecondaryButton(
+        colorScheme: ColorScheme, width: CGFloat? = nil, isDisabled: Bool = false
+    ) -> some View {
+        modifier(
+            VOButton(
+                color: colorScheme == .dark ? .gray700 : .gray200,
+                width: width,
+                isDisabled: isDisabled
+            ))
     }
 }
 
 #Preview {
     @Previewable @Environment(\.colorScheme) var colorScheme
 
     VStack {
-        Button {} label: {
+        Button {
+        } label: {
             VOButtonLabel("Lorem Ipsum")
         }
         .voPrimaryButton(width: 60)
-        Button {} label: {
+        Button {
+        } label: {
             VOButtonLabel("Lorem Ipsum", isLoading: true)
         }
         .voSecondaryButton(colorScheme: colorScheme, width: 200)
-        Button {} label: {
+        Button {
+        } label: {
             VOButtonLabel("Dolor Sit Amet")
         }
         .voButton(color: .red300)

Sources/Library/Modifiers/ErrorAlert.swift

@@ -36,7 +36,9 @@ struct VOErrorAlert: ViewModifier {
 }
 
 extension View {
-    func voErrorAlert(isPresented: Binding<Bool>, title: String? = nil, message: String? = nil) -> some View {
+    func voErrorAlert(isPresented: Binding<Bool>, title: String? = nil, message: String? = nil)
+        -> some View
+    {
         modifier(VOErrorAlert(isPresented: isPresented, title: title, message: message))
     }
 }

Sources/Library/Modifiers/ErrorSheet.swift

@@ -63,6 +63,7 @@ extension View {
     .voErrorSheet(
         isPresented: $showLongError,
         // swiftlint:disable:next line_length
-        message: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+        message:
+            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
     )
 }

Sources/Library/Modifiers/FormHintLabel.swift

@@ -28,7 +28,8 @@ extension View {
 }
 
 #Preview {
-    Button {} label: {
+    Button {
+    } label: {
         Text("Lorem ipsum")
             .voFormHintLabel()
     }

Sources/Library/Modifiers/WarningSheet.swift

@@ -63,6 +63,7 @@ extension View {
     .voWarningSheet(
         isPresented: $showLongWarning,
         // swiftlint:disable:next line_length
-        message: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+        message:
+            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
     )
 }

Sources/Library/Views/Avatar.swift

@@ -51,7 +51,7 @@ struct VOAvatar: View {
         }
 
         var color = ""
-        for index in 0 ..< 3 {
+        for index in 0..<3 {
             let value = (hash >> (index * 8)) & 0xFF
             color += String(format: "%02x", value)
         }

Sources/Library/Views/ButtonLabel.swift

@@ -16,7 +16,10 @@ struct VOButtonLabel: View {
     private let isLoading: Bool
     private let progressViewTint: Color
 
-    init(_ text: String, systemImage: String? = nil, isLoading: Bool = false, progressViewTint: Color = .primary) {
+    init(
+        _ text: String, systemImage: String? = nil, isLoading: Bool = false,
+        progressViewTint: Color = .primary
+    ) {
         self.text = text
         self.systemImage = systemImage
         self.isLoading = isLoading

Sources/Library/Views/ColorBadge.swift

@@ -23,7 +23,8 @@ struct VOColorBadge: View {
 
     var body: some View {
         if style == .fill {
-        } else if style == .outline {}
+        } else if style == .outline {
+        }
         Text(text)
             .font(.footnote)
             .padding(.horizontal)

Sources/Library/Views/ErrorMessage.swift

@@ -37,7 +37,9 @@ struct VOErrorMessage: View {
     VStack(spacing: VOMetrics.spacing2Xl) {
         VOErrorMessage("Lorem ipsum dolor sit amet.")
         // swiftlint:disable:next line_length
-        VOErrorMessage("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.")
+        VOErrorMessage(
+            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+        )
     }
     .padding()
 }

Sources/Library/Views/FormButtonLabel.swift

@@ -32,7 +32,8 @@ struct VOFormButtonLabel: View {
 
 #Preview {
     Form {
-        Button {} label: {
+        Button {
+        } label: {
             VOFormButtonLabel("Lorem Ipsum", isLoading: true)
         }
         .disabled(true)

Sources/Library/Views/WarningMessage.swift

@@ -37,7 +37,9 @@ struct VOWarningMessage: View {
     VStack(spacing: VOMetrics.spacing2Xl) {
         VOWarningMessage("Lorem ipsum dolor sit amet.")
         // swiftlint:disable:next line_length
-        VOWarningMessage("Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.")
+        VOWarningMessage(
+            "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+        )
     }
     .padding()
 }

Sources/Screens/Account/AccountEditEmail.swift

@@ -99,7 +99,8 @@ struct AccountEditEmail: View, LoadStateProvider, FormValidatable, ErrorPresenta
 
     func isValid() -> Bool {
         if let identityUser = accountStore.identityUser {
-            return !normalizedValue.isEmpty && normalizedValue != (identityUser.pendingEmail ?? identityUser.email)
+            return !normalizedValue.isEmpty
+                && normalizedValue != (identityUser.pendingEmail ?? identityUser.email)
         }
         return false
     }