diff --git a/Mist/Views/Download/DownloadHeaderView.swift b/Mist/Views/Download/DownloadHeaderView.swift index ab80733..6782282 100644 --- a/Mist/Views/Download/DownloadHeaderView.swift +++ b/Mist/Views/Download/DownloadHeaderView.swift @@ -12,13 +12,20 @@ struct DownloadHeaderView: View { var name: String var version: String var build: String - private let length: CGFloat = 32 + var beta: Bool + private let length: CGFloat = 48 var body: some View { HStack { - ScaledImage(name: imageName, length: length) + ZStack { + ScaledImage(name: imageName, length: length) + if beta { + TextRibbon(title: "BETA", length: length * 0.9) + } + } Text("\(name) \(version) (\(build))") .font(.title) + .multilineTextAlignment(.center) } .padding() } @@ -29,7 +36,7 @@ struct DownloadHeaderView_Previews: PreviewProvider { static let installer: Installer = .example static var previews: some View { - DownloadHeaderView(imageName: firmware.imageName, name: firmware.name, version: firmware.version, build: firmware.build) - DownloadHeaderView(imageName: installer.imageName, name: installer.name, version: installer.version, build: installer.build) + DownloadHeaderView(imageName: firmware.imageName, name: firmware.name, version: firmware.version, build: firmware.build, beta: false) + DownloadHeaderView(imageName: installer.imageName, name: installer.name, version: installer.version, build: installer.build, beta: false) } } diff --git a/Mist/Views/Download/DownloadView.swift b/Mist/Views/Download/DownloadView.swift index 17db894..94e178c 100644 --- a/Mist/Views/Download/DownloadView.swift +++ b/Mist/Views/Download/DownloadView.swift @@ -23,6 +23,7 @@ struct DownloadView: View { var name: String var version: String var build: String + var beta: Bool var destinationURL: URL? @ObservedObject var taskManager: TaskManager @State private var value: Double = 0 @@ -44,7 +45,7 @@ struct DownloadView: View { var body: some View { VStack(spacing: 0) { - DownloadHeaderView(imageName: imageName, name: name, version: version, build: build) + DownloadHeaderView(imageName: imageName, name: name, version: version, build: build, beta: beta) Divider() List { ForEach(taskManager.taskGroups, id: \.section) { taskGroup in @@ -211,7 +212,7 @@ struct DownloadView_Previews: PreviewProvider { static let installer: Installer = .example static var previews: some View { - DownloadView(downloadType: .firmware, imageName: firmware.imageName, name: firmware.name, version: firmware.version, build: firmware.build, taskManager: .shared) - DownloadView(downloadType: .installer, imageName: installer.imageName, name: installer.name, version: installer.version, build: installer.build, taskManager: .shared) + DownloadView(downloadType: .firmware, imageName: firmware.imageName, name: firmware.name, version: firmware.version, build: firmware.build, beta: false, taskManager: .shared) + DownloadView(downloadType: .installer, imageName: installer.imageName, name: installer.name, version: installer.version, build: installer.build, beta: false, taskManager: .shared) } } diff --git a/Mist/Views/List/FirmwareListRow.swift b/Mist/Views/List/FirmwareListRow.swift index 64c1459..0a3919e 100644 --- a/Mist/Views/List/FirmwareListRow.swift +++ b/Mist/Views/List/FirmwareListRow.swift @@ -47,6 +47,7 @@ struct FirmwareListRow: View { name: firmware.name, version: firmware.version, build: firmware.build, + beta: firmware.beta, destinationURL: savePanel.url, taskManager: taskManager ) diff --git a/Mist/Views/List/InstallerListRow.swift b/Mist/Views/List/InstallerListRow.swift index 1781c18..719e0ae 100644 --- a/Mist/Views/List/InstallerListRow.swift +++ b/Mist/Views/List/InstallerListRow.swift @@ -68,6 +68,7 @@ struct InstallerListRow: View { name: installer.name.replacingOccurrences(of: " beta", with: ""), version: installer.version, build: installer.build, + beta: installer.beta, destinationURL: openPanel.url, taskManager: taskManager )