Merge branch 'PrismLibrary:master' into master

src/Maui/Prism.Maui/Navigation/PageNavigationService.cs

@@ -4,6 +4,7 @@
 using Prism.Events;
 using Prism.Extensions;
 using Prism.Mvvm;
+using Prism.Navigation.Regions;
 using Application = Microsoft.Maui.Controls.Application;
 using XamlTab = Prism.Navigation.Xaml.TabbedPage;
 
@@ -100,7 +101,9 @@ private async Task<INavigationResult> GoBackInternalAsync(INavigationParameters
 
             page = GetCurrentPage();
             if (IsRoot(GetPageFromWindow(), page))
-                throw new NavigationException(NavigationException.CannotPopApplicationMainPage, page);
+            {
+                return SendAppToBackground(page);
+            }
 
             parameters.GetNavigationParametersInternal().Add(KnownInternalParameters.NavigationMode, NavigationMode.Back);
 
@@ -843,7 +846,7 @@ private static void OnNavigatedTo(Page toPage, INavigationParameters parameters)
             {
                 MvvmHelpers.OnNavigatedTo(navigationPage.CurrentPage, parameters);
             }
-            else if (tabbedPage.BindingContext != tabbedPage.CurrentPage.BindingContext)
+            else if (tabbedPage.BindingContext != tabbedPage.CurrentPage?.BindingContext)
             {
                 MvvmHelpers.OnNavigatedTo(tabbedPage.CurrentPage, parameters);
             }
@@ -1255,6 +1258,18 @@ internal static bool UseReverseNavigation(Page currentPage, Type nextPageType)
         return MvvmHelpers.HasNavigationPageParent(currentPage) && MvvmHelpers.IsSameOrSubclassOf<ContentPage>(nextPageType);
     }
 
