Added the option to reorder vaults in MAUI

Author: d2dyno1

src/Platforms/SecureFolderFS.Maui/Views/MainPage.xaml

@@ -55,8 +55,10 @@
         <CollectionView
             Grid.Row="1"
             BackgroundColor="Transparent"
+            CanReorderItems="True"
             IsVisible="{Binding ViewModel.VaultListViewModel.HasVaults, Mode=OneWay}"
             ItemsSource="{Binding ViewModel.VaultListViewModel.Items, Mode=OneWay}"
+            ReorderCompleted="ItemsCollection_ReorderCompleted"
             SelectionMode="None">
             <CollectionView.ItemTemplate>
                 <DataTemplate x:DataType="vm:VaultListItemViewModel">

src/Platforms/SecureFolderFS.Maui/Views/MainPage.xaml.cs

@@ -45,6 +45,14 @@ protected override void OnAppearing()
 
             base.OnAppearing();
         }
+        
+        private async void ItemsCollection_ReorderCompleted(object? sender, EventArgs e)
+        {
+            if (ViewModel is null)
+                return;
+            
+            await ViewModel.VaultListViewModel.SyncOrderAsync();
+        }
 
         private async Task ItemTappedAsync(VaultListItemViewModel itemViewModel, View? view)
         {

src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/VaultList/VaultListItemViewModel.cs

@@ -76,7 +76,7 @@ private async Task MoveItemAsync(string? direction, CancellationToken cancellati
             UpdateCanMove();
 
             // Save after move
-            await _vaultCollectionModel.SaveAsync(cancellationToken);
+            await _vaultCollectionModel.TrySaveAsync(cancellationToken);
         }
 
         [RelayCommand]

src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/VaultList/VaultListViewModel.cs

@@ -28,6 +28,7 @@ namespace SecureFolderFS.Sdk.ViewModels.Controls.VaultList
     public sealed partial class VaultListViewModel : ObservableObject, IAsyncInitialize
     {
         private readonly IVaultCollectionModel _vaultCollectionModel;
+        private bool _ignoreCollectionChanged;
 
         [ObservableProperty] private bool _HasVaults;
         [ObservableProperty] private VaultListItemViewModel? _SelectedItem;
@@ -63,6 +64,33 @@ public Task InitAsync(CancellationToken cancellationToken = default)
             return Task.CompletedTask;
         }
 
+        /// <summary>
+        /// Syncs the order of the vaults with the internal model.
+        /// </summary>
+        /// <param name="cancellationToken">A <see cref="CancellationToken"/> that cancels this action.</param>
+        /// <returns>A <see cref="Task"/> that represents the asynchronous operation.</returns>
+        public async Task SyncOrderAsync(CancellationToken cancellationToken = default)
+        {
+            try
+            {
+                _ignoreCollectionChanged = true;
+                foreach (var item in Items)
+                {
+                    var currentIndex = _vaultCollectionModel.IndexOf(item.VaultViewModel.VaultModel);
+                    var targetIndex = Items.IndexOf(item);
+
+                    if (currentIndex != targetIndex)
+                        _vaultCollectionModel.Move(currentIndex, targetIndex);
+                }
+
+                await _vaultCollectionModel.TrySaveAsync(cancellationToken);
+            }
+            finally
+            {
+                _ignoreCollectionChanged = false;
+            }
+        }
+
         [RelayCommand(AllowConcurrentExecutions = true)]
         private async Task AddNewVaultAsync(IFolder? folder, CancellationToken cancellationToken)
         {
@@ -135,6 +163,9 @@ private void RemoveVault(IVaultModel vaultModel)
 
         private void VaultCollectionModel_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
         {
+            if (_ignoreCollectionChanged)
+                return;
+
             switch (e.Action)
             {
                 case NotifyCollectionChangedAction.Add when e.NewItems is not null && e.NewItems[0] is IVaultModel vaultModel: