Merge pull request #2999 from PrismLibrary/dev/ds/remove-uno-toolkit

Removing Uno.Toolkit dependency

e2e/Uno/.vscode/launch.json → .vscode/launch.json

@@ -4,6 +4,13 @@
   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
   "version": "0.2.0",
   "configurations": [
+    {
+      "name": "Uno Platform Mobile",
+      "type": "Uno",
+      "request": "launch",
+      // any Uno* task will do, this is simply to satisfy vscode requirement when a launch.json is present
+      "preLaunchTask": "Uno: android | Debug | android-x64"
+    },
     {
       // Use IntelliSense to find out which attributes exist for C# debugging
       // Use hover for the description of the existing attributes
@@ -12,15 +19,15 @@
       "type": "chrome",
       "request": "launch",
       "url": "http://localhost:5000",
-      "webRoot": "${workspaceFolder}/HelloWorld.Wasm",
+      "webRoot": "${workspaceFolder}/e2e/Uno/HelloWorld.Wasm",
       "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
       "timeout": 30000,
       "server": {
         "runtimeExecutable": "dotnet",
         "program": "run",
         "outputCapture": "std",
         "timeout": 30000,
-        "cwd": "${workspaceFolder}/HelloWorld.Wasm"
+        "cwd": "${workspaceFolder}/e2e/Uno/HelloWorld.Wasm"
       }
     },
     {
@@ -32,12 +39,12 @@
       "request": "launch",
       "preLaunchTask": "build-skia-gtk",
       // If you have changed target frameworks, make sure to update the program path.
-      "program": "${workspaceFolder}/HelloWorld.Skia.Gtk/bin/Debug/net7.0/HelloWorld.Skia.Gtk.dll",
+      "program": "${workspaceFolder}/e2e/Uno/HelloWorld.Skia.Gtk/bin/Debug/net7.0/HelloWorld.Skia.Gtk.dll",
       "args": [],
       "env": {
         "DOTNET_MODIFIABLE_ASSEMBLIES": "debug"
       },
-      "cwd": "${workspaceFolder}/HelloWorld.Skia.Gtk",
+      "cwd": "${workspaceFolder}/e2e/Uno/HelloWorld.Skia.Gtk",
       // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
       "console": "internalConsole",
       "stopAtEntry": false

.vscode/settings.json

@@ -1,4 +1,15 @@
 {
+  "explorer.fileNesting.enabled": true,
+  "explorer.fileNesting.expand": false,
+  "explorer.fileNesting.patterns": {
+    "*.xaml": "$(capture).xaml.cs",
+    "*.ts": "${capture}.js",
+    "*.js": "${capture}.js.map, ${capture}.min.js, ${capture}.d.ts",
+    "*.jsx": "${capture}.js",
+    "*.tsx": "${capture}.ts",
+    "tsconfig.json": "tsconfig.*.json",
+    "package.json": "package-lock.json, yarn.lock, pnpm-lock.yaml"
+  },
   "[azure-pipelines]": {
     "editor.insertSpaces": true,
     "editor.tabSize": 2,

e2e/Uno/HelloWorld.Mobile/HelloWorld.Mobile.csproj

@@ -12,6 +12,8 @@
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <ApplicationVersion>1</ApplicationVersion>
 
+		<AndroidManifest>Android\AndroidManifest.xml</AndroidManifest>
+
     <!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
     <!-- <MtouchExtraArgs Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
     <!-- Required for C# Hot Reload -->

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

@@ -7,14 +7,19 @@ namespace HelloWorld.Views;
 /// </summary>
 public sealed partial class Shell : Page, ILoadableShell
 {
+    private readonly CompositeLoadableSource _loadable;
     public Shell()
     {
         this.InitializeComponent();
+        _loadable = new ()
+        {
+            IsExecuting = true
+        };
+        Splash.Source = _loadable;
     }
 
-    public ILoadable Source
+    public void FinishLoading()
     {
-        get => Splash.Source;
-        set => Splash.Source = value;
+        _loadable.IsExecuting = false;
     }
 }

src/Uno/Prism.Uno/ILoadableShell.cs

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

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

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

src/Uno/Prism.Uno/PrismApplicationBase.cs

@@ -123,16 +123,10 @@ 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();
@@ -144,7 +138,8 @@ void FinalizeInitialization()
                     _host = builder.Build();
                     InitializeModules();
                     OnInitialized();
-                    loadable.FinishLoading();
+                    if (shell is ILoadableShell loadableShell)
+                        loadableShell.FinishLoading();
                     MvvmHelpers.ViewAndViewModelAction<IActiveAware>(shell, x => x.IsActive = true);
                 }