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

Hide connections page by default since unstable

Browse Source
This commit is contained in:
世界
2024-10-06 21:41:14 +08:00
parent 0a456131ea
commit 5e2af0a5c7
10 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibrary/Views/Connections/ConnectionListView.swift
-1
View File
@@ -8,7 +8,6 @@ public struct ConnectionListView: View {
@State private var isLoading = true @State private var isLoading = true
@StateObject private var commandClient = CommandClient(.connections) @StateObject private var commandClient = CommandClient(.connections)
@State private var connections: [Connection] = [] @State private var connections: [Connection] = []
@State private var selection: ConnectionListPage = .active
@State private var searchText = "" @State private var searchText = ""
@State private var alert: Alert? @State private var alert: Alert?
ApplicationLibrary/Views/Connections/ConnectionView.swift
+2 -2
View File
@@ -67,7 +67,7 @@ public struct ConnectionView: View {
Spacer() Spacer()
VStack(alignment: .trailing) { VStack(alignment: .trailing) {
Text(connection.inboundType + "/" + connection.inbound) Text(connection.inboundType + "/" + connection.inbound)
Text(connection.chain.reversed().joined(separator: "/")) Text(connection.chain[0])
} }
} }
} }
@@ -111,7 +111,7 @@ public struct ConnectionView: View {
private nonisolated func closeConnection() async { private nonisolated func closeConnection() async {
do { do {
try LibboxNewStandaloneCommandClient()!.closeConnection(connection.id) try await LibboxNewStandaloneCommandClient()!.closeConnection(connection.id)
} catch { } catch {
await MainActor.run { await MainActor.run {
alert = Alert(error) alert = Alert(error)
ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift
+2 -2
View File
@@ -51,7 +51,7 @@ public struct ActiveDashboardView: View {
#if os(iOS) || os(tvOS) #if os(iOS) || os(tvOS)
if ApplicationLibrary.inPreview || profile.status.isConnectedStrict { if ApplicationLibrary.inPreview || profile.status.isConnectedStrict {
Picker("Page", selection: $selection) { Picker("Page", selection: $selection) {
ForEach(DashboardPage.allCases) { page in ForEach(DashboardPage.enabledCases()) { page in
page.label page.label
} }
} }
@@ -61,7 +61,7 @@ public struct ActiveDashboardView: View {
.navigationBarTitleDisplayMode(.inline) .navigationBarTitleDisplayMode(.inline)
#endif #endif
TabView(selection: $selection) { TabView(selection: $selection) {
ForEach(DashboardPage.enabledCases) { page in ForEach(DashboardPage.enabledCases()) { page in
page.contentView($profileList, $selectedProfileID, $systemProxyAvailable, $systemProxyEnabled) page.contentView($profileList, $selectedProfileID, $systemProxyAvailable, $systemProxyEnabled)
.tag(page) .tag(page)
} }
ApplicationLibrary/Views/Dashboard/DashboardPage.swift
+9 -9
View File
@@ -13,18 +13,18 @@ public enum DashboardPage: Int, CaseIterable, Identifiable {
} }
public extension DashboardPage { public extension DashboardPage {
#if !tvOS static func enabledCases() -> [DashboardPage] {
static var enabledCases: [DashboardPage] = [ var cases: [DashboardPage] = [
.overview,
.groups,
.connections,
]
#else
static var enabledCases: [DashboardPage] = [
.overview, .overview,
.groups, .groups,
] ]
#endif #if !tvOS
if Variant.isBeta {
cases.append(.connections)
}
#endif
return cases
}
} }
public extension DashboardPage { public extension DashboardPage {
Library/Network/CommandClient.swift
+1 -1
View File
@@ -22,7 +22,7 @@ public class CommandClient: ObservableObject {
@Published public var clashModeList: [String] @Published public var clashModeList: [String]
@Published public var clashMode: String @Published public var clashMode: String
@Published public var connectionStateFilter = ConnectionStateFilter.all @Published public var connectionStateFilter = ConnectionStateFilter.active
@Published public var connectionSort = ConnectionSort.byDate @Published public var connectionSort = ConnectionSort.byDate
@Published public var connections: [LibboxConnection]? @Published public var connections: [LibboxConnection]?
public var rawConnections: LibboxConnections? public var rawConnections: LibboxConnections?
Library/Shared/Variant.swift
+3
View File
@@ -1,4 +1,5 @@
import Foundation import Foundation
import Libbox
public enum Variant { public enum Variant {
#if os(macOS) #if os(macOS)
@@ -14,4 +15,6 @@ public enum Variant {
#elseif os(tvOS) #elseif os(tvOS)
public static let applicationName = "SFT" public static let applicationName = "SFT"
#endif #endif
public static var isBeta = LibboxVersion().contains("-")
} }
MacLibrary/SidebarView.swift
+3 -1
View File
@@ -35,7 +35,9 @@ public struct SidebarView: View {
.tint(.textColor) .tint(.textColor)
.tag(NavigationPage.dashboard) .tag(NavigationPage.dashboard)
NavigationPage.groups.label.tag(NavigationPage.groups) NavigationPage.groups.label.tag(NavigationPage.groups)
NavigationPage.connections.label.tag(NavigationPage.connections) if Variant.isBeta {
NavigationPage.connections.label.tag(NavigationPage.connections)
}
} }
Divider() Divider()
ForEach(NavigationPage.macosDefaultPages, id: \.self) { it in ForEach(NavigationPage.macosDefaultPages, id: \.self) { it in
SFM.System/Application.swift
+1 -1
View File
@@ -4,7 +4,7 @@ import SwiftUI
@main @main
struct Application: App { struct Application: App {
@NSApplicationDelegateAdaptor private var appDelegate: IndependentApplicationDelegate @NSApplicationDelegateAdaptor private var appDelegate: StandaloneApplicationDelegate
var body: some Scene { var body: some Scene {
MacApplication() MacApplication()
SFM.System/IndependentApplicationDelegate.swift → SFM.System/StandaloneApplicationDelegate.swift
+2 -1
View File
@@ -3,9 +3,10 @@ import Foundation
import Library import Library
import MacLibrary import MacLibrary
class IndependentApplicationDelegate: ApplicationDelegate { class StandaloneApplicationDelegate: ApplicationDelegate {
public func applicationWillFinishLaunching(_: Notification) { public func applicationWillFinishLaunching(_: Notification) {
Variant.useSystemExtension = true Variant.useSystemExtension = true
Variant.isBeta = false
Task { Task {
await setupSystemExtension() await setupSystemExtension()
} }
sing-box.xcodeproj/project.pbxproj
+4 -4
View File
@@ -23,7 +23,7 @@
3A251C122A52D09700651082 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3AAB5E7A2A4C1446009757F1 /* Assets.xcassets */; }; 3A251C122A52D09700651082 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3AAB5E7A2A4C1446009757F1 /* Assets.xcassets */; };
3A27D9002A89BE230031EBCC /* CommandClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A27D8FF2A89BE230031EBCC /* CommandClient.swift */; }; 3A27D9002A89BE230031EBCC /* CommandClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A27D8FF2A89BE230031EBCC /* CommandClient.swift */; };
3A27D9022A89C6870031EBCC /* ExtensionEnvironments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A27D9012A89C6870031EBCC /* ExtensionEnvironments.swift */; }; 3A27D9022A89C6870031EBCC /* ExtensionEnvironments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A27D9012A89C6870031EBCC /* ExtensionEnvironments.swift */; };
3A2EAEED2A6F4CBB00D00DE3 /* IndependentApplicationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A2EAEEC2A6F4CBB00D00DE3 /* IndependentApplicationDelegate.swift */; }; 3A2EAEED2A6F4CBB00D00DE3 /* StandaloneApplicationDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A2EAEEC2A6F4CBB00D00DE3 /* StandaloneApplicationDelegate.swift */; };
3A2F29EB2C998A5D007E024C /* Export.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3A2F29EA2C998A5D007E024C /* Export.plist */; }; 3A2F29EB2C998A5D007E024C /* Export.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3A2F29EA2C998A5D007E024C /* Export.plist */; };
3A334ED02C0F621E00E9C577 /* ConnectionDetailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A334ECF2C0F621E00E9C577 /* ConnectionDetailsView.swift */; }; 3A334ED02C0F621E00E9C577 /* ConnectionDetailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A334ECF2C0F621E00E9C577 /* ConnectionDetailsView.swift */; };
3A3AA7FC2A4EFDAE002F78AB /* Library.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AEC211D2A459B4700A63465 /* Library.framework */; }; 3A3AA7FC2A4EFDAE002F78AB /* Library.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AEC211D2A459B4700A63465 /* Library.framework */; };
@@ -482,7 +482,7 @@
3A2223592A6E212A00C50B23 /* SystemExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemExtension.swift; sourceTree = "<group>"; }; 3A2223592A6E212A00C50B23 /* SystemExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemExtension.swift; sourceTree = "<group>"; };
3A27D8FF2A89BE230031EBCC /* CommandClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandClient.swift; sourceTree = "<group>"; }; 3A27D8FF2A89BE230031EBCC /* CommandClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandClient.swift; sourceTree = "<group>"; };
3A27D9012A89C6870031EBCC /* ExtensionEnvironments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionEnvironments.swift; sourceTree = "<group>"; }; 3A27D9012A89C6870031EBCC /* ExtensionEnvironments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExtensionEnvironments.swift; sourceTree = "<group>"; };
3A2EAEEC2A6F4CBB00D00DE3 /* IndependentApplicationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IndependentApplicationDelegate.swift; sourceTree = "<group>"; }; 3A2EAEEC2A6F4CBB00D00DE3 /* StandaloneApplicationDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StandaloneApplicationDelegate.swift; sourceTree = "<group>"; };
3A334ECF2C0F621E00E9C577 /* ConnectionDetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionDetailsView.swift; sourceTree = "<group>"; }; 3A334ECF2C0F621E00E9C577 /* ConnectionDetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionDetailsView.swift; sourceTree = "<group>"; };
3A2F29EA2C998A5D007E024C /* Export.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Export.plist; sourceTree = "<group>"; }; 3A2F29EA2C998A5D007E024C /* Export.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Export.plist; sourceTree = "<group>"; };
3A334ECF2C0F621E00E9C577 /* ConnectionDetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionDetailsView.swift; sourceTree = "<group>"; }; 3A334ECF2C0F621E00E9C577 /* ConnectionDetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionDetailsView.swift; sourceTree = "<group>"; };
@@ -1055,7 +1055,7 @@
3AEECC062A6DF9CA006A0E0C /* Application.swift */, 3AEECC062A6DF9CA006A0E0C /* Application.swift */,
3AEECC502A6E0074006A0E0C /* SFM.entitlements */, 3AEECC502A6E0074006A0E0C /* SFM.entitlements */,
3A2223532A6E1B6700C50B23 /* Info.plist */, 3A2223532A6E1B6700C50B23 /* Info.plist */,
3A2EAEEC2A6F4CBB00D00DE3 /* IndependentApplicationDelegate.swift */, 3A2EAEEC2A6F4CBB00D00DE3 /* StandaloneApplicationDelegate.swift */,
3AABFD462A9CCC58005A24A4 /* Upload.plist */, 3AABFD462A9CCC58005A24A4 /* Upload.plist */,
); );
path = SFM.System; path = SFM.System;
@@ -1741,7 +1741,7 @@
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
3AEECC072A6DF9CA006A0E0C /* Application.swift in Sources */, 3AEECC072A6DF9CA006A0E0C /* Application.swift in Sources */,
3A2EAEED2A6F4CBB00D00DE3 /* IndependentApplicationDelegate.swift in Sources */, 3A2EAEED2A6F4CBB00D00DE3 /* StandaloneApplicationDelegate.swift in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };