config(macOS): show progress indicator for long tasks

Resolves #4006
utmapp · Apr 30, 2024 · 5fc988f · 5fc988f
1 parent 7267f52
commit 5fc988f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/Platform/Shared/BusyIndicator.swift b/Platform/Shared/BusyIndicator.swift
@@ -17,13 +17,38 @@
 import SwiftUI
 
 struct BusyIndicator: View {
+ @Binding var progress: Float?
+
+ init(progress: Binding<Float?> = .constant(nil)) {
+ _progress = progress
+ }
+
  var body: some View {
- Spinner(size: .large)
+ progressView
  .frame(width: 100, height: 100, alignment: .center)
  .foregroundColor(.white)
  .background(Color.gray.opacity(0.5))
  .clipShape(RoundedRectangle(cornerRadius: 25.0, style: .continuous))
  }
+
+ #if os(macOS)
+ @ViewBuilder
+ private var progressView: some View {
+ if let progress = progress {
+ ProgressView(value: progress)
+ .progressViewStyle(.circular)
+ .controlSize(.large)
+ } else {
+ Spinner(size: .large)
+ }
+ }
+ #else
+ // TODO: implement progress spinner for iOS
+ @ViewBuilder
+ private var progressView: some View {
+ Spinner(size: .large)
+ }
+ #endif
 }
 
 struct BusyIndicator_Previews: PreviewProvider {

diff --git a/Platform/Shared/BusyOverlay.swift b/Platform/Shared/BusyOverlay.swift
@@ -22,7 +22,7 @@ struct BusyOverlay: View {
  var body: some View {
  Group {
  if data.busy {
- BusyIndicator()
+ BusyIndicator(progress: $data.busyProgress)
  } else {
  EmptyView()
  }

diff --git a/Platform/UTMData.swift b/Platform/UTMData.swift
@@ -66,6 +66,9 @@ struct AlertMessage: Identifiable {
  /// View: show busy spinner
  @Published var busy: Bool
 
+ /// View: show a percent progress in the busy spinner
+ @Published var busyProgress: Float?
+
  /// View: currently selected VM
  @Published var selectedVM: VMData?