phpmon/app
1
0
Fork 0
mirror of https://github.com/nicoverbruggen/phpmon.git synced 2025-08-07 03:50:08 +02:00
Code Releases Activity

👌 Improve progress view

Browse Source
This commit is contained in:
Nico Verbruggen
2023-03-13 23:23:22 +01:00
parent 016f36a8fd
commit 34e9e3f829
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
phpmon/Common/PHP/PhpVersionInstaller.swift
View File

@ -84,9 +84,10 @@ public class PhpVersionInstaller {
didReceiveOutput: { text, _ in
if action == .install {
// Check if we can recognize any of the typical progress steps
if let number = Self.reportInstallationProgress(text) {
if let (number, text) = Self.reportInstallationProgress(text) {
Task { @MainActor in
subject.progress = number
subject.description = text
}
}
}
@ -127,24 +128,24 @@ public class PhpVersionInstaller {
await self.modifyPhpVersion(version: version, action: .remove)
}
private static func reportInstallationProgress(_ text: String) -> Double? {
private static func reportInstallationProgress(_ text: String) -> (Double, String)? {
if text.contains("Fetching") {
return 0.1
return (0.1, "Fetching...")
}
if text.contains("Downloading") {
return 0.25
return (0.25, "Downloading...")
}
if text.contains("Already downloaded") || text.contains("Downloaded") {
return 0.50
return (0.50, "Downloaded!")
}
if text.contains("Installing") {
return 0.60
return (0.60, "Installing...")
}
if text.contains("Pouring") {
return 0.80
return (0.80, "Pouring... this can take a while!")
}
if text.contains("Summary") {
return 1
return (1, "The installation is done!")
}
return nil
}

11
phpmon/Domain/SwiftUI/Progress/ProgressWindowView.swift
View File

@ -15,16 +15,19 @@ struct ProgressWindowView: View {
VStack(alignment: .leading) {
VStack(alignment: .leading) {
Text(subject.title)
.font(.system(size: 15))
.font(.system(size: 14))
.bold()
if subject.description != nil {
Text(subject.description!)
.font(.system(size: 14))
.font(.system(size: 13))
}
}
.padding(.leading, 20)
.padding(.top, 20)
ProgressView(value: subject.progress).padding()
.padding(.top, 12)
ProgressView(value: subject.progress)
.padding(.top, 0)
.padding(.bottom, 12)
.padding(.horizontal, 20)
}
}