Browse Source

Rename NavigationHelper.cs to NavigationManager.cs

Ruben 8 months ago
parent
commit
9a8e916f32
27 changed files with 67 additions and 67 deletions
  1. 5 5
      src/PicView.Avalonia/Clipboard/ClipboardHelper.cs
  2. 4 4
      src/PicView.Avalonia/DragAndDrop/DragAndDropHelper.cs
  3. 1 1
      src/PicView.Avalonia/FileSystem/FilePicker.cs
  4. 4 4
      src/PicView.Avalonia/Gallery/GalleryFunctions.cs
  5. 1 1
      src/PicView.Avalonia/Gallery/GalleryLoad.cs
  6. 1 1
      src/PicView.Avalonia/Gallery/GalleryNavigation.cs
  7. 2 2
      src/PicView.Avalonia/ImageHandling/ImageHelper.cs
  8. 4 4
      src/PicView.Avalonia/Navigation/ErrorHandling.cs
  9. 6 6
      src/PicView.Avalonia/Navigation/FileHistoryNavigation.cs
  10. 2 2
      src/PicView.Avalonia/Navigation/FileListManager.cs
  11. 1 1
      src/PicView.Avalonia/Navigation/IPC.cs
  12. 1 1
      src/PicView.Avalonia/Navigation/ImageIterator.cs
  13. 1 1
      src/PicView.Avalonia/Navigation/NavigationManager.cs
  14. 2 2
      src/PicView.Avalonia/Navigation/Slideshow.cs
  15. 3 3
      src/PicView.Avalonia/SettingsManagement/SettingsUpdater.cs
  16. 2 2
      src/PicView.Avalonia/StartUp/QuickLoad.cs
  17. 10 10
      src/PicView.Avalonia/UI/FunctionsHelper.cs
  18. 1 1
      src/PicView.Avalonia/UI/HideInterfaceLogic.cs
  19. 5 5
      src/PicView.Avalonia/ViewModels/MainViewModel.cs
  20. 2 2
      src/PicView.Avalonia/Views/BatchResizeView.axaml.cs
  21. 1 1
      src/PicView.Avalonia/Views/ExifView.axaml.cs
  22. 1 1
      src/PicView.Avalonia/Views/ImageViewer.axaml.cs
  23. 1 1
      src/PicView.Avalonia/Views/MainView.axaml.cs
  24. 2 2
      src/PicView.Avalonia/Views/SingleImageResizeView.axaml.cs
  25. 1 1
      src/PicView.Avalonia/Views/UC/EditableTitlebar.axaml.cs
  26. 2 2
      src/PicView.Avalonia/Views/UC/Menus/ImageMenu.axaml.cs
  27. 1 1
      src/PicView.Avalonia/WindowBehavior/WindowFunctions.cs

+ 5 - 5
src/PicView.Avalonia/Clipboard/ClipboardHelper.cs

@@ -50,7 +50,7 @@ public static class ClipboardHelper
 
     public static async Task Duplicate(MainViewModel vm)
     {
-        if (!NavigationHelper.CanNavigate(vm))
+        if (!NavigationManager.CanNavigate(vm))
         {
             return;
         }
@@ -64,7 +64,7 @@ public static class ClipboardHelper
             return;
         }
         await vm.ImageIterator.ClearAsync();
-        await NavigationHelper.LoadPicFromFile(duplicatedPath, vm);
+        await NavigationManager.LoadPicFromFile(duplicatedPath, vm);
     }
     
     public static async Task CopyTextToClipboard(string text)
@@ -187,7 +187,7 @@ public static class ClipboardHelper
                     // load the first file
                     var firstFile = storageItems[0];
                     var firstPath = RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? firstFile.Path.AbsolutePath : firstFile.Path.LocalPath;
-                    await NavigationHelper.LoadPicFromStringAsync(firstPath, vm).ConfigureAwait(false);
+                    await NavigationManager.LoadPicFromStringAsync(firstPath, vm).ConfigureAwait(false);
 
                     // Open consecutive files in a new process
                     foreach (var file in storageItems.Skip(1))
