Added PopToRoot call instead of pushing new MainView to the NavigationStack.

diff --git a/Fitness/Services/NavigationService.cs b/Fitness/Services/NavigationService.cs
index 3e6806d85da530271d6ab1262f466f9f89a1d784..5aa7baf498733a9f535f5713175b69326ed1c500 100644 (file)
--- a/Fitness/Services/NavigationService.cs
+++ b/Fitness/Services/NavigationService.cs
@@ -34,7 +34,14 @@ namespace Fitness.Services
 
         public void NavigateToMainView()
         {
-            navigation.Push(new MainView());
+            if (navigation.Children.Count > 0)
+            {
+                navigation.PopToRoot();
+            }
+            else
+            {
+                navigation.Push(new MainView());
+            }
         }
 
         public async Task NavigateToExercisingView(WorkoutViewModel workoutViewModel)

diff --git a/Fitness/ViewModels/SummaryViewModel.cs b/Fitness/ViewModels/SummaryViewModel.cs
index 3883f42fce16176aff58a4c6afffa8f06e5b52f3..4be52826512854e3c6f8da491b4ad4a2e44440ef 100644 (file)
--- a/Fitness/ViewModels/SummaryViewModel.cs
+++ b/Fitness/ViewModels/SummaryViewModel.cs
@@ -153,7 +153,6 @@ namespace Fitness.ViewModels
                 default:
                     Ok = new Command(() =>
                     {
-                        NavigationService.Instance.Pop();
                         NavigationService.Instance.NavigateToMainView();
                     });
                     break;