Simplify GetNavigationTree method signature

Author: thomasgalliker

Plugin.SegmentedControl.Maui/Utils/HandlerCleanUpHelper.cs

@@ -83,8 +83,7 @@ private static bool CheckIfPageIsUsed(Page targetPage)
             // is part of the NavigationStack or the ModalStack.
             {
                 var mainPage = Application.Current.MainPage;
-                var navigation = mainPage.Navigation;
-                var pages = PageHelper.GetNavigationTree(navigation, mainPage).ToArray();
+                var pages = PageHelper.GetNavigationTree(mainPage).ToArray();
                 var pageExists = pages.Any(p => p == targetPage);
                 return pageExists;
             }

Plugin.SegmentedControl.Maui/Utils/PageHelper.cs

@@ -21,28 +21,30 @@ internal static string PrintNavigationPath()
         {
             var mainPage = Application.Current.MainPage;
             var navigation = mainPage.Navigation;
-            var pages = GetNavigationTree(navigation, mainPage).ToArray();
+            var pages = GetNavigationTree(mainPage).ToArray();
             var navigationPath = PrintNavigationPath(pages);
             return navigationPath;
         }
 
         private static string PrintNavigationPath(IEnumerable<Page> pages)
         {
-            return pages.Aggregate("", (current, page) => $"{current}/{(page?.GetType().Name ?? "")}");
+            return pages.Aggregate("", (current, page) => $"{current}/{page?.GetType().Name ?? ""}");
         }
 
-        internal static IEnumerable<Page> GetNavigationTree(INavigation navigation, Page page, bool modal = false)
+        internal static IEnumerable<Page> GetNavigationTree(Page page, bool modal = false)
         {
+            var navigation = page.Navigation;
+
             switch (page)
             {
                 case FlyoutPage flyoutPage:
                     yield return flyoutPage;
-                    foreach (var p in GetNavigationTree(flyoutPage.Flyout.Navigation, flyoutPage.Flyout))
+                    foreach (var p in GetNavigationTree(flyoutPage.Flyout))
                     {
                         yield return p;
                     }
 
-                    foreach (var p in GetNavigationTree(flyoutPage.Detail.Navigation, flyoutPage.Detail))
+                    foreach (var p in GetNavigationTree(flyoutPage.Detail))
                     {
                         yield return p;
                     }
@@ -51,7 +53,7 @@ internal static IEnumerable<Page> GetNavigationTree(INavigation navigation, Page
 
                 case TabbedPage tabbedPage:
                     yield return tabbedPage;
-                    foreach (var p in GetNavigationTree(tabbedPage.CurrentPage.Navigation, tabbedPage.CurrentPage))
+                    foreach (var p in GetNavigationTree(tabbedPage.CurrentPage))
                     {
                         yield return p;
                     }
@@ -77,7 +79,7 @@ internal static IEnumerable<Page> GetNavigationTree(INavigation navigation, Page
             {
                 foreach (var modalPage in navigation.ModalStack)
                 {
-                    foreach (var p in GetNavigationTree(modalPage.Navigation, modalPage, modal: true))
+                    foreach (var p in GetNavigationTree(modalPage, modal: true))
                     {
                         yield return p;
                     }