mirror of
https://github.com/ninxsoft/Mist.git
synced 2025-05-30 15:05:18 -04:00
Add beta ribbon to macOS image in download view
This commit is contained in:
parent
d44f185e5d
commit
4837dc37c7
4 changed files with 17 additions and 7 deletions
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -47,6 +47,7 @@ struct FirmwareListRow: View {
|
|||
name: firmware.name,
|
||||
version: firmware.version,
|
||||
build: firmware.build,
|
||||
beta: firmware.beta,
|
||||
destinationURL: savePanel.url,
|
||||
taskManager: taskManager
|
||||
)
|
||||
|
|
|
@ -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
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue