improve back button for settings views

insomniachi · Dec 25, 2023 · fe47679 · fe47679
1 parent 2204959
commit fe47679
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/Totoro.Core/Contracts/INavigationAware.cs b/Totoro.Core/Contracts/INavigationAware.cs
@@ -6,3 +6,9 @@ public interface INavigationAware
 
     Task OnNavigatedFrom();
 }
+
+public interface IHandleNavigation
+{
+    void GoBack();
+    bool CanHandle();
+}
diff --git a/Totoro.Core/ViewModels/SettingsViewModel.cs b/Totoro.Core/ViewModels/SettingsViewModel.cs
@@ -10,7 +10,7 @@
 
 namespace Totoro.Core.ViewModels;
 
-public class SettingsViewModel : NavigatableViewModel
+public class SettingsViewModel : NavigatableViewModel, IHandleNavigation
 {
     private readonly ITrackingServiceContext _trackingServiceContext;
 
@@ -117,6 +117,9 @@ public SettingsViewModel(ISettings settings,
         UpdateConnectionStatus();
     }
 
+    public bool CanHandle() => BreadCrumbBar.BreadCrumbs.Count > 0;
+    public void GoBack() => BreadCrumbBar.BreadCrumbs.RemoveAt(BreadCrumbBar.BreadCrumbs.Count - 1);
+
     private void UpdateConnectionStatus()
     {
         IsMalConnected = _trackingServiceContext.IsTrackerAuthenticated(ListServiceType.MyAnimeList);

diff --git a/Totoro.WinUI/Services/NavigationService.cs b/Totoro.WinUI/Services/NavigationService.cs
@@ -68,11 +68,18 @@ public bool GoBack()
         {
             var vmBeforeNavigation = _frame.GetPageViewModel();
 
-            _frame.GoBack();
-
-            if (vmBeforeNavigation is INavigationAware navigationAware)
+            if(vmBeforeNavigation is IHandleNavigation ihn && ihn.CanHandle())
             {
-                navigationAware.OnNavigatedFrom();
+                ihn.GoBack();
+            }
+            else
+            {
+                _frame.GoBack();
+
+                if (vmBeforeNavigation is INavigationAware navigationAware)
+                {
+                    navigationAware.OnNavigatedFrom();
+                }
             }
 
             return true;