Improve dashboard
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
import Foundation
|
||||
import Library
|
||||
import SwiftUI
|
||||
#if canImport(UIKit)
|
||||
#if os(iOS)
|
||||
import UIKit
|
||||
#elseif canImport(AppKit)
|
||||
#elseif os(macOS)
|
||||
import AppKit
|
||||
#endif
|
||||
|
||||
@@ -43,7 +43,7 @@ public struct ShareButtonCompat<Label>: View where Label: View {
|
||||
|
||||
@Binding private var alert: Alert?
|
||||
|
||||
#if canImport(AppKit)
|
||||
#if os(macOS)
|
||||
@State private var sharePresented = false
|
||||
#endif
|
||||
|
||||
@@ -55,22 +55,22 @@ public struct ShareButtonCompat<Label>: View where Label: View {
|
||||
|
||||
public var body: some View {
|
||||
Button(action: shareItem, label: label)
|
||||
#if canImport(AppKit)
|
||||
#if os(macOS)
|
||||
.background(SharingServicePicker($sharePresented, $alert, itemURL))
|
||||
#endif
|
||||
}
|
||||
|
||||
private func shareItem() {
|
||||
#if canImport(UIKit)
|
||||
#if os(iOS)
|
||||
Task.detached {
|
||||
shareItem0()
|
||||
}
|
||||
#elseif canImport(AppKit)
|
||||
#elseif os(macOS)
|
||||
sharePresented = true
|
||||
#endif
|
||||
}
|
||||
|
||||
#if canImport(UIKit)
|
||||
#if os(iOS)
|
||||
private func shareItem0() {
|
||||
do {
|
||||
let shareItem = try itemURL()
|
||||
@@ -86,13 +86,13 @@ public struct ShareButtonCompat<Label>: View where Label: View {
|
||||
|
||||
private func shareItem1(_ item: URL) {
|
||||
if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene {
|
||||
try windowScene.keyWindow?.rootViewController?.present(UIActivityViewController(activityItems: [item], applicationActivities: nil), animated: true, completion: nil)
|
||||
windowScene.keyWindow?.rootViewController?.present(UIActivityViewController(activityItems: [item], applicationActivities: nil), animated: true, completion: nil)
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#if canImport(AppKit)
|
||||
#if os(macOS)
|
||||
private struct SharingServicePicker: NSViewRepresentable {
|
||||
@Binding private var isPresented: Bool
|
||||
@Binding private var alert: Alert?
|
||||
|
||||
@@ -48,7 +48,7 @@ public struct ExtensionStatusView: View {
|
||||
StatusLine("Uplink", "\(LibboxFormatBytes(message.uplink))/s")
|
||||
StatusLine("Downlink", "\(LibboxFormatBytes(message.downlink))/s")
|
||||
}
|
||||
StatusItem("TrafficTotal") {
|
||||
StatusItem("Traffic Total") {
|
||||
StatusLine("Uplink", LibboxFormatBytes(message.uplinkTotal))
|
||||
StatusLine("Downlink", LibboxFormatBytes(message.downlinkTotal))
|
||||
}
|
||||
|
||||
@@ -36,7 +36,7 @@ public struct GroupItemView: View {
|
||||
}
|
||||
Spacer(minLength: 8)
|
||||
HStack {
|
||||
Text(item.type)
|
||||
Text(item.displayType)
|
||||
.font(.caption)
|
||||
.foregroundColor(.secondary)
|
||||
Spacer(minLength: 0)
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import Foundation
|
||||
import Libbox
|
||||
import SwiftUI
|
||||
|
||||
public struct OutboundGroup: Codable {
|
||||
@@ -20,13 +21,6 @@ public struct OutboundGroup: Codable {
|
||||
|
||||
public extension OutboundGroup {
|
||||
var displayType: String {
|
||||
switch type {
|
||||
case "selector":
|
||||
return "Selector"
|
||||
case "urltest":
|
||||
return "URLTest"
|
||||
default:
|
||||
return "Unknown"
|
||||
}
|
||||
LibboxProxyDisplayType(type)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import Foundation
|
||||
import Libbox
|
||||
import SwiftUI
|
||||
|
||||
public struct OutboundGroupItem: Codable {
|
||||
@@ -10,6 +11,10 @@ public struct OutboundGroupItem: Codable {
|
||||
}
|
||||
|
||||
public extension OutboundGroupItem {
|
||||
var displayType: String {
|
||||
LibboxProxyDisplayType(type)
|
||||
}
|
||||
|
||||
var delayString: String {
|
||||
"\(urlTestDelay)ms"
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<key>ApplicationLibrary.xcscheme_^#shared#^_</key>
|
||||
<dict>
|
||||
<key>orderHint</key>
|
||||
<integer>5</integer>
|
||||
<integer>6</integer>
|
||||
</dict>
|
||||
<key>Associations (Playground) 1.xcscheme</key>
|
||||
<dict>
|
||||
@@ -69,7 +69,7 @@
|
||||
<key>MacLibrary.xcscheme_^#shared#^_</key>
|
||||
<dict>
|
||||
<key>orderHint</key>
|
||||
<integer>2</integer>
|
||||
<integer>5</integer>
|
||||
</dict>
|
||||
<key>MessageExtension.xcscheme_^#shared#^_</key>
|
||||
<dict>
|
||||
@@ -131,7 +131,7 @@
|
||||
<key>SFM.System.xcscheme_^#shared#^_</key>
|
||||
<dict>
|
||||
<key>orderHint</key>
|
||||
<integer>6</integer>
|
||||
<integer>2</integer>
|
||||
</dict>
|
||||
<key>SFM.xcscheme</key>
|
||||
<dict>
|
||||
|
||||
Reference in New Issue
Block a user