Working on app model

ShortDevelopment · ShortDevelopment · commit 02bca6bb5e0d · 2022-07-04T00:02:36.000+02:00
diff --git a/ShortDev.Uwp.FullTrust/Core/Xaml/XamlApplicationWrapper.cs b/ShortDev.Uwp.FullTrust/Core/Xaml/XamlApplicationWrapper.cs
@@ -12,8 +12,7 @@ public sealed class XamlApplicationWrapper : IDisposable
 
         public XamlApplicationWrapper(Func<XamlApplication> callback)
         {
-            if (Current != null)
-                throw new InvalidOperationException($"Only one instance of \"{nameof(XamlApplicationWrapper)}\" is allowed!");
+            ThrowOnAlreadyRunning();
 
             Application = callback();
             Current = this;
@@ -24,6 +23,11 @@ public void Dispose()
             Application = null;
         }
 
+        internal static void ThrowOnAlreadyRunning()
+        {
+            if (Current != null)
+                throw new InvalidOperationException($"Only one instance of \"{nameof(XamlApplicationWrapper)}\" is allowed!");
+        }
 
         public static XamlApplicationWrapper? Current { get; private set; }
 
diff --git a/ShortDev.Uwp.FullTrust/Core/Xaml/XamlWindowActivator.cs b/ShortDev.Uwp.FullTrust/Core/Xaml/XamlWindowActivator.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
+using Windows.ApplicationModel.Core;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Markup;
@@ -20,6 +21,9 @@ public sealed class XamlWindowActivator
         /// A <see cref="XamlWindowSubclass"/> will be attached automatically.
         /// </summary>
         public static XamlWindow CreateNewWindow(XamlWindowConfig config)
+            => CreateNewInternal(config).window;
+
+        internal static (CoreApplicationView coreAppView, XamlWindow window) CreateNewInternal(XamlWindowConfig config)
         {
             if (XamlApplicationWrapper.Current == null)
                 throw new InvalidOperationException($"No instance of \"{nameof(XamlApplicationWrapper)}\" was found!");
@@ -57,22 +61,23 @@ public static XamlWindow CreateNewWindow(XamlWindowConfig config)
             subclass.IsTopMost = config.IsTopMost;
             subclass.HasWin32TitleBar = config.HasWin32TitleBar;
 
-            //coreWindow.Closed += (CoreWindow window, CoreWindowEventArgs args) =>
-            //{
-            //    subclass.Dispose();
-            //};
+            coreWindow.Closed += (CoreWindow window, CoreWindowEventArgs args) =>
+            {
+                subclass.Dispose();
+            };
 
             // Show window
             if (config.IsVisible)
                 window.Activate();
 
-            return window;
+            return (coreView, window);
         }
 
         /// <summary>
         /// Creates a new <see cref="XamlWindow"/>, loads xaml from a <see cref="Stream"/> and sets it as <see cref="XamlWindow.Content"/>. <br/>
         /// The <see cref="Stream"/> will be disposed automatically!
         /// </summary>
+        [Obsolete]
         public static XamlWindow CreateNewFromXaml(XamlWindowConfig config, Stream xamlStream)
         {
             using (xamlStream)
@@ -83,20 +88,13 @@ public static XamlWindow CreateNewFromXaml(XamlWindowConfig config, Stream xamlS
         /// <summary>
         /// Creates a new <see cref="XamlWindow"/> and sets xaml as <see cref="XamlWindow.Content"/>. <br/>
         /// </summary>
+        [Obsolete]
         public static XamlWindow CreateNewFromXaml(XamlWindowConfig config, string xaml)
         {
             var window = CreateNewWindow(config);
             UIElement content = (UIElement)XamlReader.Load(xaml);
             window.Content = content;
             return window;
         }
-
-        public static void CreateNewThread(Action callback)
-        {
-            Thread thread = new(() => callback());
-            thread.SetApartmentState(ApartmentState.STA);
-            thread.IsBackground = true;
-            thread.Start();
-        }
     }
 }
