From 92741260221813d593590e5849727eb25cd7948d Mon Sep 17 00:00:00 2001
From: InspectorIT <sshipunovv008@gmail.com>
Date: Sun, 1 Mar 2026 15:06:07 +0300
Subject: [PATCH 1/9] add the hasUnsavedChanges flag and implemented it

---
 .../ViewModels/UnlockedRepositoryViewModel.cs         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/KeyKeeper/ViewModels/UnlockedRepositoryViewModel.cs b/src/KeyKeeper/ViewModels/UnlockedRepositoryViewModel.cs
index fe37cd5..c6551db 100644
--- a/src/KeyKeeper/ViewModels/UnlockedRepositoryViewModel.cs
+++ b/src/KeyKeeper/ViewModels/UnlockedRepositoryViewModel.cs
@@ -8,6 +8,7 @@ namespace KeyKeeper.ViewModels;
 public class UnlockedRepositoryViewModel : ViewModelBase
 {
     private IPassStore passStore;
+    private bool hasUnsavedChanges;
 
     public IEnumerable<PassStoreEntryPassword> Passwords
     {
@@ -19,6 +20,16 @@ public class UnlockedRepositoryViewModel : ViewModelBase
         }
     }
 
+    public bool HasUnsavedChanges
+    {
+        get => hasUnsavedChanges;
+        private set
+        {
+            hasUnsavedChanges = value;
+            OnPropertyChanged(nameof(HasUnsavedChanges));
+        }
+    }
+
     public UnlockedRepositoryViewModel(IPassStore store)
     {
         passStore = store;

From eafa9fd558caaee46189533fab033e1cc433d1f5 Mon Sep 17 00:00:00 2001
From: InspectorIT <sshipunovv008@gmail.com>
Date: Sun, 1 Mar 2026 15:32:44 +0300
Subject: [PATCH 2/9] add the hasUnsavedChanges flag to the methods

---
 src/KeyKeeper/ViewModels/UnlockedRepositoryViewModel.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/KeyKeeper/ViewModels/UnlockedRepositoryViewModel.cs b/src/KeyKeeper/ViewModels/UnlockedRepositoryViewModel.cs
index c6551db..7458814 100644
--- a/src/KeyKeeper/ViewModels/UnlockedRepositoryViewModel.cs
+++ b/src/KeyKeeper/ViewModels/UnlockedRepositoryViewModel.cs
@@ -33,6 +33,7 @@ public class UnlockedRepositoryViewModel : ViewModelBase
     public UnlockedRepositoryViewModel(IPassStore store)
     {
         passStore = store;
+        HasUnsavedChanges = false;
     }
 
     public void AddEntry(PassStoreEntry entry)
@@ -40,6 +41,7 @@ public class UnlockedRepositoryViewModel : ViewModelBase
         if (entry is PassStoreEntryPassword)
         {
             (passStore.GetRootDirectory() as PassStoreEntryGroup)!.ChildEntries.Add(entry);
+            HasUnsavedChanges = true;
             OnPropertyChanged(nameof(Passwords));
         }
     }
@@ -47,11 +49,13 @@ public class UnlockedRepositoryViewModel : ViewModelBase
     public void DeleteEntry(Guid id)
     {
         (passStore.GetRootDirectory() as PassStoreEntryGroup)!.DeleteEntry(id);
+        HasUnsavedChanges = true;
         OnPropertyChanged(nameof(Passwords));
     }
 
     public void Save()
     {
         passStore.Save();
+        HasUnsavedChanges = false;
     }
 }
\ No newline at end of file

From 21a8688ad6a3c582b1241f79d0266029307558b8 Mon Sep 17 00:00:00 2001
From: InspectorIT <sshipunovv008@gmail.com>
Date: Sun, 1 Mar 2026 15:38:24 +0300
Subject: [PATCH 3/9] create CloseConfirmationDialog.axaml file

---
 src/KeyKeeper/Views/CloseConfirmationDialog.axaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 src/KeyKeeper/Views/CloseConfirmationDialog.axaml

diff --git a/src/KeyKeeper/Views/CloseConfirmationDialog.axaml b/src/KeyKeeper/Views/CloseConfirmationDialog.axaml
new file mode 100644
index 0000000..45dbbbc
--- /dev/null
+++ b/src/KeyKeeper/Views/CloseConfirmationDialog.axaml
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace KeyKeeper.Views
+{
+    class CloseConfirmationDialog
+    {
+    }
+}

From 13139ed297122eca4104c63c2a212ede8486978a Mon Sep 17 00:00:00 2001
From: InspectorIT <sshipunovv008@gmail.com>
Date: Sun, 1 Mar 2026 15:40:30 +0300
Subject: [PATCH 4/9] create CloseConfirmationDialog.axaml.cs file

---
 src/KeyKeeper/Views/CloseConfirmationDialog.axaml.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 src/KeyKeeper/Views/CloseConfirmationDialog.axaml.cs

diff --git a/src/KeyKeeper/Views/CloseConfirmationDialog.axaml.cs b/src/KeyKeeper/Views/CloseConfirmationDialog.axaml.cs
new file mode 100644
index 0000000..85be7e9
--- /dev/null
+++ b/src/KeyKeeper/Views/CloseConfirmationDialog.axaml.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace KeyKeeper.Views
+{
+    internal class CloseConfirmationDialog
+    {
+    }
+}

From 63194d37d6e571232450999015c7a68a9f3ead31 Mon Sep 17 00:00:00 2001
From: InspectorIT <sshipunovv008@gmail.com>
Date: Sun, 1 Mar 2026 23:50:18 +0300
Subject: [PATCH 5/9] add CloseConfirmationDialog

---
 .../Views/CloseConfirmationDialog.axaml       | 38 ++++++++----
 .../Views/CloseConfirmationDialog.axaml.cs    | 58 ++++++++++++++++---
 2 files changed, 76 insertions(+), 20 deletions(-)

diff --git a/src/KeyKeeper/Views/CloseConfirmationDialog.axaml b/src/KeyKeeper/Views/CloseConfirmationDialog.axaml
index 45dbbbc..2514c0a 100644
--- a/src/KeyKeeper/Views/CloseConfirmationDialog.axaml
+++ b/src/KeyKeeper/Views/CloseConfirmationDialog.axaml
@@ -1,12 +1,28 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        x:Class="KeyKeeper.Views.CloseConfirmationDialog"
+        Width="420"
+        Height="170"
+        CanResize="False"
+        WindowStartupLocation="CenterOwner"
+        Title="Confirm close"
+        Background="White">
+    <Grid Margin="16" RowDefinitions="*,Auto">
+        <TextBlock Text="Save changes before closing the storage?"
+                   TextWrapping="Wrap"
+                   FontSize="16"/>
 
-namespace KeyKeeper.Views
-{
-    class CloseConfirmationDialog
-    {
-    }
-}
+        <StackPanel Grid.Row="1"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    Spacing="8"
+                    Margin="0,16,0,0">
+            <Button Content="Save"
+                    Click="Save_Click" />
+            <Button Content="Do not save"
+                    Click="Discard_Click" />
+            <Button Content="Cancel"
+                    Click="Cancel_Click" />
+        </StackPanel>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/src/KeyKeeper/Views/CloseConfirmationDialog.axaml.cs b/src/KeyKeeper/Views/CloseConfirmationDialog.axaml.cs
index 85be7e9..354dd19 100644
--- a/src/KeyKeeper/Views/CloseConfirmationDialog.axaml.cs
+++ b/src/KeyKeeper/Views/CloseConfirmationDialog.axaml.cs
@@ -1,12 +1,52 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
 
-namespace KeyKeeper.Views
+namespace KeyKeeper.Views;
+
+public enum CloseConfirmationResult
 {
-    internal class CloseConfirmationDialog
-    {
-    }
+    Save,
+    Discard,
+    Cancel,
 }
+
+public partial class CloseConfirmationDialog : Window
+{
+    private bool closingWithResult;
+
+    public CloseConfirmationDialog()
+    {
+        InitializeComponent();
+    }
+
+    protected override void OnClosing(WindowClosingEventArgs e)
+    {
+        if (!closingWithResult)
+        {
+            e.Cancel = true;
+            closingWithResult = true;
+            Close(CloseConfirmationResult.Cancel);
+            return;
+        }
+
+        base.OnClosing(e);
+    }
+
+    private void Save_Click(object? sender, RoutedEventArgs e)
+    {
+        closingWithResult = true;
+        Close(CloseConfirmationResult.Save);
+    }
+
+    private void Discard_Click(object? sender, RoutedEventArgs e)
+    {
+        closingWithResult = true;
+        Close(CloseConfirmationResult.Discard);
+    }
+
+    private void Cancel_Click(object? sender, RoutedEventArgs e)
+    {
+        closingWithResult = true;
+        Close(CloseConfirmationResult.Cancel);
+    }
+}
\ No newline at end of file

From 6c06528c74c551a69ec12562fdbb95f7c2b63ed7 Mon Sep 17 00:00:00 2001
From: InspectorIT <sshipunovv008@gmail.com>
Date: Tue, 3 Mar 2026 17:41:58 +0300
Subject: [PATCH 6/9] add Closing to RepositoryWindow.axaml

