chore: improve edit toolbar

Author: chenx-dust

EasyTier.xcodeproj/project.pbxproj

@@ -621,7 +621,7 @@
 				CODE_SIGN_ENTITLEMENTS = EasyTier/EasyTier.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = M2G6355ZK7;
 				ENABLE_APP_SANDBOX = YES;
@@ -688,7 +688,7 @@
 				CODE_SIGN_ENTITLEMENTS = EasyTier/EasyTier.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = M2G6355ZK7;
 				ENABLE_APP_SANDBOX = YES;
@@ -802,7 +802,7 @@
 				CODE_SIGN_ENTITLEMENTS = EasyTierNetworkExtension/EasyTierNetworkExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = M2G6355ZK7;
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -880,7 +880,7 @@
 				CODE_SIGN_ENTITLEMENTS = EasyTierNetworkExtension/EasyTierNetworkExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = M2G6355ZK7;
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -961,7 +961,7 @@
 				CODE_SIGN_ENTITLEMENTS = EasyTierWidgetExtension/EasyTierWidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = M2G6355ZK7;
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -1014,7 +1014,7 @@
 				CODE_SIGN_ENTITLEMENTS = EasyTierWidgetExtension/EasyTierWidgetExtension.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = M2G6355ZK7;
 				ENABLE_APP_SANDBOX = YES;
 				ENABLE_HARDENED_RUNTIME = YES;

EasyTier/Views/DashboardView.swift

@@ -14,6 +14,21 @@ private struct ProfileTextDraft: Identifiable {
     let text: String
 }
 
+private struct EditModeAwareConfirmationButton: View {
+    @Environment(\.editMode) private var editMode
+
+    let action: () -> Void
+
+    var body: some View {
+        if editMode?.wrappedValue.isEditing != true {
+            Button(action: action) {
+                Image(systemName: "checkmark")
+            }
+            .buttonStyle(.borderedProminent)
+        }
+    }
+}
+
 private struct ProfileTextEditor: View {
     @State private var text: String
 
@@ -56,12 +71,11 @@ struct DashboardView<Manager: NetworkExtensionManagerProtocol>: View {
     @ObservedObject var selectedSession: SelectedProfileSession
 
     @AppStorage("selectedProfileName", store: UserDefaults(suiteName: APP_GROUP_ID)) var lastSelected: String?
-    
+
     @State var currentProfile = NetworkProfile()
     @State var isLocalPending = false
 
     @State var showManageSheet = false
-
     @State var showNewNetworkAlert = false
     @State var newNetworkInput = ""
     @State var showEditConfigNameAlert = false
@@ -80,7 +94,7 @@ struct DashboardView<Manager: NetworkExtensionManagerProtocol>: View {
     @State var conflictDetails: String = ""
 
     @State var darwinObserver: DarwinNotificationObserver? = nil
-    @State private var autoSaveTask: Task<Void, Never>? = nil
+    @State var autoSaveTask: Task<Void, Never>? = nil
 
     init(manager: Manager, selectedSession: SelectedProfileSession) {
         _manager = ObservedObject(wrappedValue: manager)
@@ -296,12 +310,9 @@ struct DashboardView<Manager: NetworkExtensionManagerProtocol>: View {
             .adaptiveNavigationBarTitleInline()
             .toolbar {
                 ToolbarItem(placement: .confirmationAction) {
-                    Button {
+                    EditModeAwareConfirmationButton {
                         showManageSheet = false
-                    } label: {
-                        Image(systemName: "checkmark")
                     }
-                    .buttonStyle(.borderedProminent)
                 }
             }
             .listEditingToolbar(

EasyTier/Views/NetworkEditView.swift

@@ -49,7 +49,6 @@ struct NetworkEditView: View {
             .formStyle(.grouped)
 #endif
         }
-        .listEditingToolbar(isVisible: !profile.peerConfigs.isEmpty)
     }
 
     var secondaryColumn: some View {