+    private INavigationResult SendAppToBackground(Page page)
+    {
+#if ANDROID
+        if (Window.Handler.PlatformView is MauiAppCompatActivity activity)
+        {
+            activity.MoveTaskToBack(true);
+            return new NavigationResult();
+        }
+#endif
+        throw new NavigationException(NavigationException.CannotPopApplicationMainPage, page);
+    }
+
     private INavigationResult Notify(NavigationRequestType type, INavigationParameters parameters, Exception exception = null)
     {
         var result = new NavigationResult(exception);

src/Maui/Prism.Maui/Navigation/Regions/Adapters/CarouselViewRegionAdapter.cs

@@ -1,7 +1,6 @@
-using System.Collections.Specialized;
+using System.Collections.Specialized;
 using Prism.Behaviors;
 using Prism.Common;
-using Prism.Ioc;
 using Prism.Mvvm;
 using Prism.Properties;
 
@@ -29,8 +28,8 @@ public CarouselViewRegionAdapter(IRegionBehaviorFactory regionBehaviorFactory)
     /// <param name="regionTarget">The object to adapt.</param>
     protected override void Adapt(IRegion region, CarouselView regionTarget)
     {
-        if (regionTarget == null)
-            throw new ArgumentNullException(nameof(regionTarget));
+        ArgumentNullException.ThrowIfNull(region);
+        ArgumentNullException.ThrowIfNull(regionTarget);
 
         bool itemsSourceIsSet = regionTarget.ItemsSource != null || regionTarget.IsSet(ItemsView.ItemsSourceProperty);
 

src/Maui/Prism.Maui/Navigation/Regions/Adapters/CollectionViewRegionAdapter.cs

@@ -1,4 +1,3 @@
-using Prism.Ioc;
 using Prism.Properties;
 
 namespace Prism.Navigation.Regions.Adapters;
@@ -25,11 +24,8 @@ public CollectionViewRegionAdapter(IRegionBehaviorFactory regionBehaviorFactory)
     /// <param name="regionTarget">The object to adapt.</param>
     protected override void Adapt(IRegion region, CollectionView regionTarget)
     {
-        if (region == null)
-            throw new ArgumentNullException(nameof(region));
-
-        if (regionTarget == null)
-            throw new ArgumentNullException(nameof(regionTarget));
+        ArgumentNullException.ThrowIfNull(region);
+        ArgumentNullException.ThrowIfNull(regionTarget);
 
         bool itemsSourceIsSet = regionTarget.ItemsSource != null || regionTarget.IsSet(ItemsView.ItemsSourceProperty);
 

src/Maui/Prism.Maui/Navigation/Regions/Adapters/ContentViewRegionAdapter{TContentView}.cs

@@ -1,5 +1,4 @@
-using System.Collections.Specialized;
-using Prism.Ioc;
+using System.Collections.Specialized;
 using Prism.Properties;
 
 namespace Prism.Navigation.Regions.Adapters;
@@ -27,8 +26,8 @@ public ContentViewRegionAdapter(IRegionBehaviorFactory regionBehaviorFactory)
     /// <param name="regionTarget">The object to adapt.</param>
     protected override void Adapt(IRegion region, TContentView regionTarget)
     {
-        if (regionTarget == null)
-            throw new ArgumentNullException(nameof(regionTarget));
+        ArgumentNullException.ThrowIfNull(region);
+        ArgumentNullException.ThrowIfNull(regionTarget);
 
         bool contentIsSet = regionTarget.Content != null || regionTarget.IsSet(ContentView.ContentProperty);
 

src/Maui/Prism.Maui/Navigation/Regions/Adapters/LayoutViewRegionAdapter.cs

@@ -25,11 +25,8 @@ public LayoutViewRegionAdapter(IRegionBehaviorFactory regionBehaviorFactory)
     /// <param name="regionTarget">The object to adapt.</param>
     protected override void Adapt(IRegion region, Layout<View> regionTarget)
     {
-        if (region == null)
-            throw new ArgumentNullException(nameof(region));
-
-        if (regionTarget == null)
-            throw new ArgumentNullException(nameof(regionTarget));
+        ArgumentNullException.ThrowIfNull(region);
+        ArgumentNullException.ThrowIfNull(regionTarget);
 
         bool itemsSourceIsSet = regionTarget.Children?.Any() ?? false || regionTarget.IsSet(BindableLayout.ItemsSourceProperty);
 

src/Maui/Prism.Maui/Navigation/Regions/Adapters/RegionAdapterBase.cs

@@ -1,6 +1,5 @@
-using System.Globalization;
+using System.Globalization;
 using Prism.Extensions;
-using Prism.Ioc;
 using Prism.Navigation.Regions.Behaviors;
 using Prism.Navigation.Xaml;
 using Prism.Properties;
@@ -75,11 +74,8 @@ IRegion IRegionAdapter.Initialize(object regionTarget, string regionName)
     /// <param name="regionTarget">The object to adapt.</param>
     protected virtual void AttachDefaultBehaviors(IRegion region, T regionTarget)
     {
-        if (region == null)
-            throw new ArgumentNullException(nameof(region));
-
-        if (regionTarget == null)
-            throw new ArgumentNullException(nameof(regionTarget));
+        ArgumentNullException.ThrowIfNull(region);
+        ArgumentNullException.ThrowIfNull(regionTarget);
 
         IRegionBehaviorFactory behaviorFactory = RegionBehaviorFactory;
         if (behaviorFactory != null)

src/Maui/Prism.Maui/Navigation/Regions/Adapters/ScrollViewRegionAdapter.cs

@@ -1,5 +1,4 @@
-using System.Collections.Specialized;
-using Prism.Ioc;
+using System.Collections.Specialized;
 using Prism.Properties;
 
 namespace Prism.Navigation.Regions.Adapters;
@@ -26,8 +25,8 @@ public ScrollViewRegionAdapter(IRegionBehaviorFactory regionBehaviorFactory)
     /// <param name="regionTarget">The object to adapt.</param>
     protected override void Adapt(IRegion region, ScrollView regionTarget)
     {
-        if (regionTarget == null)
-            throw new ArgumentNullException(nameof(regionTarget));
+        ArgumentNullException.ThrowIfNull(region);
+        ArgumentNullException.ThrowIfNull(regionTarget);
 
         // No binding check required as the ContentProperty is not Bindable
         bool contentIsSet = regionTarget.Content != null;

tests/Maui/Prism.DryIoc.Maui.Tests/Fixtures/Navigation/NavigationTests.cs

@@ -22,6 +22,7 @@ public NavigationTests(ITestOutputHelper testOutputHelper)
     [InlineData("MockHome/NavigationPage/MockViewA")]
     [InlineData("MockExplicitTabbedPage")]
     [InlineData("TabbedPage?createTab=NavigationPage%2FMockViewA%2FMockViewB%3Fid%3D5%2FMockViewC&createTab=MockViewD")]
+    [InlineData("NavigationPage/MockViewB/TabbedPage?createTab=MockViewA/MockViewC")]
     public void PagesInjectScopedInstanceOfIPageAccessor(string uri)
     {
         var mauiApp = CreateBuilder(prism => prism.CreateWindow(uri))

tests/Maui/Prism.Maui.Tests/Fixtures/Common/MvvmHelperFixture.cs

@@ -1,9 +1,18 @@
+using Moq;
 using Prism.Common;
 
 namespace Prism.Maui.Tests.Fixtures.Common;
 
 public class MvvmHelperFixture
 {
+    public MvvmHelperFixture()
+    {
+        var provider = new Mock<IDispatcherProvider>();
+        provider.Setup(x => x.GetForCurrentThread()).Returns(Mock.Of<IDispatcher>());
+
+        DispatcherProvider.SetCurrent(provider.Object);
+    }
+
     /// <summary>
     /// This test was introduced to verify GH3143
     /// </summary>
@@ -96,12 +105,12 @@ public async Task GetCurrentPageFromContentPageWithModalReturnsContentPage()
     /// This test was introduced to verify GH3143
     /// </summary>
     /// <a href="https://github.com/PrismLibrary/Prism/issues/3143">Git Hub Issue 3143</a>
-    [Fact(Skip = "System.InvalidOperationException\nBindableObject was not instantiated on a thread with a dispatcher nor does the current application have a dispatcher.")]
+    [Fact]
     public async Task GetCurrentPageFromTabbedPageWithModalReturnsContentPage()
     {
         // Given
         var expected = new ContentPage();
-        var tabbedPage = new TabbedPage { Title = "Tab", Children = { expected }};
+        var tabbedPage = new TabbedPage { Title = "Tab", Children = { expected } };
         var window = new Window { Page = tabbedPage };
         await window.Navigation.PushModalAsync(new DialogContainerPage());
 
@@ -116,13 +125,13 @@ public async Task GetCurrentPageFromTabbedPageWithModalReturnsContentPage()
     /// This test was introduced to verify GH3143
     /// </summary>
     /// <a href="https://github.com/PrismLibrary/Prism/issues/3143">Git Hub Issue 3143</a>
-    [Fact(Skip = "System.InvalidOperationException\nBindableObject was not instantiated on a thread with a dispatcher nor does the current application have a dispatcher.")]
+    [Fact]
     public async Task GetCurrentPageFromTabbedNavigationPageWithModalReturnsContentPage()
     {
         // Given
         var expected = new ContentPage();
         var navigationPage = new NavigationPage(expected);
-        var tabbedPage = new TabbedPage { Title = "Tab", Children = { navigationPage }};
+        var tabbedPage = new TabbedPage { Title = "Tab", Children = { navigationPage } };
         var window = new Window { Page = tabbedPage };
         await window.Navigation.PushModalAsync(new DialogContainerPage());
 

tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj

@@ -33,8 +33,4 @@
     <ProjectReference Include="..\..\..\src\Maui\Prism.Maui\Prism.Maui.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Fixtures\Mvvm\" />
-  </ItemGroup>
-
 </Project>