Fix SwiftLinter warnings

This commit is contained in:
Nindi Gill 2023-04-16 16:00:01 +10:00
parent bf3f675b80
commit c3583359ea
No known key found for this signature in database
GPG key ID: FF9A7FD590D4F4B1
14 changed files with 90 additions and 45 deletions

View file

@ -10,7 +10,8 @@ import SwiftUI
@main @main
struct MistApp: App { struct MistApp: App {
// swiftlint:disable:next weak_delegate // swiftlint:disable:next weak_delegate
@NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate: AppDelegate @NSApplicationDelegateAdaptor(AppDelegate.self)
var appDelegate: AppDelegate
@StateObject var sparkleUpdater: SparkleUpdater = SparkleUpdater() @StateObject var sparkleUpdater: SparkleUpdater = SparkleUpdater()
@State private var refreshing: Bool = false @State private var refreshing: Bool = false
@State private var downloadInProgress: Bool = false @State private var downloadInProgress: Bool = false

View file

@ -8,8 +8,10 @@
import SwiftUI import SwiftUI
struct ContentView: View { struct ContentView: View {
@AppStorage("includeBetas") private var includeBetas: Bool = false @AppStorage("includeBetas")
@AppStorage("showCompatible") private var showCompatible: Bool = false private var includeBetas: Bool = false
@AppStorage("showCompatible")
private var showCompatible: Bool = false
@Binding var refreshing: Bool @Binding var refreshing: Bool
@Binding var downloadInProgress: Bool @Binding var downloadInProgress: Bool
@State private var downloadType: DownloadType = .firmware @State private var downloadType: DownloadType = .firmware

View file

@ -10,9 +10,12 @@ import SwiftUI
struct DownloadView: View { struct DownloadView: View {
// swiftlint:disable:next weak_delegate // swiftlint:disable:next weak_delegate
@NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate: AppDelegate @NSApplicationDelegateAdaptor(AppDelegate.self)
@Environment(\.presentationMode) var presentationMode: Binding<PresentationMode> var appDelegate: AppDelegate
@AppStorage("enableNotifications") private var enableNotifications: Bool = false @Environment(\.presentationMode)
var presentationMode: Binding<PresentationMode>
@AppStorage("enableNotifications")
private var enableNotifications: Bool = false
var downloadType: DownloadType var downloadType: DownloadType
var imageName: String var imageName: String
var name: String var name: String

View file

@ -8,9 +8,12 @@
import SwiftUI import SwiftUI
struct FirmwareListRow: View { struct FirmwareListRow: View {
@AppStorage("firmwareFilename") private var firmwareFilename: String = .firmwareFilenameTemplate @AppStorage("firmwareFilename")
@AppStorage("retries") private var retries: Int = 10 private var firmwareFilename: String = .firmwareFilenameTemplate
@AppStorage("retryDelay") private var retryDelay: Int = 30 @AppStorage("retries")
private var retries: Int = 10
@AppStorage("retryDelay")
private var retryDelay: Int = 30
var firmware: Firmware var firmware: Firmware
@Binding var savePanel: NSSavePanel @Binding var savePanel: NSSavePanel
@Binding var downloadInProgress: Bool @Binding var downloadInProgress: Bool

View file

@ -8,10 +8,14 @@
import SwiftUI import SwiftUI
struct InstallerExportView: View { struct InstallerExportView: View {
@AppStorage("exportApplication") private var exportApplication: Bool = true @AppStorage("exportApplication")
@AppStorage("exportDiskImage") private var exportDiskImage: Bool = false private var exportApplication: Bool = true
@AppStorage("exportISO") private var exportISO: Bool = false @AppStorage("exportDiskImage")
@AppStorage("exportPackage") private var exportPackage: Bool = false private var exportDiskImage: Bool = false
@AppStorage("exportISO")
private var exportISO: Bool = false
@AppStorage("exportPackage")
private var exportPackage: Bool = false
@Binding var exports: [InstallerExportType] @Binding var exports: [InstallerExportType]
var body: some View { var body: some View {

View file

@ -8,19 +8,32 @@
import SwiftUI import SwiftUI
struct InstallerListRow: View { struct InstallerListRow: View {
@AppStorage("cacheDownloads") private var cacheDownloads: Bool = false @AppStorage("cacheDownloads")
@AppStorage("cacheDirectory") private var cacheDirectory: String = .cacheDirectory private var cacheDownloads: Bool = false
@AppStorage("applicationFilename") private var applicationFilename: String = .applicationFilenameTemplate @AppStorage("cacheDirectory")
@AppStorage("diskImageFilename") private var diskImageFilename: String = .diskImageFilenameTemplate private var cacheDirectory: String = .cacheDirectory
@AppStorage("diskImageSign") private var diskImageSign: Bool = false @AppStorage("applicationFilename")
@AppStorage("diskImageSigningIdentity") private var diskImageSigningIdentity: String = "" private var applicationFilename: String = .applicationFilenameTemplate
@AppStorage("isoFilename") private var isoFilename: String = .isoFilenameTemplate @AppStorage("diskImageFilename")
@AppStorage("packageFilename") private var packageFilename: String = .packageFilenameTemplate private var diskImageFilename: String = .diskImageFilenameTemplate
@AppStorage("packageIdentifier") private var packageIdentifier: String = .packageIdentifierTemplate @AppStorage("diskImageSign")
@AppStorage("packageSign") private var packageSign: Bool = false private var diskImageSign: Bool = false
@AppStorage("packageSigningIdentity") private var packageSigningIdentity: String = "" @AppStorage("diskImageSigningIdentity")
@AppStorage("retries") private var retries: Int = 10 private var diskImageSigningIdentity: String = ""
@AppStorage("retryDelay") private var retryDelay: Int = 30 @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 var installer: Installer
@Binding var openPanel: NSOpenPanel @Binding var openPanel: NSOpenPanel
@Binding var downloadInProgress: Bool @Binding var downloadInProgress: Bool

View file

@ -22,8 +22,10 @@ struct ListRow: View {
@ObservedObject var taskManager: TaskManager @ObservedObject var taskManager: TaskManager
@State private var alertType: DownloadAlertType = .compatibility @State private var alertType: DownloadAlertType = .compatibility
@State private var showAlert: Bool = false @State private var showAlert: Bool = false
@AppStorage("cacheDownloads") private var cacheDownloads: Bool = false @AppStorage("cacheDownloads")
@AppStorage("cacheDirectory") private var cacheDirectory: String = .cacheDirectory private var cacheDownloads: Bool = false
@AppStorage("cacheDirectory")
private var cacheDirectory: String = .cacheDirectory
private let length: CGFloat = 48 private let length: CGFloat = 48
private let spacing: CGFloat = 5 private let spacing: CGFloat = 5
private let padding: CGFloat = 3 private let padding: CGFloat = 3

View file

@ -18,7 +18,8 @@ struct SettingsApplicationsView: View {
"Application - macOS High Sierra" "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 imageName: String = randomImageName()
@State private var fade: Bool = false @State private var fade: Bool = false
private let timer: Publishers.Autoconnect<Timer.TimerPublisher> = Timer.publish(every: 3, on: .main, in: .common).autoconnect() private let timer: Publishers.Autoconnect<Timer.TimerPublisher> = Timer.publish(every: 3, on: .main, in: .common).autoconnect()

View file

@ -8,9 +8,12 @@
import SwiftUI import SwiftUI
struct SettingsDiskImagesView: View { struct SettingsDiskImagesView: View {
@AppStorage("diskImageFilename") private var diskImageFilename: String = .diskImageFilenameTemplate @AppStorage("diskImageFilename")
@AppStorage("diskImageSign") private var diskImageSign: Bool = false private var diskImageFilename: String = .diskImageFilenameTemplate
@AppStorage("diskImageSigningIdentity") private var diskImageSigningIdentity: String = "" @AppStorage("diskImageSign")
private var diskImageSign: Bool = false
@AppStorage("diskImageSigningIdentity")
private var diskImageSigningIdentity: String = ""
@State private var codesigningIdentities: [String] = ["Loading..."] @State private var codesigningIdentities: [String] = ["Loading..."]
private let diskImageSignDefault: Bool = false private let diskImageSignDefault: Bool = false
private let diskImageSigningIdentityDefault: String = "" private let diskImageSigningIdentityDefault: String = ""

View file

@ -8,7 +8,8 @@
import SwiftUI import SwiftUI
struct SettingsFirmwaresView: View { struct SettingsFirmwaresView: View {
@AppStorage("firmwareFilename") private var firmwareFilename: String = .firmwareFilenameTemplate @AppStorage("firmwareFilename")
private var firmwareFilename: String = .firmwareFilenameTemplate
private let imageName: String = "Firmware" private let imageName: String = "Firmware"
private let title: String = "Firmwares" private let title: String = "Firmwares"
// swiftlint:disable:next line_length // swiftlint:disable:next line_length

View file

@ -8,11 +8,16 @@
import SwiftUI import SwiftUI
struct SettingsGeneralView: View { struct SettingsGeneralView: View {
@AppStorage("enableNotifications") private var enableNotifications: Bool = false @AppStorage("enableNotifications")
@AppStorage("retries") private var retries: Int = 10 private var enableNotifications: Bool = false
@AppStorage("retryDelay") private var retryDelay: Int = 30 @AppStorage("retries")
@AppStorage("SUEnableAutomaticChecks") private var enableAutomaticChecks: Bool = true private var retries: Int = 10
@AppStorage("SUScheduledCheckInterval") private var scheduledCheckInterval: Int = 86_400 @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 @ObservedObject var sparkleUpdater: SparkleUpdater
private let enableNotificationsDefault: Bool = false private let enableNotificationsDefault: Bool = false
private let retriesDefault: Int = 10 private let retriesDefault: Int = 10

View file

@ -8,7 +8,8 @@
import SwiftUI import SwiftUI
struct SettingsISOsView: View { struct SettingsISOsView: View {
@AppStorage("isoFilename") private var isoFilename: String = .isoFilenameTemplate @AppStorage("isoFilename")
private var isoFilename: String = .isoFilenameTemplate
private let imageName: String = "ISO" private let imageName: String = "ISO"
private let title: String = "ISOs" private let title: String = "ISOs"
// swiftlint:disable:next line_length // swiftlint:disable:next line_length

View file

@ -8,8 +8,10 @@
import SwiftUI import SwiftUI
struct SettingsInstallersView: View { struct SettingsInstallersView: View {
@AppStorage("cacheDownloads") private var cacheDownloads: Bool = false @AppStorage("cacheDownloads")
@AppStorage("cacheDirectory") private var cacheDirectory: String = .cacheDirectory private var cacheDownloads: Bool = false
@AppStorage("cacheDirectory")
private var cacheDirectory: String = .cacheDirectory
@State private var catalogs: [Catalog] = [] @State private var catalogs: [Catalog] = []
private let cacheDownloadsDefault: Bool = false private let cacheDownloadsDefault: Bool = false
private let cacheDirectoryDefault: String = .cacheDirectory private let cacheDirectoryDefault: String = .cacheDirectory

View file

@ -8,10 +8,14 @@
import SwiftUI import SwiftUI
struct SettingsPackagesView: View { struct SettingsPackagesView: View {
@AppStorage("packageFilename") private var packageFilename: String = .packageFilenameTemplate @AppStorage("packageFilename")
@AppStorage("packageIdentifier") private var packageIdentifier: String = .packageIdentifierTemplate private var packageFilename: String = .packageFilenameTemplate
@AppStorage("packageSign") private var packageSign: Bool = false @AppStorage("packageIdentifier")
@AppStorage("packageSigningIdentity") private var packageSigningIdentity: String = "" private var packageIdentifier: String = .packageIdentifierTemplate
@AppStorage("packageSign")
private var packageSign: Bool = false
@AppStorage("packageSigningIdentity")
private var packageSigningIdentity: String = ""
@State private var codesigningIdentities: [String] = ["Loading..."] @State private var codesigningIdentities: [String] = ["Loading..."]
private let packageSignDefault: Bool = false private let packageSignDefault: Bool = false
private let packageSigningIdentityDefault: String = "" private let packageSigningIdentityDefault: String = ""