Merged changes from pull request morganstanley#154 (manual merge due …

…to lots of renames)

Tryouts/Prototypes/Shell/App.xaml.cs

@@ -24,7 +24,9 @@ public partial class App : Application
     {
         private void Application_Startup(object sender, StartupEventArgs e)
         {
-            if (e.Args.Length != 0 && CommandLineParser.TryParse<WebWindowOptions>(e.Args, out var webWindowOptions))
+            if (e.Args.Length != 0
+                && CommandLineParser.TryParse<WebWindowOptions>(e.Args, out var webWindowOptions)
+                && webWindowOptions.Url != null)
             {
                 StartWithWebWindowOptions(webWindowOptions);
 

Tryouts/Prototypes/Shell/ImageSource/IImageSourcePolicy.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Shell.ImageSource
 {

Tryouts/Prototypes/Shell/MainWindow.xaml.cs

@@ -12,23 +12,11 @@
 //  * and limitations under the License.
 //  */
 
-using Manifest;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Runtime.CompilerServices;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using Manifest;
 
 namespace Shell
 {
@@ -50,10 +38,16 @@ public MainWindow()
             DataContext = modules;
         }
 
-        private void CreateWebWindow(ModuleModel item) 
+        private void CreateWebWindow(ModuleModel item)
         {
-            var webWindow = new WebWindow(new WebWindowOptions{Url = item.Url});
-            webWindow.Title = item.AppName;
+            var options = new WebWindowOptions
+            {
+                Title = item.AppName,
+                Url = item.Url,
+                IconUrl = item.IconUrl
+            };
+
+            var webWindow = new WebWindow(options);
             webWindow.Owner = this;
             webWindow.Closed += WebWindowClosed;
             webWindows.Add(webWindow);

Tryouts/Prototypes/Shell/Manifest/ManifestModel.cs

@@ -12,10 +12,6 @@
 //  * and limitations under the License.
 //  */
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.Json.Serialization;
 using System.Text.Json;
 
 namespace Manifest

Tryouts/Prototypes/Shell/Manifest/ManifestParser.cs

@@ -13,14 +13,8 @@
 //  */
 
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Security.Policy;
-using System.Text;
 using System.Text.Json;
-using System.Windows.Automation;
-using System.Windows.Controls.Primitives;
-using System.Windows.Documents;
 
 namespace Manifest
 {

Tryouts/Prototypes/Shell/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "Shell": {
       "commandName": "Project",
-      "commandLineArgs": "--url \"https://google.com\" --width 1600 --height 900 --title \"Compose Demo\""
+      "commandLineArgs": "--title Jane --width 1800 --height 800 --url http://www.google.com --icon /images/branding/googleg/1x/googleg_standard_color_128dp.png"
     }
   }
 }

Tryouts/Prototypes/Shell/Utilities/CommandLineParser.cs

@@ -1,11 +1,11 @@
-using System.Collections.Generic;
-using System.CommandLine.Parsing;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.CommandLine;
+using System.CommandLine.Parsing;
 using System.ComponentModel.DataAnnotations;
-using System.Reflection;
-using System;
-using System.Collections.Concurrent;
 using System.Linq;
+using System.Reflection;
 
 namespace Shell.Utilities;
 

Tryouts/Prototypes/Shell/WebWindow.xaml.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Windows;
 using Microsoft.Web.WebView2.Core;
+using Shell.ImageSource;
 
 namespace Shell
 {
@@ -17,6 +18,7 @@ public WebWindow(WebWindowOptions webWindowOptions)
             Width = webWindowOptions.Width ?? WebWindowOptions.DefaultWidth;
             Height = webWindowOptions.Height ?? WebWindowOptions.DefaultHeight;
             webView.Source = new Uri(webWindowOptions.Url ?? WebWindowOptions.DefaultUrl);
+            TrySetIconUrl(webWindowOptions);
 
             webView.CoreWebView2InitializationCompleted += (sender, args) =>
             {
@@ -27,6 +29,23 @@ public WebWindow(WebWindowOptions webWindowOptions)
             };
         }
 
+        private readonly ImageSourceProvider _iconProvider = new ImageSourceProvider(new EnvironmentImageSourcePolicy());
+
+        private void TrySetIconUrl(WebWindowOptions webWindowOptions)
+        {
+            if (webWindowOptions.IconUrl == null)
+                return;
+
+            // TODO: What's the default URL if the app is running from a manifest? We should probably not allow relative urls in that case.
+            var appUrl = new Uri(webWindowOptions.Url ?? WebWindowOptions.DefaultUrl);
+            var iconUrl = webWindowOptions.IconUrl != null ? new Uri(webWindowOptions.IconUrl, UriKind.RelativeOrAbsolute) : null;
+
+            if (iconUrl != null)
+            {
+                Icon = _iconProvider.GetImageSource(iconUrl, appUrl);
+            }
+        }
+
         private async void OnNewWindowRequested(CoreWebView2NewWindowRequestedEventArgs e)
         {
             e.Handled = true;

Tryouts/Prototypes/Shell/WebWindowOptions.cs

@@ -13,7 +13,7 @@ public sealed class WebWindowOptions
         [Display(Description = $"Set the url for the web view. Default: {DefaultUrl}")]
         public string? Url { get; set; }
 
-        [Display(Description = $"Set the icon url for the window.")]
+        [Display(Name = "icon", Description = $"Set the icon url for the window.")]
         public string? IconUrl { get; set; }
 
         [Display(Description = $"Set the width of the window. Default: 800")]