---
 src/KeyKeeper/Views/RepositoryWindow.axaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml b/src/KeyKeeper/Views/RepositoryWindow.axaml
index 1bf3b0d..df33446 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml
@@ -4,6 +4,7 @@
         xmlns:i="using:Avalonia.Interactivity"
         xmlns:kkp="using:KeyKeeper.Views"
         x:Class="KeyKeeper.Views.RepositoryWindow"
+		Closing="RepositoryWindow_Closing"
         Title="KeyKeeper - Password store"
         CanResize="False"
         Width="800"

From 9e4ac92f29e180fd00da5cb34983259f07139986 Mon Sep 17 00:00:00 2001
From: InspectorIT <sshipunovv008@gmail.com>
Date: Tue, 3 Mar 2026 17:47:23 +0300
Subject: [PATCH 7/9] add private fields to RepositoryWindow

---
 src/KeyKeeper/Views/RepositoryWindow.axaml.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
index 28f4279..241690c 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
@@ -12,6 +12,9 @@ namespace KeyKeeper.Views;
 
 public partial class RepositoryWindow: Window
 {
+    private bool allowClose;
+    private bool closeConfirmationShown;
+
     public RepositoryWindow(RepositoryWindowViewModel model)
     {
         InitializeComponent();

From 895cf8335f5a25622607c1a3dff2c5b1ce342639 Mon Sep 17 00:00:00 2001
From: InspectorIT <sshipunovv008@gmail.com>
Date: Tue, 3 Mar 2026 17:49:46 +0300
Subject: [PATCH 8/9] add the method to RepositoryWindow.axaml.cs

---
 src/KeyKeeper/Views/RepositoryWindow.axaml.cs | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
index 241690c..96cc878 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
@@ -30,6 +30,45 @@ public partial class RepositoryWindow: Window
         base.OnOpened(e);
     }
 
+    private async void RepositoryWindow_Closing(object? sender, WindowClosingEventArgs e)
+    {
+        if (allowClose || closeConfirmationShown)
+        {
+            return;
+        }
+
+        if (DataContext is RepositoryWindowViewModel checkVm &&
+            checkVm.CurrentPage is UnlockedRepositoryViewModel unlockedVm &&
+            !unlockedVm.HasUnsavedChanges)
+        {
+            allowClose = true;
+            return;
+        }
+
+        e.Cancel = true;
+        closeConfirmationShown = true;
+
+        var dialog = new CloseConfirmationDialog();
+        var result = await dialog.ShowDialog<CloseConfirmationResult?>(this);
+
+        closeConfirmationShown = false;
+
+        if (result == null || result == CloseConfirmationResult.Cancel)
+        {
+            return;
+        }
+
+        if (result == CloseConfirmationResult.Save &&
+            DataContext is RepositoryWindowViewModel vm &&
+            vm.CurrentPage is UnlockedRepositoryViewModel pageVm)
+        {
+            pageVm.Save();
+        }
+
+        allowClose = true;
+        Close();
+    }
+
     private async void AddEntryButton_Click(object sender, RoutedEventArgs args)
     {
         if (DataContext is RepositoryWindowViewModel vm_ && vm_.CurrentPage is UnlockedRepositoryViewModel vm)

From 60dbcd2e1048a6ac57d64130cdf544211d00f8c4 Mon Sep 17 00:00:00 2001
From: Slavasil <subvia@proton.me>
Date: Fri, 13 Mar 2026 14:00:29 +0300
Subject: [PATCH 9/9] set text color in confirmation dialog

---
 src/KeyKeeper/Views/CloseConfirmationDialog.axaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/KeyKeeper/Views/CloseConfirmationDialog.axaml b/src/KeyKeeper/Views/CloseConfirmationDialog.axaml
index 2514c0a..2779e45 100644
--- a/src/KeyKeeper/Views/CloseConfirmationDialog.axaml
+++ b/src/KeyKeeper/Views/CloseConfirmationDialog.axaml
@@ -10,6 +10,7 @@
     <Grid Margin="16" RowDefinitions="*,Auto">
         <TextBlock Text="Save changes before closing the storage?"
                    TextWrapping="Wrap"
+                   Foreground="Black"
                    FontSize="16"/>
 
         <StackPanel Grid.Row="1"
@@ -25,4 +26,4 @@
                     Click="Cancel_Click" />
         </StackPanel>
     </Grid>
-</Window>
\ No newline at end of file
+</Window>