icybear/sing-box-for-apple
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve Start/Stop button

Browse Source
This commit is contained in:
世界
2025-11-26 22:25:52 +08:00
parent 32f5bf1f3b
commit 4f0d1098e6
10 changed files with 176 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibrary/Views/Abstract/NavigationStackCompat.swift
+1 -1
View File
@@ -2,7 +2,7 @@ import SwiftUI
public func NavigationStackCompat(@ViewBuilder content: () -> some View) -> some View {
viewBuilder {
if #available(iOS 17.0, *) {
if #available(iOS 17.0, macOS 13.0, tvOS 17.0, *) {
// view not updating in iOS 16, but why?
NavigationStack {
content()
ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift
+5 -1
View File
@@ -144,7 +144,11 @@ public struct ActiveDashboardView: View {
}
}
ToolbarItem(placement: .topBarTrailing) {
StartStopButton()
if #available(iOS 26.0, *), !Variant.debugNoIOS26 {
EmptyView()
} else {
StartStopButton()
}
}
}
#endif
ApplicationLibrary/Views/Dashboard/Cards/CardManagementSheet.swift
+10 -11
View File
@@ -2,6 +2,7 @@ import Library
import SwiftUI
@MainActor public struct CardManagementSheet: View {
@Environment(\.dismiss) private var dismiss
@StateObject private var configuration = DashboardCardConfiguration()
@Binding private var configurationVersion: Int
@@ -33,7 +34,7 @@ import SwiftUI
}
}
#else
ToolbarItem(placement: .automatic) {
ToolbarItem(placement: .cancellationAction) {
Button("Reset", role: .destructive) {
Task {
await configuration.resetToDefault()
@@ -41,6 +42,11 @@ import SwiftUI
}
}
}
ToolbarItem(placement: .confirmationAction) {
Button("Done") {
dismiss()
}
}
#endif
}
}
@@ -78,18 +84,11 @@ private struct CardRow: View {
.foregroundColor(.secondary)
.imageScale(.small)
if isProfileCard {
Toggle(isOn: isToggleEnabled) {
Label(card.title, systemImage: card.systemImage)
Spacer()
Text("Required")
.font(.footnote)
.foregroundColor(.secondary)
} else {
Toggle(isOn: isToggleEnabled) {
Label(card.title, systemImage: card.systemImage)
}
.opacity(isEnabled ? 1.0 : 0.5)
}
.disabled(isProfileCard)
.opacity(isEnabled ? 1.0 : 0.5)
}
}
ApplicationLibrary/Views/Dashboard/Components/StartStopButton.swift
+41 -4
View File
@@ -32,6 +32,9 @@ public struct StartStopButton: View {
@EnvironmentObject private var environments: ExtensionEnvironments
@EnvironmentObject private var profile: ExtensionProfile
@State private var alert: Alert?
@State private var currentTime = Date()
private let timer = Timer.publish(every: 1, on: .main, in: .common).autoconnect()
var body: some View {
Button {
@@ -39,15 +42,49 @@ public struct StartStopButton: View {
await switchProfile(!profile.status.isConnected)
}
} label: {
if !profile.status.isConnected {
Label("Start", systemImage: "play.fill")
} else {
Label("Stop", systemImage: "stop.fill")
HStack(spacing: 8) {
if profile.status.isConnectedStrict, let duration = runtimeDuration {
Text(duration)
.font(.caption)
.foregroundStyle(.secondary)
.monospacedDigit()
.transition(.asymmetric(
insertion: .move(edge: .trailing).combined(with: .opacity),
removal: .move(edge: .trailing).combined(with: .opacity)
))
}
if !profile.status.isConnected {
Label("Start", systemImage: "play.fill")
} else {
Label("Stop", systemImage: "stop.fill")
}
}
.animation(.spring(response: 0.35, dampingFraction: 0.75), value: profile.status.isConnectedStrict)
}
.labelStyle(.iconOnly)
.tint(.primary)
.disabled(!profile.status.isEnabled)
.alertBinding($alert)
.onReceive(timer) { _ in
currentTime = Date()
}
}
private var runtimeDuration: String? {
guard let connectedDate = profile.connectedDate else { return nil }
let interval = currentTime.timeIntervalSince(connectedDate)
guard interval >= 0 else { return nil }
let hours = Int(interval) / 3600
let minutes = Int(interval) / 60 % 60
let seconds = Int(interval) % 60
if hours > 0 {
return String(format: "%d:%02d:%02d", hours, minutes, seconds)
} else {
return String(format: "%d:%02d", minutes, seconds)
}
}
private nonisolated func switchProfile(_ isEnabled: Bool) async {
ApplicationLibrary/Views/Dashboard/Overview/OverviewView.swift
+3 -1
View File
@@ -32,7 +32,9 @@ public struct OverviewView: View {
public var body: some View {
Group {
if profileList.isEmpty {
if configuration.isLoading {
ProgressView()
} else if profileList.isEmpty {
VStack {
Spacer()
Text("Empty profiles")
Library/Network/ExtensionProfile.swift
+3
View File
@@ -10,11 +10,13 @@ public class ExtensionProfile: ObservableObject {
private var observer: Any?
@Published public var status: NEVPNStatus
@Published public var connectedDate: Date?
public init(_ manager: NEVPNManager) {
self.manager = manager
connection = manager.connection
status = manager.connection.status
connectedDate = manager.connection.connectedDate
}
public func register() {
@@ -28,6 +30,7 @@ public class ExtensionProfile: ObservableObject {
}
self.connection = notification.object as! NEVPNConnection
self.status = self.connection.status
self.connectedDate = self.connection.connectedDate
}
}
Library/Shared/Variant.swift
+5
View File
@@ -17,4 +17,9 @@ public enum Variant {
#endif
public static var isBeta = LibboxVersion().contains("-")
#if os(iOS)
public static var debugNoIOS26 = false
public static var debugNoIOS18 = false
#endif
}
Localizable.xcstrings
+3
View File
@@ -527,6 +527,9 @@
}
}
}
},
"Done" : {
},
"Downlink" : {
"localizations" : {
MacLibrary/MainView.swift
+8 -4
View File
@@ -35,10 +35,14 @@ public struct MainView: View {
}
if viewModel.selection == .dashboard {
ToolbarItem(placement: .automatic) {
Button {
showCardManagement = true
Menu {
Button {
showCardManagement = true
} label: {
Label("Dashboard Items", systemImage: "square.grid.2x2")
}
} label: {
Label("Dashboard Items", systemImage: "square.grid.2x2")
Label("Others", systemImage: "ellipsis.circle")
}
}
}
@@ -59,7 +63,7 @@ public struct MainView: View {
.onOpenURL(perform: viewModel.openURL)
.sheet(isPresented: $showCardManagement) {
CardManagementSheet(configurationVersion: $cardConfigurationVersion)
.presentationDetents([.medium, .large])
.frame(minWidth: 400, minHeight: 400)
}
}
}
SFI/MainView.swift
+97 -23
View File
@@ -1,6 +1,7 @@
import ApplicationLibrary
import Libbox
import Library
import NetworkExtension
import SwiftUI
struct MainView: View {
@@ -21,35 +22,108 @@ struct MainView: View {
}
var body1: some View {
TabView(selection: $selection) {
ForEach(NavigationPage.allCases, id: \.self) { page in
NavigationStackCompat {
page.contentView
.navigationTitle(page.title)
viewBuilder {
if #available(iOS 26.0, *), !Variant.debugNoIOS26 {
TabView(selection: $selection) {
ForEach(NavigationPage.allCases, id: \.self) { page in
NavigationStackCompat {
page.contentView
.navigationTitle(page.title)
}
.tag(page)
.tabItem { page.label }
}
}
.tag(page)
.tabItem { page.label }
.tabViewBottomAccessory {
HStack(spacing: 12) {
if let profile = environments.extensionProfile {
StatusText(profile: profile)
}
Spacer()
StartStopButton()
}
.padding(.horizontal)
}
.onAppear {
environments.postReload()
}
.alertBinding($alert)
.onChangeCompat(of: scenePhase) { newValue in
if newValue == .active {
environments.postReload()
}
}
.onChangeCompat(of: selection) { newValue in
if newValue == .logs {
environments.connect()
}
}
.environment(\.selection, $selection)
.environment(\.importProfile, $importProfile)
.environment(\.importRemoteProfile, $importRemoteProfile)
.handlesExternalEvents(preferring: [], allowing: ["*"])
.onOpenURL(perform: openURL)
} else {
TabView(selection: $selection) {
ForEach(NavigationPage.allCases, id: \.self) { page in
NavigationStackCompat {
page.contentView
.navigationTitle(page.title)
}
.tag(page)
.tabItem { page.label }
}
}
.onAppear {
environments.postReload()
}
.alertBinding($alert)
.onChangeCompat(of: scenePhase) { newValue in
if newValue == .active {
environments.postReload()
}
}
.onChangeCompat(of: selection) { newValue in
if newValue == .logs {
environments.connect()
}
}
.environment(\.selection, $selection)
.environment(\.importProfile, $importProfile)
.environment(\.importRemoteProfile, $importRemoteProfile)
.handlesExternalEvents(preferring: [], allowing: ["*"])
.onOpenURL(perform: openURL)
}
}
.onAppear {
environments.postReload()
}
private struct StatusText: View {
@ObservedObject var profile: ExtensionProfile
var body: some View {
Text(statusText)
.font(.subheadline)
.foregroundStyle(.secondary)
}
.alertBinding($alert)
.onChangeCompat(of: scenePhase) { newValue in
if newValue == .active {
environments.postReload()
private var statusText: String {
switch profile.status {
case .invalid:
return "Invalid"
case .disconnected:
return "Stopped"
case .connecting:
return "Starting"
case .connected:
return "Started"
case .reasserting:
return "Reasserting"
case .disconnecting:
return "Stopping"
@unknown default:
return "Unknown"
}
}
.onChangeCompat(of: selection) { newValue in
if newValue == .logs {
environments.connect()
}
}
.environment(\.selection, $selection)
.environment(\.importProfile, $importProfile)
.environment(\.importRemoteProfile, $importRemoteProfile)
.handlesExternalEvents(preferring: [], allowing: ["*"])
.onOpenURL(perform: openURL)
}
private func openURL(url: URL) {