Remove replace mechanism

diff --git a/Fitness/Controls/NavigationStack.cs b/Fitness/Controls/NavigationStack.cs
index 274b3b62075782f4b02fbaa637103a3ef500fbf0..261220a5d04ba72372e987ac06e90f1b8fa4d1a0 100644 (file)
--- a/Fitness/Controls/NavigationStack.cs
+++ b/Fitness/Controls/NavigationStack.cs
@@ -65,7 +65,7 @@ namespace Fitness.Controls
 
         public override void Remove(View child)
         {
-            if (child is Page page)
+            if (child is Page)
             {
                 HideLast();
                 base.Remove(child);

diff --git a/Fitness/Services/NavigationService.cs b/Fitness/Services/NavigationService.cs
index 0e4dce98782fe4cd22b80fb2925e57dfc4c36ea3..da85bbc9518d5794da0d31068fd274d643e3fd64 100644 (file)
--- a/Fitness/Services/NavigationService.cs
+++ b/Fitness/Services/NavigationService.cs
@@ -31,27 +31,27 @@ namespace Fitness.Services
 
         public void NavigateToMainView()
         {
-            ReplaceCurrentPage(new MainView());
+            navigation.Push(new MainView());
         }
 
         public void NavigateToExercisingView()
         {
-            ReplaceCurrentPage(new ExercisingView());
+            navigation.Push(new ExercisingView());
         }
 
         public void NavigateToExercisePreviewView(string workoutId)
         {
-            ReplaceCurrentPage(new ExercisePreviewView(workoutId));
+            navigation.Push(new ExercisePreviewView(workoutId));
         }
 
         public void NavigateToScanningView()
         {
-            ReplaceCurrentPage(new ScanningView());
+            navigation.Push(new ScanningView());
         }
 
         public void NavigateToLoadingView()
         {
-            ReplaceCurrentPage(new LoadingView());
+            navigation.Push(new LoadingView());
         }
 
         public void NavigateToSummaryView()
@@ -68,34 +68,5 @@ namespace Fitness.Services
         {
             navigation.PopToRoot();
         }
-
-        private void ReplaceCurrentPage(Fitness.Controls.Page page)
-        {
-            navigation.Push(page);
-
-            if (page.PageTransitions != null)
-            {
-                page.PageTransitions.TransitionFinished += PageTransitionFinished;
-            }
-            else
-            {
-                RemovePagesExceptCurrent();
-            }
-        }
-
-        private void PageTransitionFinished(object sender, EventArgs args)
-        {
-            RemovePagesExceptCurrent();
-        }
-
-        private void RemovePagesExceptCurrent()
-        {
-            var pages = navigation.Pages;
-
-            for (int i = 0; i < pages.Count - 1; i++)
-            {
-                navigation.Remove(pages[i]);
-            }
-        }
     }
 }