Code cleanup / format / lint

IceCubesActionExtension/ActionRequestHandler.swift

@@ -5,8 +5,8 @@
 //  Created by Thomas Durand on 26/01/2023.
 //
 
-import UIKit
 import MobileCoreServices
+import UIKit
 import UniformTypeIdentifiers
 
 import Models

IceCubesApp/App/SideBarView.swift

@@ -2,8 +2,8 @@ import Account
 import AppAccount
 import DesignSystem
 import Env
-import SwiftUI
 import Models
+import SwiftUI
 
 struct SideBarView<Content: View>: View {
   @EnvironmentObject private var appAccounts: AppAccountsManager

IceCubesApp/App/Tabs/Settings/AccountSettingView.swift

@@ -1,9 +1,9 @@
-import SwiftUI
 import Account
+import AppAccount
 import DesignSystem
 import Env
 import Models
-import AppAccount
+import SwiftUI
 
 struct AccountSettingsView: View {
   @Environment(\.dismiss) private var dismiss
@@ -54,7 +54,6 @@ struct AccountSettingsView: View {
         } label: {
           Text("account.action.logout")
         }
-
       }
       .listRowBackground(theme.primaryBackgroundColor)
     }

IceCubesApp/App/Tabs/Settings/ContentSettingsView.swift

@@ -8,7 +8,6 @@ import SwiftUI
 import UserNotifications
 
 struct ContentSettingsView: View {
-  
   @EnvironmentObject private var userPreferences: UserPreferences
   @EnvironmentObject private var theme: Theme
 
@@ -29,7 +28,6 @@ struct ContentSettingsView: View {
           userPreferences.appDefaultPostsSensitive = userPreferences.postIsSensitive
           userPreferences.appDefaultPostVisibility = userPreferences.postVisibility
         }
-        
       }
 
       Section("settings.content.reading") {
@@ -54,22 +52,15 @@ struct ContentSettingsView: View {
         }
         .disabled(userPreferences.useInstanceContentSettings)
 
-
         Toggle(isOn: $userPreferences.appDefaultPostsSensitive) {
           Text("settings.content.default-sensitive")
         }
         .disabled(userPreferences.useInstanceContentSettings)
-
       }
       .listRowBackground(theme.primaryBackgroundColor)
-      
     }
     .navigationTitle("settings.content.navigation-title")
     .scrollContentBackground(.hidden)
     .background(theme.secondaryBackgroundColor)
-
-    
-
   }
-
 }

IceCubesApp/App/Tabs/Settings/PushNotificationsView.swift

@@ -101,7 +101,6 @@ struct PushNotificationsView: View {
         Text("settings.push.duplicate.footer")
       }
       .listRowBackground(theme.primaryBackgroundColor)
-
     }
     .navigationTitle("settings.push.navigation-title")
     .scrollContentBackground(.hidden)

IceCubesApp/App/Tabs/Settings/SettingsTab.swift

