Show blocking progress while saving database changes

Author: crazytan

CHANGELOG.md

@@ -14,6 +14,7 @@
 
 ### Fixes
 - Autosave entry create/edit/delete changes immediately after they are staged, remove the confusing unlocked-screen save button, and show retry-only save UI when an autosave fails
+- Show a blocking saving-progress overlay while database changes are being written so users get clear feedback and cannot interact with the unlocked UI mid-save
 - Remove the baked white background from the Dropbox provider glyph so it renders cleanly in dark mode
 - Show provider-specific cloud sync status during unlock, and add focused unlock coverage for cloud sync success, fallback, and failure paths
 - Fix Xcode Cloud post-clone bootstrap so clean CI machines no longer require a developer team xcconfig value just to generate the project

KeeForge/App/KeeForgeApp.swift

@@ -299,6 +299,12 @@ struct DatabaseNavigationView: View {
                 }
             }
         }
+        .disabled(viewModel.isSaving)
+        .overlay {
+            if viewModel.isSaving {
+                DatabaseSavingOverlay()
+            }
+        }
         .saveConflictAlert(viewModel: viewModel)
         .onChange(of: viewModel.saveError) { _, newValue in
             if let newValue {
@@ -368,6 +374,39 @@ struct DatabaseNavigationView: View {
     }
 }
 
+private struct DatabaseSavingOverlay: View {
+    var body: some View {
+        ZStack {
+            Color.black.opacity(0.16)
+                .ignoresSafeArea()
+
+            VStack(spacing: 14) {
+                ProgressView()
+                    .controlSize(.large)
+
+                Text("Saving changes...")
+                    .font(.headline)
+
+                Text("KeeForge is writing the updated database securely.")
+                    .font(.subheadline)
+                    .foregroundStyle(.secondary)
+                    .multilineTextAlignment(.center)
+            }
+            .padding(.horizontal, 24)
+            .padding(.vertical, 22)
+            .frame(maxWidth: 280)
+            .background(
+                RoundedRectangle(cornerRadius: 24, style: .continuous)
+                    .fill(.regularMaterial)
+            )
+            .shadow(color: .black.opacity(0.08), radius: 24, y: 10)
+        }
+        .accessibilityElement(children: .combine)
+        .accessibilityLabel("Saving changes")
+        .accessibilityIdentifier("database.saving-overlay")
+    }
+}
+
 private struct ReadOnlyRibbon: View {
     var body: some View {
         Text("Read-only mode — toggle in the database list to enable editing.")

KeeForge/Views/EntryEditView.swift

@@ -16,6 +16,10 @@ struct EntryEditView: View {
     @State private var editingErrorMessage: String?
     @State private var isSubmitting = false
 
+    private var isSavingInProgress: Bool {
+        isSubmitting || databaseViewModel.isSaving
+    }
+
     init(
         formViewModel: EntryEditViewModel,
         databaseViewModel: DatabaseViewModel,
@@ -113,23 +117,49 @@ struct EntryEditView: View {
         .navigationTitle(navigationTitle)
         .navigationBarTitleDisplayMode(.inline)
         .navigationBarBackButtonHidden(true)
+        .disabled(isSavingInProgress)
         .toolbar {
             ToolbarItem(placement: .cancellationAction) {
                 Button("Cancel") {
                     cancelTapped()
                 }
-                .disabled(isSubmitting)
+                .disabled(isSavingInProgress)
                 .accessibilityIdentifier("entry-edit.cancel")
             }
 
             ToolbarItem(placement: .confirmationAction) {
                 Button("Save") {
                     saveTapped()
                 }
-                .disabled(formViewModel.canSave == false || isSubmitting)
+                .disabled(formViewModel.canSave == false || isSavingInProgress)
                 .accessibilityIdentifier("entry-edit.save")
             }
         }
+        .overlay {
+            if isSubmitting && databaseViewModel.isSaving == false {
+                ZStack {
+                    Color.black.opacity(0.14)
+                        .ignoresSafeArea()
+
+                    VStack(spacing: 12) {
+                        ProgressView()
+                            .controlSize(.large)
+                        Text("Saving changes...")
+                            .font(.headline)
+                    }
+                    .padding(.horizontal, 24)
+                    .padding(.vertical, 20)
+                    .background(
+                        RoundedRectangle(cornerRadius: 22, style: .continuous)
+                            .fill(.regularMaterial)
+                    )
+                    .shadow(color: .black.opacity(0.08), radius: 20, y: 8)
+                }
+                .accessibilityElement(children: .combine)
+                .accessibilityLabel("Saving changes")
+                .accessibilityIdentifier("entry-edit.saving-overlay")
+            }
+        }
         .sheet(isPresented: $showPasswordGenerator) {
             PasswordGeneratorSheet { password in
                 formViewModel.password = password