jlengrand/5GUIs-1
1
0
Fork 0
mirror of https://github.com/jlengrand/5GUIs-1.git synced 2026-03-10 08:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve details popover

Browse Source 
...
This commit is contained in:
Helge Heß
2020-10-05 16:54:33 +02:00
parent 6adcfab1cf
commit 3662fd3b1e
3 changed files with 94 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
5GUIs.xcodeproj/project.pbxproj
View File

@@ -11,6 +11,7 @@
E83E32C225220277009BE980 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E83E32C125220277009BE980 /* Preview Assets.xcassets */; };
E83E32C525220277009BE980 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E83E32C325220277009BE980 /* Main.storyboard */; };
E88C60C6252B482B008B3272 /* DetectedTechnologies.swift in Sources */ = {isa = PBXBuildFile; fileRef = E88C60C5252B482B008B3272 /* DetectedTechnologies.swift */; };
E8E01B6F252B6A8A005B7CCF /* PropertiesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8E01B6E252B6A8A005B7CCF /* PropertiesView.swift */; };
E8F1C3F72524EAFB000B517B /* LLVM-LICENSE.TXT in Resources */ = {isa = PBXBuildFile; fileRef = E8F1C3F62524EAFB000B517B /* LLVM-LICENSE.TXT */; };
E8F1C41C25260051000B517B /* OTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8F1C40225260051000B517B /* OTool.swift */; };
E8F1C41D25260051000B517B /* WindowEnvironmentKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8F1C40325260051000B517B /* WindowEnvironmentKey.swift */; };
@@ -46,6 +47,7 @@
E83E32C625220277009BE980 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
E83E32C725220277009BE980 /* _GUIs.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = _GUIs.entitlements; sourceTree = "<group>"; };
E88C60C5252B482B008B3272 /* DetectedTechnologies.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetectedTechnologies.swift; sourceTree = "<group>"; };
E8E01B6E252B6A8A005B7CCF /* PropertiesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PropertiesView.swift; sourceTree = "<group>"; };
E8E5B7572526299400FF9B14 /* llvm-objdump.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "llvm-objdump.entitlements"; sourceTree = "<group>"; };
E8F1C3D82524BA3F000B517B /* llvm-objdump */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = "llvm-objdump"; sourceTree = "<group>"; };
E8F1C3F62524EAFB000B517B /* LLVM-LICENSE.TXT */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "LLVM-LICENSE.TXT"; sourceTree = "<group>"; };
@@ -187,6 +189,7 @@
isa = PBXGroup;
children = (
E8F1C40925260051000B517B /* SpinnerView.swift */,
E8E01B6E252B6A8A005B7CCF /* PropertiesView.swift */,
);
path = Reusable;
sourceTree = "<group>";
@@ -347,6 +350,7 @@
E8F1C42625260051000B517B /* ThirdPartyLicensesView.swift in Sources */,
E8F1C42D25260051000B517B /* FakeDetectionStepper.swift in Sources */,
E8F1C42425260051000B517B /* DetectionStepsView.swift in Sources */,
E8E01B6F252B6A8A005B7CCF /* PropertiesView.swift in Sources */,
E8F1C42A25260051000B517B /* MainFileView.swift in Sources */,
E8F1C42225260051000B517B /* SpinnerView.swift in Sources */,
E8F1C42325260051000B517B /* PleaseDropAFileView.swift in Sources */,

55
Sources/5GUIs/Views/Reusable/PropertiesView.swift Normal file
View File

@@ -0,0 +1,55 @@
//
// PropertiesView.swift
// 5GUIs
//
// Created by Helge Heß on 05.10.20.
//
import SwiftUI
struct PropertyLine: View {
let name : String
let value : Any?
var showMissing : Bool { false }
var body: some View {
Group {
if showMissing {
HStack {
Text(name + ": ")
Spacer()
if let value = value {
Text(verbatim: String(describing: value))
}
else {
Text("-")
}
}
}
else {
if let value = value {
HStack {
Text(name + ": ")
Spacer()
Text(verbatim: String(describing: value))
}
}
}
}
}
}
struct PropertiesView: View {
let properties : [ ( name: String, value: Any? ) ]
var body: some View {
Group {
ForEach(properties, id: \.name) { item in
PropertyLine(name: item.name, value: item.value)
}
}
}
}

43
Sources/5GUIs/Views/Windows/MainWindow/DetailsPopover.swift
View File

@@ -26,12 +26,14 @@ struct DetailsPopover: View {
.padding()
VStack(alignment: .leading, spacing: 4) {
info.id .flatMap { Text("ID: \($0)") }
info.name .flatMap { Text("Name: \($0)") }
info.info .flatMap { Text("Info: \($0)") }
info.version .flatMap { Text("Version: \($0)") }
info.shortVersion .flatMap { Text("Short Version: \($0)") }
info.applicationCategory.flatMap { Text("App Category: \($0)") }
PropertiesView(properties: [
( "Bundle ID", info.id ),
( "Name", info.name ),
( "Info", info.info ),
( "Version", info.version ),
( "Short Version", info.shortVersion ),
( "Application Category", info.applicationCategory ),
])
if info.appleScriptEnabled {
Text("Fancy, AppleScript is enabled!")
}
@@ -81,9 +83,8 @@ struct DetailsPopover: View {
else {
Text("No Bundle Info?")
}
if let url = info.executableURL {
Text("Executable: \(url.path)")
PropertyLine(name: "Executable", value: url.path)
}
if hasReceipt {
@@ -99,3 +100,29 @@ struct DetailsPopover: View {
}
}
}
struct DetailsPopover_Previews: PreviewProvider {
static var previews: some View {
DetailsPopover(info:
ExecutableFileTechnologyInfo(
fileURL: URL(fileURLWithPath: "/Applications/Xcode.app"),
infoDictionary: InfoDict([
"CFBundleIdentifier" : "blub.blab.blum",
"CFBundleName" : "VisualStudio"
]),
executableURL: URL(fileURLWithPath:
"/Applications/Xcode.app/Contents/MacOS/VisualStudio"),
receiptURL: nil,
appImage: nil,
dependencies: [
"@rpath/DVTCocoaAdditionsKit.framework/Versions/A/DVTCocoaAdditionsKit",
"/usr/lib/libobjc.A.dylib",
"/usr/lib/swift/libswiftUniformTypeIdentifiers.dylib",
"/usr/lib/swift/libswiftXPC.dylib"
],
embeddedExecutables: [],
detectedTechnologies: [ .appkit, .swift ]
)
)
}
}