@@ -75,7 +75,8 @@ struct SettingsTabs: View {
         if let index = indexSet.first {
           let account = appAccountsManager.availableAccounts[index]
           if let token = account.oauthToken,
-              let sub = pushNotifications.subscriptions.first(where: { $0.account.token == token }) {
+             let sub = pushNotifications.subscriptions.first(where: { $0.account.token == token })
+          {
             Task {
               await sub.deleteSubscription()
               appAccountsManager.delete(account: account)

Packages/Account/Sources/Account/Filters/EditFilterView.swift

@@ -1,8 +1,8 @@
-import SwiftUI
-import Models
-import Env
 import DesignSystem
+import Env
+import Models
 import Network
+import SwiftUI
 
 struct EditFilterView: View {
   @Environment(\.dismiss) private var dismiss
@@ -76,7 +76,6 @@ struct EditFilterView: View {
         }
     }
     .listRowBackground(theme.primaryBackgroundColor)
-    
   }
 
   private var keywordsSection: some View {
@@ -182,7 +181,7 @@ struct EditFilterView: View {
       } else {
         let newFilter: ServerFilter = try await client.post(endpoint: ServerFilters.createFilter(json: data),
                                                             forceVersion: .v2)
-        self.filter = newFilter
+        filter = newFilter
       }
     } catch {}
     isSavingFilter = false
@@ -197,7 +196,7 @@ struct EditFilterView: View {
                                                        keyword: name,
                                                        wholeWord: true),
                     forceVersion: .v2)
-      self.keywords.append(keyword)
+      keywords.append(keyword)
     } catch {}
     isSavingFilter = false
   }

Packages/Account/Sources/Account/Filters/FiltersListView.swift

@@ -1,8 +1,8 @@
-import SwiftUI
-import Env
-import Network
 import DesignSystem
+import Env
 import Models
+import Network
+import SwiftUI
 
 public struct FiltersListView: View {
   @Environment(\.dismiss) private var dismiss

Packages/AppAccount/Sources/AppAccount/AppAccount.swift

@@ -4,7 +4,7 @@ import Models
 import Network
 import SwiftUI
 
-extension AppAccount {
+public extension AppAccount {
   private static var keychain: KeychainSwift {
     let keychain = KeychainSwift()
     #if !DEBUG && !targetEnvironment(simulator)
@@ -13,17 +13,17 @@ extension AppAccount {
     return keychain
   }
 
-  public func save() throws {
+  func save() throws {
     let encoder = JSONEncoder()
     let data = try encoder.encode(self)
     Self.keychain.set(data, forKey: key)
   }
 
-  public func delete() {
+  func delete() {
     Self.keychain.delete(key)
   }
 
-  public static func retrieveAll() -> [AppAccount] {
+  static func retrieveAll() -> [AppAccount] {
     migrateLegacyAccounts()
     let keychain = Self.keychain
     let decoder = JSONDecoder()
@@ -39,7 +39,7 @@ extension AppAccount {
     return accounts
   }
 
-  public static func migrateLegacyAccounts() {
+  static func migrateLegacyAccounts() {
     let keychain = KeychainSwift()
     let decoder = JSONDecoder()
     let keys = keychain.allKeys
@@ -52,7 +52,7 @@ extension AppAccount {
     }
   }
 
-  public static func deleteAll() {
+  static func deleteAll() {
     let keychain = Self.keychain
     let keys = keychain.allKeys
     for key in keys {

Packages/Env/Sources/Env/PushNotificationsService.swift

@@ -64,7 +64,7 @@ public class PushNotificationsService: ObservableObject {
       await withTaskGroup(of: Void.self, body: { group in
         group.addTask {
           await subscription.fetchSubscription()
-          if await subscription.subscription != nil && !forceCreate {
+          if await subscription.subscription != nil, !forceCreate {
             await subscription.deleteSubscription()
             await subscription.updateSubscription()
           } else if forceCreate {

Packages/Env/Sources/Env/Router.swift

@@ -110,7 +110,8 @@ public class RouterPath: ObservableObject {
     } else if let client = client,
               client.isAuth,
               client.hasConnection(with: url),
-              let id = Int(url.lastPathComponent) {
+              let id = Int(url.lastPathComponent)
+    {
       if url.absoluteString.contains(client.server) {
         navigate(to: .statusDetail(id: String(id)))
       } else {

Packages/Env/Sources/Env/UserPreferences.swift

@@ -26,52 +26,37 @@ public class UserPreferences: ObservableObject {
   @AppStorage("app_default_post_visibility") public var appDefaultPostVisibility: Models.Visibility = .pub
   @AppStorage("app_default_posts_sensitive") public var appDefaultPostsSensitive = false
 
-
   public var postVisibility: Models.Visibility {
-    get{
     if useInstanceContentSettings {
       return serverPreferences?.postVisibility ?? .pub
-      }
+    } else {
-      else {
       return appDefaultPostVisibility
     }
   }
-  }
 
   public var postIsSensitive: Bool {
-    get {
     if useInstanceContentSettings {
       return serverPreferences?.postIsSensitive ?? false
-      }
+    } else {
-      else {
       return appDefaultPostsSensitive
     }
   }
-  }
-  
 
   public var autoExpandSpoilers: Bool {
-    get {
     if useInstanceContentSettings {
       return serverPreferences?.autoExpandSpoilers ?? true
-      }
+    } else {
-      else {
       return appAutoExpandSpoilers
     }
   }
-  }
 
   public var autoExpandMedia: ServerPreferences.AutoExpandMedia {
-    get {
     if useInstanceContentSettings {
       return serverPreferences?.autoExpandMedia ?? .hideSensitive
-      }
+    } else {
-      else {
       return appAutoExpandMedia
     }
   }
-  }
-  
 
   public var pushNotificationsCount: Int {
     get {

Packages/Models/Sources/Models/AppAccount.swift

@@ -20,7 +20,8 @@ public struct AppAccount: Codable, Identifiable, Hashable {
 
   public init(server: String,
               accountName: String?,
-              oauthToken: OauthToken? = nil) {
+              oauthToken: OauthToken? = nil)
+  {
     self.server = server
     self.accountName = accountName
     self.oauthToken = oauthToken

Packages/Models/Sources/Models/Poll.swift

@@ -35,9 +35,9 @@ public struct NullableString: Codable, Equatable, Hashable {
   public init(from decoder: Decoder) throws {
     do {
       let container = try decoder.singleValueContainer()
-      self.value = try container.decode(String.self)
+      value = try container.decode(String.self)
     } catch {
-      self.value = nil
+      value = nil
     }
   }
 }

Packages/Models/Sources/Models/ServerFilter.swift

@@ -23,8 +23,8 @@ public struct ServerFilter: Codable, Identifiable, Hashable {
   public let expireIn: Int?
 }
 
-extension ServerFilter.Context {
+public extension ServerFilter.Context {
-  public var iconName: String {
+  var iconName: String {
     switch self {
     case .home:
       return "rectangle.on.rectangle"
@@ -39,7 +39,7 @@ extension ServerFilter.Context {
     }
   }
 
-  public var name: String {
+  var name: String {
     switch self {
     case .home:
       return "Home and lists"
@@ -55,8 +55,8 @@ extension ServerFilter.Context {
   }
 }
 
-extension ServerFilter.Action {
+public extension ServerFilter.Action {
-  public var label: String {
+  var label: String {
     switch self {
     case .warn:
       return "Hide with a warning"

Packages/Network/Sources/Network/Endpoint/ServerFilters.swift

@@ -57,7 +57,8 @@ public struct ServerFilterData: Encodable {
   public init(title: String,
               context: [ServerFilter.Context],
               filterAction: ServerFilter.Action,
-              expireIn: Int?) {
+              expireIn: Int?)
+  {
     self.title = title
     self.context = context
     self.filterAction = filterAction

Packages/Notifications/Sources/Notifications/NotificationsViewModel.swift

@@ -76,7 +76,7 @@ class NotificationsViewModel: ObservableObject {
         newNotifications = newNotifications.filter { notification in
           !consolidatedNotifications.contains(where: { $0.id == notification.id })
         }
-        self.notifications.append(contentsOf: newNotifications)
+        notifications.append(contentsOf: newNotifications)
         consolidatedNotifications.insert(contentsOf: newNotifications.consolidated(), at: 0)
       }
       withAnimation {
@@ -98,7 +98,7 @@ class NotificationsViewModel: ObservableObject {
                                                                    maxId: lastId,
                                                                    types: queryTypes))
       consolidatedNotifications.append(contentsOf: newNotifications.consolidated())
-      self.notifications.append(contentsOf: newNotifications)
+      notifications.append(contentsOf: newNotifications)
       state = .display(notifications: consolidatedNotifications, nextPageState: newNotifications.count < 15 ? .none : .hasNextPage)
     } catch {
       state = .error(error: error)

Packages/Status/Sources/Status/Editor/Components/StatusEditorMediaView.swift

@@ -163,7 +163,6 @@ struct StatusEditorMediaView: View {
     } message: {
       Text(error.error ?? "")
     }
-
   }
 
   private var altMarker: some View {

Packages/Status/Sources/Status/Editor/Components/StatusEditorUTTypeSupported.swift

@@ -1,9 +1,9 @@
+import AVFoundation
 import Foundation
 import PhotosUI
 import SwiftUI
 import UIKit
 import UniformTypeIdentifiers
-import AVFoundation
 
 @MainActor
 enum StatusEditorUTTypeSupported: String, CaseIterable {
@@ -74,7 +74,7 @@ struct MovieFileTranseferable: Transferable {
   private let url: URL
   var compressedVideoURL: URL? {
     get async {
-      return await withCheckedContinuation { continuation in
+      await withCheckedContinuation { continuation in
         let urlAsset = AVURLAsset(url: url, options: nil)
         guard let exportSession = AVAssetExportSession(asset: urlAsset, presetName: AVAssetExportPresetMediumQuality) else {
           continuation.resume(returning: nil)
@@ -84,7 +84,7 @@ struct MovieFileTranseferable: Transferable {
         exportSession.outputURL = outputURL
         exportSession.outputFileType = .mp4
         exportSession.shouldOptimizeForNetworkUse = true
-        exportSession.exportAsynchronously { () -> Void in
+        exportSession.exportAsynchronously { () in
           continuation.resume(returning: outputURL)
         }
       }

Packages/Status/Sources/Status/Editor/StatusEditorViewModel.swift

@@ -56,6 +56,7 @@ public class StatusEditorViewModel: ObservableObject {
       inflateSelectedMedias()
     }
   }
+
   @Published var isMediasLoading: Bool = false
 
   @Published var mediasImages: [StatusEditorMediaContainer] = []

Packages/Status/Sources/Status/Row/StatusRowView.swift

@@ -225,7 +225,6 @@ public struct StatusRowView: View {
   private func makeStatusContentView(status: AnyStatus) -> some View {
     Group {
       if !status.spoilerText.asRawText.isEmpty {
-
         HStack(alignment: .top) {
           Text("⚠︎")
             .font(.system(.subheadline, weight: .bold))
@@ -376,7 +375,8 @@ public struct StatusRowView: View {
        !viewModel.isCompact,
        theme.statusDisplayStyle == .large,
        status.content.statusesURLs.isEmpty,
-       status.mediaAttachments.isEmpty {
+       status.mediaAttachments.isEmpty
+    {
       StatusCardView(card: card)
     }
   }