diff --git a/ShortDev.Uwp.FullTrust/Core/Xaml/XamlWindowConfig.cs b/ShortDev.Uwp.FullTrust/Core/Xaml/XamlWindowConfig.cs
@@ -1,7 +1,24 @@
-﻿namespace ShortDev.Uwp.FullTrust.Core.Xaml
+﻿using System.Diagnostics;
+using Windows.ApplicationModel;
+
+namespace ShortDev.Uwp.FullTrust.Core.Xaml
 {
     public sealed class XamlWindowConfig
     {
+        public static XamlWindowConfig Default
+        {
+            get
+            {
+                string windowTitle = Process.GetCurrentProcess().ProcessName;
+                try
+                {
+                    windowTitle = Package.Current?.DisplayName ?? windowTitle;
+                }
+                catch { }
+                return new(windowTitle);
+            }
+        }
+
         public XamlWindowConfig(string title)
             => this.Title = title;
 
diff --git a/ShortDev.Uwp.FullTrust/ShortDev.Uwp.FullTrust.csproj b/ShortDev.Uwp.FullTrust/ShortDev.Uwp.FullTrust.csproj
@@ -26,7 +26,12 @@
 		<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1">
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
+		<PackageReference Include="System.Numerics.Vectors" Version="4.5.0">
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="System.Runtime.InteropServices.WindowsRuntime" Version="4.3.0">
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/ShortDev.Uwp.FullTrust/Windows/UI/Xaml/FullTrustApplication.cs b/ShortDev.Uwp.FullTrust/Windows/UI/Xaml/FullTrustApplication.cs
@@ -1,10 +1,10 @@
 ﻿using ShortDev.Uwp.FullTrust.Core.Xaml;
 using System;
-using System.Diagnostics;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Threading;
-using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
+using Windows.ApplicationModel.Core;
 using Windows.System;
 using Windows.UI.ViewManagement;
 
@@ -26,28 +26,34 @@ public static Application Current
         [MTAThread]
         public static void Start([In] ApplicationInitializationCallback callback)
         {
-            Thread thread = new(() =>
+            XamlApplicationWrapper.ThrowOnAlreadyRunning();
+
+            Start(callback, XamlWindowConfig.Default);
+        }
+
+        /// <inheritdoc cref="Start(ApplicationInitializationCallback)" />
+        /// <param name="windowConfig">Custom <see cref="XamlWindowConfig"/>.</param>
+        [MTAThread]
+        public static void Start([In] ApplicationInitializationCallback callback, [In] XamlWindowConfig windowConfig)
+        {
+            XamlApplicationWrapper.ThrowOnAlreadyRunning();
+
+            Thread thread = CreateNewUIThread(() =>
             {
                 // Application singleton is created here
                 callback(null);
 
-                string windowTitle = Process.GetCurrentProcess().ProcessName;
-                try
-                {
-                    windowTitle = Package.Current?.DisplayName ?? windowTitle;
-                }
-                catch { }
+                // Satisfy our api
+                _ = new XamlApplicationWrapper(() => Application.Current);
 
                 // Create XamlWindow
-                var window = XamlWindowActivator.CreateNewWindow(new(windowTitle));
+                var window = XamlWindowActivator.CreateNewWindow(windowConfig);
 
                 InvokeOnLaunched();
 
                 // Run message loop
                 XamlWindowSubclass.ForWindow(window).CurrentFrameworkView!.Run();
             });
-            thread.SetApartmentState(ApartmentState.STA);
-            thread.Start();
             thread.Join();
         }
 
@@ -56,7 +62,11 @@ public static void Start([In] ApplicationInitializationCallback callback)
         /// </summary>
         static void InvokeOnLaunched()
         {
-            IApplicationOverrides applicationOverrides = (IApplicationOverrides)Current;
+            var app = Current;
+            app.GetType().GetMethod("OnLaunched", BindingFlags.Instance | BindingFlags.NonPublic).Invoke(app, new[] { new Win32LaunchActivatedEventArgs() as object as LaunchActivatedEventArgs });
+
+            return;
+            IApplicationOverrides applicationOverrides = (IApplicationOverrides)app;
             applicationOverrides.OnLaunched(new Win32LaunchActivatedEventArgs());
         }
 
@@ -101,5 +111,29 @@ public TileActivatedInfo TileActivatedInfo
             public User User
                 => _currentUser;
         }
+
+        public static Thread CreateNewUIThread(Action callback)
+        {
+            if (callback == null)
+                throw new ArgumentNullException(nameof(callback));
+
+            Thread thread = new(() => callback());
+            thread.SetApartmentState(ApartmentState.STA);
+            thread.Start();
+            return thread;
+        }
+
+        /// <summary>
+        /// Creates a new view for the app.
+        /// </summary>
+        public static CoreApplicationView CreateNewView()
+            => CreateNewView(XamlWindowConfig.Default);
+
+        /// ´<inheritdoc cref="CreateNewView" />
+        public static CoreApplicationView CreateNewView(XamlWindowConfig windowConfig)
+        {
+            var result = XamlWindowActivator.CreateNewInternal(windowConfig);
+            return result.coreAppView;
+        }
     }
 }