@@ -200,7 +200,7 @@ public static class ClipboardHelper
             else if (files is IStorageItem singleFile)
             {
                 var path = RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? singleFile.Path.AbsolutePath : singleFile.Path.LocalPath;
-                await NavigationHelper.LoadPicFromStringAsync(path, vm).ConfigureAwait(false);
+                await NavigationManager.LoadPicFromStringAsync(path, vm).ConfigureAwait(false);
             }
             return;
         }
@@ -208,7 +208,7 @@ public static class ClipboardHelper
         var text = await clipboard.GetTextAsync();
         if (!string.IsNullOrWhiteSpace(text))
         {   
-            await NavigationHelper.LoadPicFromStringAsync(text, vm).ConfigureAwait(false);
+            await NavigationManager.LoadPicFromStringAsync(text, vm).ConfigureAwait(false);
             return;
         }
         

+ 4 - 4
src/PicView.Avalonia/DragAndDrop/DragAndDropHelper.cs

@@ -50,7 +50,7 @@ public static class DragAndDropHelper
             {
                 await Dispatcher.UIThread.InvokeAsync(() => vm.CurrentView = vm.ImageViewer);
             }
-            await NavigationHelper.LoadPicFromStringAsync(path, vm).ConfigureAwait(false);
+            await NavigationManager.LoadPicFromStringAsync(path, vm).ConfigureAwait(false);
         }
         else if (Directory.Exists(path))
         {
@@ -58,7 +58,7 @@ public static class DragAndDropHelper
             {
                 await Dispatcher.UIThread.InvokeAsync(() => vm.CurrentView = vm.ImageViewer);
             }
-            await NavigationHelper.LoadPicFromDirectoryAsync(path, vm).ConfigureAwait(false);
+            await NavigationManager.LoadPicFromDirectoryAsync(path, vm).ConfigureAwait(false);
 
         }
         else if (path.IsArchive())
@@ -67,7 +67,7 @@ public static class DragAndDropHelper
             {
                 await Dispatcher.UIThread.InvokeAsync(() => vm.CurrentView = vm.ImageViewer);
             }
-            await NavigationHelper.LoadPicFromArchiveAsync(path, vm).ConfigureAwait(false);
+            await NavigationManager.LoadPicFromArchiveAsync(path, vm).ConfigureAwait(false);
         }
 
         if (!Settings.UIProperties.OpenInSameWindow)
@@ -94,7 +94,7 @@ public static class DragAndDropHelper
             var url = dataStr.Split((char)10).FirstOrDefault();
             if (url != null)
             {
-                await NavigationHelper.LoadPicFromUrlAsync(url, vm).ConfigureAwait(false);
+                await NavigationManager.LoadPicFromUrlAsync(url, vm).ConfigureAwait(false);
             }
         }
     }

+ 1 - 1
src/PicView.Avalonia/FileSystem/FilePicker.cs

@@ -27,7 +27,7 @@ public static class FilePicker
             return;
         }
         
-        await Task.Run(() => NavigationHelper.LoadPicFromStringAsync(file, vm));
+        await Task.Run(() => NavigationManager.LoadPicFromStringAsync(file, vm));
     }
 
     public static async Task<string?> SelectFile()

+ 4 - 4
src/PicView.Avalonia/Gallery/GalleryFunctions.cs

@@ -163,7 +163,7 @@ public static class GalleryFunctions
                         ToggleGallery(vm);
                     }
 
-                    await NavigationHelper.Navigate(vm.ImageIterator.ImagePaths.IndexOf(fileInfo.FullName), vm).ConfigureAwait(false);
+                    await NavigationManager.Navigate(vm.ImageIterator.ImagePaths.IndexOf(fileInfo.FullName), vm).ConfigureAwait(false);
                 };
                 galleryListBox.Items.Insert(index, galleryItem);
                 var isSvg = fileInfo.Extension.Equals(".svg", StringComparison.OrdinalIgnoreCase) ||
