Merge pull request #2979 from PrismLibrary/dev/ds/uno-splash-support

.gitignore

@@ -204,4 +204,7 @@ FakesAssemblies/
 .mfractor/
 
 # Jetbrains files
-.idea*
+.idea*
+
+# Binlog
+*.binlog

e2e/Uno/HelloWorld/Views/Shell.xaml

@@ -4,27 +4,52 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:pr="using:Prism.Navigation.Regions"
     xmlns:pvm="using:Prism.Mvvm"
+    xmlns:toolkit="using:Uno.Toolkit.UI"
     pvm:ViewModelLocator.AutowireViewModel="true"
     xmlns:local="using:HelloWorld.Views"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" >
 
-  <Grid>
-    <Grid.RowDefinitions>
-      <RowDefinition Height="auto"/>
-      <RowDefinition Height="*" />
-    </Grid.RowDefinitions>
-    <StackPanel Margin="20"
+  <toolkit:ExtendedSplashScreen x:Name="Splash"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                HorizontalContentAlignment="Stretch"
+                VerticalContentAlignment="Stretch">
+    <toolkit:ExtendedSplashScreen.LoadingContentTemplate>
+      <DataTemplate>
+        <Grid>
+          <Grid.RowDefinitions>
+            <RowDefinition Height="2*" />
+            <RowDefinition />
+          </Grid.RowDefinitions>
+
+          <ProgressRing IsActive="True"
+                  Grid.Row="1"
+                  VerticalAlignment="Center"
+                  HorizontalAlignment="Center"
+                  Height="100"
+                  Width="100" />
+        </Grid>
+      </DataTemplate>
+    </toolkit:ExtendedSplashScreen.LoadingContentTemplate>
+    <Grid>
+      <Grid.RowDefinitions>
+        <RowDefinition Height="auto"/>
+        <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+      <StackPanel Margin="20"
                 HorizontalAlignment="Center"
                 Spacing="15">
-      <Image Source="ms-appx:///HelloWorld/Assets/prism.png"
+        <Image Source="ms-appx:///HelloWorld/Assets/prism.png"
              MaxHeight="80"/>
-      <TextBlock Text="{Binding Title}" FontSize="30" />
-      <StackPanel Orientation="Horizontal"
+        <TextBlock Text="{Binding Title}" FontSize="30" />
+        <StackPanel Orientation="Horizontal"
                   Spacing="15">
-        <Button Command="{Binding NavigateCommand}" CommandParameter="ViewA">Navigate to View A</Button>
-        <Button Command="{Binding NavigateCommand}" CommandParameter="ViewB">Navigate to View B</Button>
+          <Button Command="{Binding NavigateCommand}" CommandParameter="ViewA">Navigate to View A</Button>
+          <Button Command="{Binding NavigateCommand}" CommandParameter="ViewB">Navigate to View B</Button>
+        </StackPanel>
       </StackPanel>
-    </StackPanel>
-    <ContentControl Grid.Row="1" pr:RegionManager.RegionName="ContentRegion" />
-  </Grid>
+      <ContentControl Grid.Row="1" pr:RegionManager.RegionName="ContentRegion" />
+    </Grid>
+  </toolkit:ExtendedSplashScreen>
+
 </Page>

e2e/Uno/HelloWorld/Views/Shell.xaml.cs

@@ -1,12 +1,20 @@
+using Uno.Toolkit;
+
 namespace HelloWorld.Views;
 
 /// <summary>
 /// An empty page that can be used on its own or navigated to within a Frame.
 /// </summary>
-public sealed partial class Shell : Page
+public sealed partial class Shell : Page, ILoadableShell
 {
     public Shell()
     {
         this.InitializeComponent();
     }
+
+    public ILoadable Source
+    {
+        get => Splash.Source;
+        set => Splash.Source = value;
+    }
 }

src/Uno/Prism.Uno/ILoadableShell.cs

@@ -0,0 +1,9 @@
+using Uno.Toolkit;
+
+namespace Prism;
+
+#nullable enable
+public interface ILoadableShell
+{
+    ILoadable Source { get; set; }
+}

src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj

@@ -20,6 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Uno.Toolkit.WinUI" />
     <PackageReference Include="Uno.WinUI" />
     <PackageReference Include="Uno.Extensions.Hosting.WinUI" />
   </ItemGroup>

src/Uno/Prism.Uno/PrismApplicationBase.cs

@@ -5,6 +5,7 @@
 using Prism.Modularity;
 using Prism.Mvvm;
 using Prism.Navigation.Regions;
+using Uno.Toolkit;
 using Application = Microsoft.UI.Xaml.Application;
 
 #nullable enable
@@ -122,9 +123,16 @@ protected virtual void Initialize(IApplicationBuilder builder)
 
             RegisterFrameworkExceptionTypes();
 
+            var loadable = new PrismShellLoadable();
             var shell = CreateShell();
+
             if (shell != null)
             {
+                if (shell is ILoadableShell loadableShell)
+                {
+                    loadableShell.Source = loadable;
+                }
+
                 MvvmHelpers.AutowireViewModel(shell);
                 builder.Window.Content = shell;
                 builder.Window.Activate();
@@ -136,6 +144,8 @@ void FinalizeInitialization()
                     _host = builder.Build();
                     InitializeModules();
                     OnInitialized();
+                    loadable.FinishLoading();
+                    MvvmHelpers.ViewAndViewModelAction<IActiveAware>(shell, x => x.IsActive = true);
                 }
 
                 if (shell is FrameworkElement fe)

src/Uno/Prism.Uno/PrismShellLoadable.cs

@@ -0,0 +1,20 @@
+namespace Prism;
+
+#nullable enable
+internal sealed class PrismShellLoadable : Uno.ILoadable, Uno.Toolkit.ILoadable
+{
+    public bool IsExecuting { get; private set; } = true;
+
+    public bool IsLoaded { get; private set; }
+
+    public event EventHandler? IsExecutingChanged;
+    public event EventHandler<EventArgs>? Loaded;
+
+    public void FinishLoading()
+    {
+        IsExecuting = false;
+        IsLoaded = true;
+        IsExecutingChanged?.Invoke(this, EventArgs.Empty);
+        Loaded?.Invoke(this, EventArgs.Empty);
+    }
+}