diff --git a/Test/Host/Program.cs b/Test/Host/Program.cs
@@ -11,6 +11,7 @@
 using Windows.UI.Core;
 using Windows.UI.Core.Preview;
 using Windows.UI.Popups;
+using Windows.UI.Xaml;
 
 namespace VBAudioRouter.Host
 {
@@ -24,6 +25,8 @@ static void Main()
             // https://raw.githubusercontent.com/fboldewin/COM-Code-Helper/master/code/interfaces.txt
             // GOOGLE: "IApplicationViewCollection" site:lise.pnfsoftware.com
 
+            FullTrustApplication.Start((param) => new App());
+
             using (XamlApplicationWrapper appWrapper = new(() => new App()))
             {
                 //XamlWindowActivator.CreateNewThread(() =>
diff --git a/Test/UwpUI/App.xaml.cs b/Test/UwpUI/App.xaml.cs
@@ -1,4 +1,6 @@
-﻿using Windows.UI.Xaml;
+﻿using Windows.ApplicationModel.Activation;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
 
 namespace UwpUI
 {
@@ -8,5 +10,12 @@ public App()
         {
             this.InitializeComponent();
         }
+
+        protected override void OnLaunched(LaunchActivatedEventArgs args)
+        {
+            Frame frame = new Frame();
+            Window.Current.Content = frame;
+            frame.Navigate(typeof(MainPage));
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`using Windows.UI.Core;`
`12`	`12`	`using Windows.UI.Core.Preview;`
`13`	`13`	`using Windows.UI.Popups;`
	`14`	`+using Windows.UI.Xaml;`
`14`	`15`
`15`	`16`	`namespace VBAudioRouter.Host`
`16`	`17`	`{`
`@@ -24,6 +25,8 @@ static void Main()`
`24`	`25`	`// https://raw.githubusercontent.com/fboldewin/COM-Code-Helper/master/code/interfaces.txt`
`25`	`26`	`// GOOGLE: "IApplicationViewCollection" site:lise.pnfsoftware.com`
`26`	`27`
	`28`	`+ FullTrustApplication.Start((param) => new App());`
	`29`	`+`
`27`	`30`	`using (XamlApplicationWrapper appWrapper = new(() => new App()))`
`28`	`31`	`{`
`29`	`32`	`//XamlWindowActivator.CreateNewThread(() =>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-using Windows.UI.Xaml;`
	`1`	`+using Windows.ApplicationModel.Activation;`
	`2`	`+using Windows.UI.Xaml;`
	`3`	`+using Windows.UI.Xaml.Controls;`
`2`	`4`
`3`	`5`	`namespace UwpUI`
`4`	`6`	`{`
`@@ -8,5 +10,12 @@ public App()`
`8`	`10`	`{`
`9`	`11`	`this.InitializeComponent();`
`10`	`12`	`}`
	`13`	`+`
	`14`	`+ protected override void OnLaunched(LaunchActivatedEventArgs args)`
	`15`	`+ {`
	`16`	`+ Frame frame = new Frame();`
	`17`	`+ Window.Current.Content = frame;`
	`18`	`+ frame.Navigate(typeof(MainPage));`
	`19`	`+ }`
`11`	`20`	`}`
`12`	`21`	`}`