@@ -276,7 +276,7 @@ public static class GalleryFunctions
 
     public static void ToggleGallery(MainViewModel vm)
     {
-        if (vm is null || !NavigationHelper.CanNavigate(vm))
+        if (vm is null || !NavigationManager.CanNavigate(vm))
         {
             return;
         }
@@ -345,13 +345,13 @@ public static class GalleryFunctions
         IsBottomGalleryOpen = true;
         IsFullGalleryOpen = false;
         Settings.Gallery.IsBottomGalleryShown = true;
-        if (NavigationHelper.CanNavigate(vm))
+        if (NavigationManager.CanNavigate(vm))
         {
             vm.GalleryMode = GalleryMode.ClosedToBottom;
         }
 
         vm.GetIsShowingBottomGalleryTranslation = TranslationHelper.Translation.HideBottomGallery;
-        if (!NavigationHelper.CanNavigate(vm))
+        if (!NavigationManager.CanNavigate(vm))
         {
             return;
         }

+ 1 - 1
src/PicView.Avalonia/Gallery/GalleryLoad.cs

@@ -113,7 +113,7 @@ public static class GalleryLoad
                             GalleryFunctions.ToggleGallery(vm);
                         }
 
-                        await NavigationHelper.Navigate(vm.ImageIterator.ImagePaths.IndexOf(fileInfos[i1].FullName), vm)
+                        await NavigationManager.Navigate(vm.ImageIterator.ImagePaths.IndexOf(fileInfos[i1].FullName), vm)
                             .ConfigureAwait(false);
                     };
                     galleryListBox.Items.Add(galleryItem);

+ 1 - 1
src/PicView.Avalonia/Gallery/GalleryNavigation.cs

@@ -178,7 +178,7 @@ public static class GalleryNavigation
         GalleryFunctions.ToggleGallery(vm);
         if (vm.SelectedGalleryItemIndex != vm.ImageIterator.CurrentIndex) 
         {
-            await NavigationHelper.Navigate(vm.SelectedGalleryItemIndex, vm).ConfigureAwait(false);
+            await NavigationManager.Navigate(vm.SelectedGalleryItemIndex, vm).ConfigureAwait(false);
         }
     }
 }

+ 2 - 2
src/PicView.Avalonia/ImageHandling/ImageHelper.cs

@@ -28,7 +28,7 @@ public static class ImageHelper
                 source = bmp;
             }
         }
