From c3583359ea68cff7f8a289828218510ebb0d138c Mon Sep 17 00:00:00 2001 From: Nindi Gill Date: Sun, 16 Apr 2023 16:00:01 +1000 Subject: [PATCH] Fix SwiftLinter warnings --- Mist/MistApp.swift | 3 +- Mist/Views/ContentView.swift | 6 ++- Mist/Views/Download/DownloadView.swift | 9 +++-- Mist/Views/List/FirmwareListRow.swift | 9 +++-- Mist/Views/List/InstallerExportView.swift | 12 ++++-- Mist/Views/List/InstallerListRow.swift | 39 ++++++++++++------- Mist/Views/List/ListRow.swift | 6 ++- .../Settings/SettingsApplicationsView.swift | 3 +- .../Settings/SettingsDiskImagesView.swift | 9 +++-- .../Settings/SettingsFirmwaresView.swift | 3 +- Mist/Views/Settings/SettingsGeneralView.swift | 15 ++++--- Mist/Views/Settings/SettingsISOsView.swift | 3 +- .../Settings/SettingsInstallersView.swift | 6 ++- .../Views/Settings/SettingsPackagesView.swift | 12 ++++-- 14 files changed, 90 insertions(+), 45 deletions(-) diff --git a/Mist/MistApp.swift b/Mist/MistApp.swift index 1314d47..b8098a1 100644 --- a/Mist/MistApp.swift +++ b/Mist/MistApp.swift @@ -10,7 +10,8 @@ import SwiftUI @main struct MistApp: App { // swiftlint:disable:next weak_delegate - @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate: AppDelegate + @NSApplicationDelegateAdaptor(AppDelegate.self) + var appDelegate: AppDelegate @StateObject var sparkleUpdater: SparkleUpdater = SparkleUpdater() @State private var refreshing: Bool = false @State private var downloadInProgress: Bool = false diff --git a/Mist/Views/ContentView.swift b/Mist/Views/ContentView.swift index 7cefc65..81ba246 100644 --- a/Mist/Views/ContentView.swift +++ b/Mist/Views/ContentView.swift @@ -8,8 +8,10 @@ import SwiftUI struct ContentView: View { - @AppStorage("includeBetas") private var includeBetas: Bool = false - @AppStorage("showCompatible") private var showCompatible: Bool = false + @AppStorage("includeBetas") + private var includeBetas: Bool = false + @AppStorage("showCompatible") + private var showCompatible: Bool = false @Binding var refreshing: Bool @Binding var downloadInProgress: Bool @State private var downloadType: DownloadType = .firmware diff --git a/Mist/Views/Download/DownloadView.swift b/Mist/Views/Download/DownloadView.swift index c6f65a3..776b488 100644 --- a/Mist/Views/Download/DownloadView.swift +++ b/Mist/Views/Download/DownloadView.swift @@ -10,9 +10,12 @@ import SwiftUI struct DownloadView: View { // swiftlint:disable:next weak_delegate - @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate: AppDelegate - @Environment(\.presentationMode) var presentationMode: Binding - @AppStorage("enableNotifications") private var enableNotifications: Bool = false + @NSApplicationDelegateAdaptor(AppDelegate.self) + var appDelegate: AppDelegate + @Environment(\.presentationMode) + var presentationMode: Binding + @AppStorage("enableNotifications") + private var enableNotifications: Bool = false var downloadType: DownloadType var imageName: String var name: String diff --git a/Mist/Views/List/FirmwareListRow.swift b/Mist/Views/List/FirmwareListRow.swift index 9f98f55..64c1459 100644 --- a/Mist/Views/List/FirmwareListRow.swift +++ b/Mist/Views/List/FirmwareListRow.swift @@ -8,9 +8,12 @@ import SwiftUI struct FirmwareListRow: View { - @AppStorage("firmwareFilename") private var firmwareFilename: String = .firmwareFilenameTemplate - @AppStorage("retries") private var retries: Int = 10 - @AppStorage("retryDelay") private var retryDelay: Int = 30 + @AppStorage("firmwareFilename") + private var firmwareFilename: String = .firmwareFilenameTemplate + @AppStorage("retries") + private var retries: Int = 10 + @AppStorage("retryDelay") + private var retryDelay: Int = 30 var firmware: Firmware @Binding var savePanel: NSSavePanel @Binding var downloadInProgress: Bool diff --git a/Mist/Views/List/InstallerExportView.swift b/Mist/Views/List/InstallerExportView.swift index 5915630..cdee1aa 100644 --- a/Mist/Views/List/InstallerExportView.swift +++ b/Mist/Views/List/InstallerExportView.swift @@ -8,10 +8,14 @@ import SwiftUI struct InstallerExportView: View { - @AppStorage("exportApplication") private var exportApplication: Bool = true - @AppStorage("exportDiskImage") private var exportDiskImage: Bool = false - @AppStorage("exportISO") private var exportISO: Bool = false - @AppStorage("exportPackage") private var exportPackage: Bool = false + @AppStorage("exportApplication") + private var exportApplication: Bool = true + @AppStorage("exportDiskImage") + private var exportDiskImage: Bool = false + @AppStorage("exportISO") + private var exportISO: Bool = false + @AppStorage("exportPackage") + private var exportPackage: Bool = false @Binding var exports: [InstallerExportType] var body: some View { diff --git a/Mist/Views/List/InstallerListRow.swift b/Mist/Views/List/InstallerListRow.swift index d256292..3610fb6 100644 --- a/Mist/Views/List/InstallerListRow.swift +++ b/Mist/Views/List/InstallerListRow.swift @@ -8,19 +8,32 @@ import SwiftUI struct InstallerListRow: View { - @AppStorage("cacheDownloads") private var cacheDownloads: Bool = false - @AppStorage("cacheDirectory") private var cacheDirectory: String = .cacheDirectory - @AppStorage("applicationFilename") private var applicationFilename: String = .applicationFilenameTemplate - @AppStorage("diskImageFilename") private var diskImageFilename: String = .diskImageFilenameTemplate - @AppStorage("diskImageSign") private var diskImageSign: Bool = false - @AppStorage("diskImageSigningIdentity") private var diskImageSigningIdentity: String = "" - @AppStorage("isoFilename") private var isoFilename: String = .isoFilenameTemplate - @AppStorage("packageFilename") private var packageFilename: String = .packageFilenameTemplate - @AppStorage("packageIdentifier") private var packageIdentifier: String = .packageIdentifierTemplate - @AppStorage("packageSign") private var packageSign: Bool = false - @AppStorage("packageSigningIdentity") private var packageSigningIdentity: String = "" - @AppStorage("retries") private var retries: Int = 10 - @AppStorage("retryDelay") private var retryDelay: Int = 30 + @AppStorage("cacheDownloads") + private var cacheDownloads: Bool = false + @AppStorage("cacheDirectory") + private var cacheDirectory: String = .cacheDirectory + @AppStorage("applicationFilename") + private var applicationFilename: String = .applicationFilenameTemplate + @AppStorage("diskImageFilename") + private var diskImageFilename: String = .diskImageFilenameTemplate + @AppStorage("diskImageSign") + private var diskImageSign: Bool = false + @AppStorage("diskImageSigningIdentity") + private var diskImageSigningIdentity: String = "" + @AppStorage("isoFilename") + private var isoFilename: String = .isoFilenameTemplate + @AppStorage("packageFilename") + private var packageFilename: String = .packageFilenameTemplate + @AppStorage("packageIdentifier") + private var packageIdentifier: String = .packageIdentifierTemplate + @AppStorage("packageSign") + private var packageSign: Bool = false + @AppStorage("packageSigningIdentity") + private var packageSigningIdentity: String = "" + @AppStorage("retries") + private var retries: Int = 10 + @AppStorage("retryDelay") + private var retryDelay: Int = 30 var installer: Installer @Binding var openPanel: NSOpenPanel @Binding var downloadInProgress: Bool diff --git a/Mist/Views/List/ListRow.swift b/Mist/Views/List/ListRow.swift index cbbccc8..1439b0f 100644 --- a/Mist/Views/List/ListRow.swift +++ b/Mist/Views/List/ListRow.swift @@ -22,8 +22,10 @@ struct ListRow: View { @ObservedObject var taskManager: TaskManager @State private var alertType: DownloadAlertType = .compatibility @State private var showAlert: Bool = false - @AppStorage("cacheDownloads") private var cacheDownloads: Bool = false - @AppStorage("cacheDirectory") private var cacheDirectory: String = .cacheDirectory + @AppStorage("cacheDownloads") + private var cacheDownloads: Bool = false + @AppStorage("cacheDirectory") + private var cacheDirectory: String = .cacheDirectory private let length: CGFloat = 48 private let spacing: CGFloat = 5 private let padding: CGFloat = 3 diff --git a/Mist/Views/Settings/SettingsApplicationsView.swift b/Mist/Views/Settings/SettingsApplicationsView.swift index 7bbf223..0b7d966 100644 --- a/Mist/Views/Settings/SettingsApplicationsView.swift +++ b/Mist/Views/Settings/SettingsApplicationsView.swift @@ -18,7 +18,8 @@ struct SettingsApplicationsView: View { "Application - macOS High Sierra" ] - @AppStorage("applicationFilename") private var applicationFilename: String = .applicationFilenameTemplate + @AppStorage("applicationFilename") + private var applicationFilename: String = .applicationFilenameTemplate @State private var imageName: String = randomImageName() @State private var fade: Bool = false private let timer: Publishers.Autoconnect = Timer.publish(every: 3, on: .main, in: .common).autoconnect() diff --git a/Mist/Views/Settings/SettingsDiskImagesView.swift b/Mist/Views/Settings/SettingsDiskImagesView.swift index 1d3deb5..855d876 100644 --- a/Mist/Views/Settings/SettingsDiskImagesView.swift +++ b/Mist/Views/Settings/SettingsDiskImagesView.swift @@ -8,9 +8,12 @@ import SwiftUI struct SettingsDiskImagesView: View { - @AppStorage("diskImageFilename") private var diskImageFilename: String = .diskImageFilenameTemplate - @AppStorage("diskImageSign") private var diskImageSign: Bool = false - @AppStorage("diskImageSigningIdentity") private var diskImageSigningIdentity: String = "" + @AppStorage("diskImageFilename") + private var diskImageFilename: String = .diskImageFilenameTemplate + @AppStorage("diskImageSign") + private var diskImageSign: Bool = false + @AppStorage("diskImageSigningIdentity") + private var diskImageSigningIdentity: String = "" @State private var codesigningIdentities: [String] = ["Loading..."] private let diskImageSignDefault: Bool = false private let diskImageSigningIdentityDefault: String = "" diff --git a/Mist/Views/Settings/SettingsFirmwaresView.swift b/Mist/Views/Settings/SettingsFirmwaresView.swift index cca92eb..7f7f959 100644 --- a/Mist/Views/Settings/SettingsFirmwaresView.swift +++ b/Mist/Views/Settings/SettingsFirmwaresView.swift @@ -8,7 +8,8 @@ import SwiftUI struct SettingsFirmwaresView: View { - @AppStorage("firmwareFilename") private var firmwareFilename: String = .firmwareFilenameTemplate + @AppStorage("firmwareFilename") + private var firmwareFilename: String = .firmwareFilenameTemplate private let imageName: String = "Firmware" private let title: String = "Firmwares" // swiftlint:disable:next line_length diff --git a/Mist/Views/Settings/SettingsGeneralView.swift b/Mist/Views/Settings/SettingsGeneralView.swift index 94c8f4d..c3a93ed 100644 --- a/Mist/Views/Settings/SettingsGeneralView.swift +++ b/Mist/Views/Settings/SettingsGeneralView.swift @@ -8,11 +8,16 @@ import SwiftUI struct SettingsGeneralView: View { - @AppStorage("enableNotifications") private var enableNotifications: Bool = false - @AppStorage("retries") private var retries: Int = 10 - @AppStorage("retryDelay") private var retryDelay: Int = 30 - @AppStorage("SUEnableAutomaticChecks") private var enableAutomaticChecks: Bool = true - @AppStorage("SUScheduledCheckInterval") private var scheduledCheckInterval: Int = 86_400 + @AppStorage("enableNotifications") + private var enableNotifications: Bool = false + @AppStorage("retries") + private var retries: Int = 10 + @AppStorage("retryDelay") + private var retryDelay: Int = 30 + @AppStorage("SUEnableAutomaticChecks") + private var enableAutomaticChecks: Bool = true + @AppStorage("SUScheduledCheckInterval") + private var scheduledCheckInterval: Int = 86_400 @ObservedObject var sparkleUpdater: SparkleUpdater private let enableNotificationsDefault: Bool = false private let retriesDefault: Int = 10 diff --git a/Mist/Views/Settings/SettingsISOsView.swift b/Mist/Views/Settings/SettingsISOsView.swift index 2ec33ca..709f2cd 100644 --- a/Mist/Views/Settings/SettingsISOsView.swift +++ b/Mist/Views/Settings/SettingsISOsView.swift @@ -8,7 +8,8 @@ import SwiftUI struct SettingsISOsView: View { - @AppStorage("isoFilename") private var isoFilename: String = .isoFilenameTemplate + @AppStorage("isoFilename") + private var isoFilename: String = .isoFilenameTemplate private let imageName: String = "ISO" private let title: String = "ISOs" // swiftlint:disable:next line_length diff --git a/Mist/Views/Settings/SettingsInstallersView.swift b/Mist/Views/Settings/SettingsInstallersView.swift index cbaa917..391d9f0 100644 --- a/Mist/Views/Settings/SettingsInstallersView.swift +++ b/Mist/Views/Settings/SettingsInstallersView.swift @@ -8,8 +8,10 @@ import SwiftUI struct SettingsInstallersView: View { - @AppStorage("cacheDownloads") private var cacheDownloads: Bool = false - @AppStorage("cacheDirectory") private var cacheDirectory: String = .cacheDirectory + @AppStorage("cacheDownloads") + private var cacheDownloads: Bool = false + @AppStorage("cacheDirectory") + private var cacheDirectory: String = .cacheDirectory @State private var catalogs: [Catalog] = [] private let cacheDownloadsDefault: Bool = false private let cacheDirectoryDefault: String = .cacheDirectory diff --git a/Mist/Views/Settings/SettingsPackagesView.swift b/Mist/Views/Settings/SettingsPackagesView.swift index 28c2609..2fabb77 100644 --- a/Mist/Views/Settings/SettingsPackagesView.swift +++ b/Mist/Views/Settings/SettingsPackagesView.swift @@ -8,10 +8,14 @@ import SwiftUI struct SettingsPackagesView: View { - @AppStorage("packageFilename") private var packageFilename: String = .packageFilenameTemplate - @AppStorage("packageIdentifier") private var packageIdentifier: String = .packageIdentifierTemplate - @AppStorage("packageSign") private var packageSign: Bool = false - @AppStorage("packageSigningIdentity") private var packageSigningIdentity: String = "" + @AppStorage("packageFilename") + private var packageFilename: String = .packageFilenameTemplate + @AppStorage("packageIdentifier") + private var packageIdentifier: String = .packageIdentifierTemplate + @AppStorage("packageSign") + private var packageSign: Bool = false + @AppStorage("packageSigningIdentity") + private var packageSigningIdentity: String = "" @State private var codesigningIdentities: [String] = ["Loading..."] private let packageSignDefault: Bool = false private let packageSigningIdentityDefault: String = ""