From da8eeb0f29f80dbb94acf7394ddc11383e14bfe6 Mon Sep 17 00:00:00 2001 From: Nindi Gill Date: Sun, 19 Nov 2023 19:38:52 +1100 Subject: [PATCH] SwiftFormat andOperator --- Mist/Helpers/TaskManager.swift | 2 +- Mist/Views/Activity/ActivityView.swift | 4 ++-- Mist/Views/List/InstallerExportView.swift | 4 ++-- Mist/Views/Refresh/RefreshView.swift | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Mist/Helpers/TaskManager.swift b/Mist/Helpers/TaskManager.swift index 48b8304..8967dc7 100644 --- a/Mist/Helpers/TaskManager.swift +++ b/Mist/Helpers/TaskManager.swift @@ -402,7 +402,7 @@ class TaskManager: ObservableObject { } ] - if diskImageSign && !diskImageSigningIdentity.isEmpty && diskImageSigningIdentity != "-" { + if diskImageSign, !diskImageSigningIdentity.isEmpty, diskImageSigningIdentity != "-" { tasks += [ MistTask(type: .codesign, description: "Disk Image") { try await Codesigner.sign(temporaryImageURL, identity: diskImageSigningIdentity) diff --git a/Mist/Views/Activity/ActivityView.swift b/Mist/Views/Activity/ActivityView.swift index bd2cfaf..e75206d 100644 --- a/Mist/Views/Activity/ActivityView.swift +++ b/Mist/Views/Activity/ActivityView.swift @@ -64,11 +64,11 @@ struct ActivityView: View { ForEach(taskGroup.tasks.indices, id: \.self) { index in VStack { ActivityRowView(state: taskGroup.tasks[index].state, description: taskGroup.tasks[index].currentDescription, degrees: degrees) - if taskGroup.tasks[index].type == .download && taskGroup.tasks[index].state != .pending, + if taskGroup.tasks[index].type == .download, taskGroup.tasks[index].state != .pending, let size: UInt64 = taskGroup.tasks[index].downloadSize { ActivityProgressView(state: taskGroup.tasks[index].state, value: value, size: size) } - if venturaOrOlder && index != taskGroup.tasks.count { + if venturaOrOlder, index != taskGroup.tasks.count { Divider() } } diff --git a/Mist/Views/List/InstallerExportView.swift b/Mist/Views/List/InstallerExportView.swift index 36d2a9b..c4eeeed 100644 --- a/Mist/Views/List/InstallerExportView.swift +++ b/Mist/Views/List/InstallerExportView.swift @@ -73,11 +73,11 @@ struct InstallerExportView: View { private func updateExports() { var exports: [InstallerExportType] = [] - if !isoCompatible && exportISO { + if !isoCompatible, exportISO { exportISO = false } - if !exportApplication && !exportDiskImage && !exportISO && !exportPackage { + if !exportApplication, !exportDiskImage, !exportISO, !exportPackage { exportApplication = true } diff --git a/Mist/Views/Refresh/RefreshView.swift b/Mist/Views/Refresh/RefreshView.swift index 885484e..f3959b0 100644 --- a/Mist/Views/Refresh/RefreshView.swift +++ b/Mist/Views/Refresh/RefreshView.swift @@ -256,7 +256,7 @@ struct RefreshView: View { guard let name: String = nameFromDistribution(string), let version: String = versionFromDistribution(string), let build: String = buildFromDistribution(string), - !name.isEmpty && !version.isEmpty && !build.isEmpty else { + !name.isEmpty, !version.isEmpty, !build.isEmpty else { continue }