-        else if (NavigationHelper.CanNavigate(vm) && !string.IsNullOrEmpty(path))
+        else if (NavigationManager.CanNavigate(vm) && !string.IsNullOrEmpty(path))
         {
             if (vm.EffectConfig is not null && vm.FileInfo.FullName == path)
             {
@@ -125,7 +125,7 @@ public static class ImageHelper
         {
             return;
         }
-        if (!NavigationHelper.CanNavigate(vm))
+        if (!NavigationManager.CanNavigate(vm))
         {
             return;
         }

+ 4 - 4
src/PicView.Avalonia/Navigation/ErrorHandling.cs

@@ -77,7 +77,7 @@ public static class ErrorHandling
             return;
         }
         
-        if (!NavigationHelper.CanNavigate(vm))
+        if (!NavigationManager.CanNavigate(vm))
         {
             await FileHistoryNavigation.OpenLastFileAsync(vm);
             return;
@@ -97,7 +97,7 @@ public static class ErrorHandling
             var index = vm.ImageIterator.CurrentIndex;
             await vm.ImageIterator.DisposeAsync().ConfigureAwait(false);
             vm.ImageIterator = new ImageIterator(vm.FileInfo, vm.ImageIterator.ImagePaths, index, vm);
-            await NavigationHelper.Navigate(index, vm).ConfigureAwait(false);
+            await NavigationManager.Navigate(index, vm).ConfigureAwait(false);
         }
         catch (Exception e)
         {
@@ -119,7 +119,7 @@ public static class ErrorHandling
             return;
         }
 
-        if (NavigationHelper.CanNavigate(vm))
+        if (NavigationManager.CanNavigate(vm))
         {
             var preloadValue = await vm.ImageIterator.GetPreLoadValueAsync(vm.ImageIterator.CurrentIndex).ConfigureAwait(false);
             if (preloadValue?.ImageModel.Image is not null)
@@ -132,7 +132,7 @@ public static class ErrorHandling
             var url = vm.Title.GetURL();
             if (!string.IsNullOrEmpty(url))
             {
-                await NavigationHelper.LoadPicFromUrlAsync(url, vm).ConfigureAwait(false);
+                await NavigationManager.LoadPicFromUrlAsync(url, vm).ConfigureAwait(false);
             }
             else 
             {

+ 6 - 6
src/PicView.Avalonia/Navigation/FileHistoryNavigation.cs

@@ -67,14 +67,14 @@ public static class FileHistoryNavigation
             return;
         }
 
-        await NavigationHelper.LoadPicFromStringAsync(entry, vm);
+        await NavigationManager.LoadPicFromStringAsync(entry, vm);
         return;
         
         async Task LoadLastFileFromSettingsOrNotAsync()
         {
             if (!string.IsNullOrWhiteSpace(Settings.StartUp.LastFile))
             {
-                await NavigationHelper.LoadPicFromStringAsync(Settings.StartUp.LastFile, vm);
+                await NavigationManager.LoadPicFromStringAsync(Settings.StartUp.LastFile, vm);
             }
             else
             {
@@ -85,7 +85,7 @@ public static class FileHistoryNavigation
 
     public static async Task NextAsync(MainViewModel vm)
     {
-        if (!NavigationHelper.CanNavigate(vm))
+        if (!NavigationManager.CanNavigate(vm))
         {
             await OpenLastFileAsync(vm).ConfigureAwait(false);
             return;
@@ -103,7 +103,7 @@ public static class FileHistoryNavigation
 
     public static async Task PrevAsync(MainViewModel vm)
     {
-        if (!NavigationHelper.CanNavigate(vm))
+        if (!NavigationManager.CanNavigate(vm))
         {
             await OpenLastFileAsync(vm).ConfigureAwait(false);
             return;
@@ -146,10 +146,10 @@ public static class FileHistoryNavigation
                 return;
             }
 
-            await NavigationHelper.Navigate(imagePaths.IndexOf(nextEntry), vm).ConfigureAwait(false);
+            await NavigationManager.Navigate(imagePaths.IndexOf(nextEntry), vm).ConfigureAwait(false);
             return;
         }
-        await NavigationHelper.LoadPicFromStringAsync(nextEntry, vm);
+        await NavigationManager.LoadPicFromStringAsync(nextEntry, vm);
     }
     
     public static void WriteToFile()

+ 2 - 2
src/PicView.Avalonia/Navigation/FileListManager.cs

@@ -71,7 +71,7 @@ public static class FileListManager
     public static async Task UpdateFileList(IPlatformSpecificService? platformSpecificService, MainViewModel vm, FileListHelper.SortFilesBy sortFilesBy)
     {
         Settings.Sorting.SortPreference = (int)sortFilesBy;
-        if (!NavigationHelper.CanNavigate(vm))
+        if (!NavigationManager.CanNavigate(vm))
         {
             return;
         }
@@ -82,7 +82,7 @@ public static class FileListManager
     public static async Task UpdateFileList(IPlatformSpecificService? platformSpecificService, MainViewModel vm, bool ascending)
     {
         Settings.Sorting.Ascending = ascending;
-        if (!NavigationHelper.CanNavigate(vm))
+        if (!NavigationManager.CanNavigate(vm))
         {
             return;
         }

+ 1 - 1
src/PicView.Avalonia/Navigation/IPC.cs

@@ -105,7 +105,7 @@ internal static class IPC
                         // Activating the window works fine in debug mode, but not in AOT release mode 
                         desktop.MainWindow.Activate();
                     });
-                    await NavigationHelper.LoadPicFromStringAsync(line, vm).ConfigureAwait(false);
+                    await NavigationManager.LoadPicFromStringAsync(line, vm).ConfigureAwait(false);
 
                 }
             }

+ 1 - 1
src/PicView.Avalonia/Navigation/ImageIterator.cs

@@ -224,7 +224,7 @@ public sealed class ImageIterator : IAsyncDisposable
                 return;
             }
 
-            await NavigationHelper.Iterate(false, _vm);
+            await NavigationManager.Iterate(false, _vm);
         }
         else
         {

+ 1 - 1
src/PicView.Avalonia/Navigation/NavigationHelper.cs → src/PicView.Avalonia/Navigation/NavigationManager.cs

@@ -21,7 +21,7 @@ namespace PicView.Avalonia.Navigation;
 /// <summary>
 ///     Helper class for navigation and image loading functionalities in the application.
 /// </summary>
-public static class NavigationHelper
+public static class NavigationManager
 {
     private static CancellationTokenSource? _cancellationTokenSource;
 

+ 2 - 2
src/PicView.Avalonia/Navigation/Slideshow.cs

@@ -63,7 +63,7 @@ public static class Slideshow
 
     private static bool InitiateAndStart(MainViewModel vm)
     {
-        if (!NavigationHelper.CanNavigate(vm))
+        if (!NavigationManager.CanNavigate(vm))
         {
             return false;
         }
@@ -81,7 +81,7 @@ public static class Slideshow
                 // https://docs.avaloniaui.net/docs/guides/graphics-and-animation/page-transitions/how-to-create-a-custom-page-transition
                 // https://docs.avaloniaui.net/docs/guides/graphics-and-animation/page-transitions/page-slide-transition
                 // https://docs.avaloniaui.net/docs/reference/controls/transitioningcontentcontrol
-                await NavigationHelper.Navigate(true, vm).ConfigureAwait(false);
+                await NavigationManager.Navigate(true, vm).ConfigureAwait(false);
             };
         }
         else if (_timer.Enabled)

+ 3 - 3
src/PicView.Avalonia/SettingsManagement/SettingsUpdater.cs

@@ -57,7 +57,7 @@ public static class SettingsUpdater
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
                 vm.PlatformService.StopTaskbarProgress();
-                if (NavigationHelper.CanNavigate(vm))
+                if (NavigationManager.CanNavigate(vm))
                 {
                     vm.PlatformService.SetTaskbarProgress((ulong)vm.ImageIterator?.CurrentIndex!,
                         (ulong)vm.ImageIterator?.ImagePaths?.Count!);
@@ -146,7 +146,7 @@ public static class SettingsUpdater
         else
         {
             Settings.UIProperties.IsTaskbarProgressEnabled = true;
-            if (NavigationHelper.CanNavigate(vm))
+            if (NavigationManager.CanNavigate(vm))
             {
                 await Dispatcher.UIThread.InvokeAsync(() =>
                 {
@@ -192,7 +192,7 @@ public static class SettingsUpdater
     {
         Settings.ImageScaling.ShowImageSideBySide = true;
         vm.IsShowingSideBySide = true;
-        if (NavigationHelper.CanNavigate(vm))
+        if (NavigationManager.CanNavigate(vm))
         {
             var preloadValue = await vm.ImageIterator?.GetNextPreLoadValueAsync();
             vm.SecondaryImageSource = preloadValue?.ImageModel.Image;

+ 2 - 2
src/PicView.Avalonia/StartUp/QuickLoad.cs

@@ -19,13 +19,13 @@ public static class QuickLoad
         var fileInfo = new FileInfo(file);
         if (!fileInfo.Exists) // If not file, try to load if URL, base64 or directory
         {
-            await NavigationHelper.LoadPicFromStringAsync(file, vm).ConfigureAwait(false);
+            await NavigationManager.LoadPicFromStringAsync(file, vm).ConfigureAwait(false);
             return;
         }
 
         if (file.IsArchive()) // Handle if file exist and is an archive
         {
-            await NavigationHelper.LoadPicFromArchiveAsync(file, vm).ConfigureAwait(false);
+            await NavigationManager.LoadPicFromArchiveAsync(file, vm).ConfigureAwait(false);
             return;
         }
         vm.FileInfo = fileInfo;

+ 10 - 10
src/PicView.Avalonia/UI/FunctionsHelper.cs

@@ -209,52 +209,52 @@ public static class FunctionsHelper
 
     public static async Task Next()
     {
-        await NavigationHelper.Iterate(next: true, Vm);
+        await NavigationManager.Iterate(next: true, Vm);
     }
     
     public static async Task NextFolder()
     {
-        await NavigationHelper.GoToNextFolder(true, Vm);
+        await NavigationManager.GoToNextFolder(true, Vm);
     }
     
     public static async Task Last()
     {
-        await NavigationHelper.NavigateFirstOrLast(last: true, Vm);
+        await NavigationManager.NavigateFirstOrLast(last: true, Vm);
     }
 
     public static async Task Prev()
     {
-        await NavigationHelper.Iterate(next: false, Vm);
+        await NavigationManager.Iterate(next: false, Vm);
     }
     
     public static async Task PrevFolder()
     {
-        await NavigationHelper.GoToNextFolder(false, Vm);
+        await NavigationManager.GoToNextFolder(false, Vm);
     }
 
     public static async Task First()
     {
-        await NavigationHelper.NavigateFirstOrLast(last: false, Vm);
+        await NavigationManager.NavigateFirstOrLast(last: false, Vm);
     }
     
     public static async Task Next10()
     {
-        await NavigationHelper.Next10(Vm).ConfigureAwait(false);
+        await NavigationManager.Next10(Vm).ConfigureAwait(false);
     }
     
     public static async Task Next100()
     {
-        await NavigationHelper.Next100(Vm).ConfigureAwait(false);
+        await NavigationManager.Next100(Vm).ConfigureAwait(false);
     }
     
     public static async Task Prev10()
     {
-        await NavigationHelper.Prev10(Vm).ConfigureAwait(false);
+        await NavigationManager.Prev10(Vm).ConfigureAwait(false);
     }
     
     public static async Task Prev100()
     {
-        await NavigationHelper.Prev100(Vm).ConfigureAwait(false);
+        await NavigationManager.Prev100(Vm).ConfigureAwait(false);
     }
     
 

+ 1 - 1
src/PicView.Avalonia/UI/HideInterfaceLogic.cs

@@ -63,7 +63,7 @@ public static class HideInterfaceLogic
             {
                 if (Settings.Gallery.IsBottomGalleryShown)
                 {
-                    if (NavigationHelper.CanNavigate(vm))
+                    if (NavigationManager.CanNavigate(vm))
                     {
                         await Dispatcher.UIThread.InvokeAsync(() =>
                         {

+ 5 - 5
src/PicView.Avalonia/ViewModels/MainViewModel.cs

@@ -1208,7 +1208,7 @@ public class MainViewModel : ViewModelBase
         var newPath = await ConversionHelper.ConvertTask(FileInfo, index);
         if (!string.IsNullOrWhiteSpace(newPath))
         {
-            await NavigationHelper.LoadPicFromStringAsync(newPath, this);
+            await NavigationManager.LoadPicFromStringAsync(newPath, this);
         }
     }
     
@@ -1596,12 +1596,12 @@ public class MainViewModel : ViewModelBase
 
         NextButtonCommand = ReactiveCommand.CreateFromTask(async () =>
         {
-           await NavigationHelper.NavigateAndPositionCursor(next:true, arrow: false, vm: this);
+           await NavigationManager.NavigateAndPositionCursor(next:true, arrow: false, vm: this);
         });
         
         NextArrowButtonCommand = ReactiveCommand.CreateFromTask(async () =>
         {
-            await NavigationHelper.NavigateAndPositionCursor(next:true, arrow: true, vm: this);
+            await NavigationManager.NavigateAndPositionCursor(next:true, arrow: true, vm: this);
         });
         
         NextFolderCommand = ReactiveCommand.CreateFromTask(FunctionsHelper.NextFolder);
@@ -1610,12 +1610,12 @@ public class MainViewModel : ViewModelBase
 
         PreviousButtonCommand = ReactiveCommand.CreateFromTask(async () =>
         {
-            await NavigationHelper.NavigateAndPositionCursor(next:false, arrow: false, vm: this);
+            await NavigationManager.NavigateAndPositionCursor(next:false, arrow: false, vm: this);
         });
         
         PreviousArrowButtonCommand = ReactiveCommand.CreateFromTask(async () =>
         {
-            await NavigationHelper.NavigateAndPositionCursor(next:false, arrow: true, vm: this);
+            await NavigationManager.NavigateAndPositionCursor(next:false, arrow: true, vm: this);
         });
         
         PreviousFolderCommand = ReactiveCommand.CreateFromTask(FunctionsHelper.PrevFolder);

+ 2 - 2
src/PicView.Avalonia/Views/BatchResizeView.axaml.cs

@@ -90,7 +90,7 @@ public partial class BatchResizeView : UserControl
 
             };
 
-            if (!NavigationHelper.CanNavigate(vm))
+            if (!NavigationManager.CanNavigate(vm))
             {
                 return;
             }
@@ -136,7 +136,7 @@ public partial class BatchResizeView : UserControl
             return;
         }
 
-        if (!NavigationHelper.CanNavigate(vm))
+        if (!NavigationManager.CanNavigate(vm))
         {
             return;
         }

+ 1 - 1
src/PicView.Avalonia/Views/ExifView.axaml.cs

@@ -179,7 +179,7 @@ public partial class ExifView : UserControl
                 if (success)
                 {
                     vm.ImageIterator?.RemoveCurrentItemFromPreLoader();
-                    await NavigationHelper.Navigate(vm.ImageIterator.CurrentIndex, vm).ConfigureAwait(false);
+                    await NavigationManager.Navigate(vm.ImageIterator.CurrentIndex, vm).ConfigureAwait(false);
                 }
             }
         }

+ 1 - 1
src/PicView.Avalonia/Views/ImageViewer.axaml.cs

@@ -189,7 +189,7 @@ public partial class ImageViewer : UserControl
                 next = !Settings.Zoom.HorizontalReverseScroll;
             }
 
-            await NavigationHelper.Navigate(next, mainViewModel).ConfigureAwait(false);
+            await NavigationManager.Navigate(next, mainViewModel).ConfigureAwait(false);
         }
     }
 

+ 1 - 1
src/PicView.Avalonia/Views/MainView.axaml.cs

@@ -153,7 +153,7 @@ public partial class MainView : UserControl
         
             item.Click += async delegate
             {
-                await NavigationHelper.LoadPicFromStringAsync(fileLocation, vm).ConfigureAwait(false);
+                await NavigationManager.LoadPicFromStringAsync(fileLocation, vm).ConfigureAwait(false);
             };
         
             ToolTip.SetTip(item, fileLocation);

+ 2 - 2
src/PicView.Avalonia/Views/SingleImageResizeView.axaml.cs

@@ -239,14 +239,14 @@ public partial class SingleImageResizeView : UserControl
     {
         if (destination == file)
         {
-            if (NavigationHelper.CanNavigate(vm) && vm.ImageIterator is not null)
+            if (NavigationManager.CanNavigate(vm) && vm.ImageIterator is not null)
             {
                 await vm.ImageIterator.QuickReload().ConfigureAwait(false);
             }
         }
         else if (Path.GetDirectoryName(file) == Path.GetDirectoryName(destination))
         {
-            await NavigationHelper.LoadPicFromFile(destination, vm).ConfigureAwait(false);
+            await NavigationManager.LoadPicFromFile(destination, vm).ConfigureAwait(false);
         }
     }
 

+ 1 - 1
src/PicView.Avalonia/Views/UC/EditableTitlebar.axaml.cs

@@ -144,7 +144,7 @@ public partial class EditableTitlebar : UserControl
         if (Path.GetDirectoryName(oldPath) != Path.GetDirectoryName(newPath))
         {
             vm.ImageIterator?.RemoveCurrentItemFromPreLoader();
-            await NavigationHelper.Navigate(true, vm);
+            await NavigationManager.Navigate(true, vm);
             FileHelper.RenameFile(oldPath, newPath);
             return;
         }

+ 2 - 2
src/PicView.Avalonia/Views/UC/Menus/ImageMenu.axaml.cs

@@ -52,7 +52,7 @@ public partial class ImageMenu  : AnimatedMenu
                 return;
             }
 
-            if (!NavigationHelper.CanNavigate(vm))
+            if (!NavigationManager.CanNavigate(vm))
             {
                 return;
             }
@@ -75,7 +75,7 @@ public partial class ImageMenu  : AnimatedMenu
                 number--;
             }
 
-            await NavigationHelper.Navigate(number, vm).ConfigureAwait(false);
+            await NavigationManager.Navigate(number, vm).ConfigureAwait(false);
         }
     }
 }

+ 1 - 1
src/PicView.Avalonia/WindowBehavior/WindowFunctions.cs

@@ -39,7 +39,7 @@ public static class WindowFunctions
 
         var vm = window.DataContext as MainViewModel;
         string lastFile;
-        if (NavigationHelper.CanNavigate(vm))
+        if (NavigationManager.CanNavigate(vm))
         {
             if (!string.IsNullOrEmpty(ArchiveExtraction.LastOpenedArchive))
             {