Merge into ReleaseCandidate as of 10-07-26

Vanara-Jnana/App.xaml.cs

@@ -1,3 +1,4 @@
+using Jnana;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 //using LaunchActivatedEventArgs = Windows.ApplicationModel.Activation.LaunchActivatedEventArgs;

Vanara-Jnana/Directory.Packages.props

@@ -1,6 +1,5 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.Web.WebView2" />
     <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.0" />
   </ItemGroup>
 </Project>

Vanara-Jnana/Helpers/ImageExtensions.cs

@@ -0,0 +1,25 @@
+using Microsoft.UI.Xaml.Media.Imaging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jnana.Helpers;
+
+public class ImageExtensions
+{
+    public static BitmapImage? ToBitmapImage(byte[]? bytes)
+    {
+        if (bytes == null || bytes.Length == 0)
+            return null;
+
+        var bitmap = new BitmapImage();
+
+        using var ms = new MemoryStream(bytes);
+        var ras = ms.AsRandomAccessStream();
+
+        bitmap.SetSource(ras);
+        return bitmap;
+    }
+}

Vanara-Jnana/Helpers/WindowsSystemDispatcherQueueHelper.cs

@@ -1,6 +1,6 @@
 using Microsoft.UI.Dispatching;
 
-namespace ClassicSamplesBrowser.Helpers;
+namespace Jnana.Helpers;
 
 public class WindowsSystemDispatcherQueueHelper
 {

Vanara-Jnana/Jnana.csproj

@@ -26,9 +26,19 @@
 		<Page Remove="Resources\**" />
 	</ItemGroup>
 	<ItemGroup>
+		<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.260529-build.2632" />
+		<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.Ribbon" Version="0.1.260529-build.2632" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
-		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3912.50" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.260317003" />
+		<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Collections" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.DeveloperTools" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.251219" />
+		<PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.2.251219" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="2.2.0" />
 		<PackageReference Include="NuGet.Common" Version="7.3.1" />
 		<PackageReference Include="NuGet.Protocol" Version="7.3.1" />
 		<PackageReference Include="Vanara.Core" Version="5.0.5" />

Vanara-Jnana/MainWindow.xaml

@@ -1,9 +1,8 @@
 <Window
-    x:Class="ClassicSamplesBrowser.MainWindow"
+    x:Class="Jnana.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:ClassicSamplesBrowser"
-    xmlns:controls="using:ClassicSamplesBrowser.Vanara.Controls"
+    xmlns:local="using:Jnana"
     Title="Vanara Jñāna"
     Activated="Window_Activated">
 

Vanara-Jnana/MainWindow.xaml.cs

@@ -1,17 +1,15 @@
-using ClassicSamplesBrowser.Helpers;
-using ClassicSamplesBrowser.Views;
+using Jnana.Views;
 using Microsoft.UI.Composition.SystemBackdrops;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI;
-using System.Drawing;
+using System.Diagnostics;
 using Vanara.PInvoke;
 using Windows.Graphics;
 using WinRT;
-using ClassicSamplesBrowser.Services;
-using System.Diagnostics;
+using Jnana.Helpers;
 
-namespace ClassicSamplesBrowser;
+namespace Jnana;
 
 public sealed partial class MainWindow : Window
 {
@@ -28,8 +26,8 @@ public MainWindow()
 
         //        _navigationService = new NavigationService(RootFrame);
 
-        //var initialSize = ApplicationData.Current.LocalSettings.Values["InitialWindowSize"] as string;
-        //this.AppWindow.Size = _initialWindowSize;
+        // var initialSize = ApplicationData.Current.LocalSettings.Values["InitialWindowSize"] as string;
+        // this.AppWindow.Size = _initialWindowSize;
         // AppWindow.Size = new Size() { Width = 800, Height = 600 };
 
         _ = RootFrame.Navigate(typeof(ShellPage));

Vanara-Jnana/Models/INavigationService.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jnana.Models;
+
+public interface INavigationService
+{
+    public enum Area
+    {
+        Void,
+        NuGets,
+        GitHub,
+        Samples,
+        Disassembler,
+        Utilities,
+        Settings
+    }
+
+    void NavigateTo(Area area);
+}

Vanara-Jnana/Services/ISettingsSerializer.cs → Vanara-Jnana/Models/ISettingsSerializer.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace ClassicSamplesBrowser.Services;
+namespace Jnana.Models;
 
 public interface ISettingsSerializer : INotifyPropertyChanged
 {

Vanara-Jnana/Services/INuGetCatalogService.cs

@@ -0,0 +1,36 @@
+using Microsoft.UI.Xaml.Media.Imaging;
+using NuGet.Versioning;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jnana.Services;
+
+public record PackageId(string Id);
+
+public record PackageVersionInfo(
+    string Id,
+    string Version,
+    Uri? IconUrl,
+    string? Description,
+    string? Summary,
+    BitmapImage? Icon
+);
+
+public record PackageContent(
+    string Id,
+    NuGetVersion Version,
+    IReadOnlyList<string> Assemblies,
+    string? Readme,
+    byte[]? IconBytes,
+    BitmapImage? Icon
+);
+
+public interface INuGetCatalogService
+{
+    IAsyncEnumerable<PackageId> SearchPackagesAsync(string prefix, CancellationToken token);
+    Task<PackageVersionInfo?> GetLatestStableVersionAsync(string packageId, CancellationToken token);
+    Task<PackageContent> DownloadPackageAsync(string id, NuGetVersion version, CancellationToken token);
+}

Vanara-Jnana/Services/NavigationService.cs

@@ -1,125 +1,51 @@
-using ClassicSamplesBrowser.Views;
-using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Jnana.Models;
 using Jnana.Views;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.Win32;
 using System.Diagnostics;
-using Vanara.PInvoke;
-using static ClassicSamplesBrowser.Services.INavigationService;
+using static Jnana.Models.INavigationService;
 
-namespace ClassicSamplesBrowser.Services;
-
-public interface INavigationService
-{
-    public enum Area
-    {
-        Void,
-        NuGets,
-        GitHub,
-        Samples,
-        Disassembler,
-        Utilities,
-        Settings
-    }
-
-    void NavigateTo(Area area);
-}
+namespace Jnana.Services;
 
 public partial class NavigationService : ObservableObject, INavigationService
 {
-    public Area CurrentArea
-    {
-        get;
-        set
-        {
-            if (SetProperty(ref field, value))
-            {
-                OnPropertyChanged(nameof(CurrentPage));
-            }
-        }
-    } = Area.Void;
-
-    public Page CurrentPage => CurrentArea switch
-    {
-        Area.GitHub => new GitHubPage(),
-        Area.NuGets => new NuGetsPage(),
-        Area.Samples => new SamplesPage(),
-        Area.Settings => new SettingsPage(),
-        _ => new VoidPage()
-    };
-
     private readonly Frame _frame;
     private readonly Dictionary<Area, Type> _areaPageMap;
 
     public NavigationService(Frame frame)
     {
-        _frame = frame;
+        _frame = frame ?? throw new ArgumentNullException(nameof(frame));
 
         _areaPageMap = new()
         {
+            { Area.Disassembler, typeof(DisassemblerPage)  },
             { Area.GitHub, typeof(GitHubPage) },
             { Area.NuGets, typeof(NuGetsPage) },
             { Area.Samples, typeof(SamplesPage) },
             { Area.Settings, typeof(SettingsPage) },
+            { Area.Utilities, typeof(UtilitiesPage) },
             { Area.Void, typeof(VoidPage) },
         };
-
-        // INFO: @dahall - select a default page to navigate to on loading, to ensure the main content area is populated with a page, and to establish a consistent starting point for navigation
-        //NavigateTo(Area.Void);
-        //NavigateTo(Area.Settings);
     }
 
-    //    // TODO:
-    //    //    public static void Navigate(Shell32.IShellFolder shellFolder)
-    //    //    {
-    //    //        TryNavigate(shellFolder);
-    //    //    }
-    //    public bool TryNavigate(object target, bool allowPageCreation = true)
-    //    {
-    //        try
-    //        {
-    //            var pageType = target switch
-    //            {
-    //                "Assemblies" => typeof(AssembliesPage),
-    //                "GitHub" => typeof(GitHubPage),
-    //                "NuGets" => typeof(NuGetsPage),
-    //                "Samples" => typeof(SamplesPage),
-    //                "Settings" => typeof(SettingsPage),
-    //                "Start" => typeof(StartPage),
-    //                "Utilities" => typeof(UtilitiesPage),
-    //                _ => null
-    //            };
-    //
-    //            // Check if the page type is null and if page creation is allowed
-    //            if (pageType == null && !allowPageCreation)
-    //            {
-    //                //LogWriter.PrintLine("Page type is null and page creation is not allowed.");
-    //                return false;
-    //            }
-    //
-    //            // TODO: _frame.Navigate(pageType ?? new UtilitiesPage());
-    //            //return _frame.Navigate(pageType);
-    //            return true;
-    //        }
-    //        catch (Exception ex)
-    //        {
-    //            Debug.Fail(ex.ToString());
-    //            throw;
-    //        }
-    //    }
-
-    public static void NavigateBack() { }
-
-    public static void Forward() { }
-
     public void NavigateTo(Area area)
     {
-        if (_areaPageMap.TryGetValue(area, out var pageType))
+        try
+        {
+            if (_areaPageMap.TryGetValue(area, out var pageType))
+            {
+                Debug.Print($"Navigating to `{area}` page.");
+                _frame.Navigate(pageType);
+            }
+            else
+            {
+                Debug.Print($"Failed to get page for `{area}` from PageMap.");
+            }
+        }
+        catch (Exception ex)
         {
-            Debug.Print($"Navigating to `{area}` page.");
-            _frame.Navigate(pageType);
+            Debug.Fail(ex.ToString());
+            throw;
         }
     }
-
-    //public void Navigate(Area area) { CurrentArea = area; }
 }