Merge the new WinUI version into the main branch

.gitignore

@@ -233,4 +233,14 @@ project.lock.json
 
 WebSrc/language-server-log.txt
 
-._*
+._*
+
+
+## Dev Licence Files
+
+**/devlics
+**/devlics/*
+*.devlic
+*.license
+language-server-log.txt
+QuickDrawWindows/Properties/launchSettings.json

QuickDraw.Core/Models/ImageFolder.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace QuickDraw.Core.Models;
+
+public class ImageFolder
+{
+    public string Path { get; }
+    public int ImageCount { get; set; }
+
+    [JsonIgnore]
+    public bool IsLoading { get; set; } = false;
+
+    public bool Selected { get; set; } = false;
+
+    public ImageFolder(string path, int imageCount = 0, bool selected = false, bool isLoading = false)
+    {
+        Path = path;
+        ImageCount = imageCount;
+        Selected = selected;
+        IsLoading = isLoading;
+    }
+}

QuickDraw.Core/Models/ImageFolderList.cs

@@ -0,0 +1,142 @@
+using System.Collections.Concurrent;
+using System.Collections.Specialized;
+
+namespace QuickDraw.Core.Models;
+
+public class ImageFolderList : INotifyCollectionChanged
+{
+    public List<ImageFolder> ImageFolders { get; set; } = [];
+
+    public event NotifyCollectionChangedEventHandler? CollectionChanged;
+
+    private static async Task<IEnumerable<string>> GetImagesForFolder(string filepath)
+    {
+        return await Task.Run(() =>
+        {
+            var enumerationOptions = new EnumerationOptions
+            {
+                IgnoreInaccessible = true,
+                RecurseSubdirectories = true,
+                AttributesToSkip = System.IO.FileAttributes.Hidden | System.IO.FileAttributes.System | System.IO.FileAttributes.ReparsePoint
+            };
+
+            IEnumerable<string> files = Directory.EnumerateFiles(filepath, "*.*", enumerationOptions)
+                                    .Where(s => s.EndsWith(".jpg", StringComparison.OrdinalIgnoreCase)
+                                            || s.EndsWith(".jpeg", StringComparison.OrdinalIgnoreCase)
+                                            || s.EndsWith(".png", StringComparison.OrdinalIgnoreCase));
+
+            return files;
+        });
+    }
+
+    public static async Task<IEnumerable<string>> GetImagesForFolders(IEnumerable<string> folders)
+    {
+        ConcurrentBag<string> images = [];
+
+        await Parallel.ForEachAsync<string>(folders, async (folder, ct) =>
+        {
+            IEnumerable<string> files = await GetImagesForFolder(folder);
+
+            foreach (var file in files)
+            {
+                images.Add(file);
+            }
+        });
+
+        return images;
+    }
+
+    public void UpdateFolderCount(ImageFolder existingFolder)
+    {
+        var folder = new ImageFolder(existingFolder.Path, existingFolder.ImageCount, existingFolder.Selected, true);
+        var folderIndex = ImageFolders.IndexOf(existingFolder);
+
+        if (folderIndex == -1)
+        {
+            return; // Folder isn't in list, TODO: should log
+        }
+
+        ImageFolders[folderIndex] = folder;
+        CollectionChanged?.Invoke(this, new(NotifyCollectionChangedAction.Replace, folder, existingFolder, folderIndex));
+
+        LoadFolderCount(folder);
+    }
+
+    public void UpdateFolderCounts()
+    {
+        List<ImageFolder> folders = [.. ImageFolders];
+        foreach(var folder in folders)
+        {
+            UpdateFolderCount(folder);
+        }
+    }
+
+    private void LoadFolderCount(ImageFolder folder)
+    {
+        Task.Run(async () =>
+        {
+            await Task.Delay(200);
+            return await GetImagesForFolder(folder.Path);
+        }).ContinueWith((t) =>
+        {
+            if (t.IsFaulted)
+            {
+                // Log error
+            }
+            else
+            {
+                folder.ImageCount = t.Result.Count();
+                folder.IsLoading = false;
+
+                var existingFolder = ImageFolders.FirstOrDefault<ImageFolder>((f) => f.Path == folder.Path);
+                var folderIndex = existingFolder != null ? ImageFolders.IndexOf(existingFolder) : -1;
+
+                if (folderIndex != -1)
+                {
+                    ImageFolders[folderIndex] = folder;
+                    CollectionChanged?.Invoke(this, new(NotifyCollectionChangedAction.Replace, folder, existingFolder, folderIndex));
+                }
+            }
+        });
+    }
+
+    public void AddFolderPath(string path)
+    {
+
+        var (folderIndex, existingFolder) = ImageFolders.Index().FirstOrDefault((ft) => ft.Item.Path == path);
+        ImageFolder? folder = null;
+
+        if (existingFolder != null)
+        {
+            folder = new ImageFolder(existingFolder.Path, existingFolder.ImageCount, existingFolder.Selected, true);
+            ImageFolders[folderIndex] = folder;
+            CollectionChanged?.Invoke(this, new(NotifyCollectionChangedAction.Replace, folder, existingFolder, folderIndex));
+        }
+        else
+        {
+            folder = new ImageFolder(path, 0, false, true);
+            ImageFolders.Add(folder);
+            CollectionChanged?.Invoke(this, new(NotifyCollectionChangedAction.Add, folder));
+        }
+
+        if (folder != null)
+        {
+            LoadFolderCount(folder);
+        }
+    }
+
+    public void AddFolderPaths(IEnumerable<string> paths)
+    {
+        // TODO: Add paths in order, then load image counts in parallel
+        foreach (var path in paths)
+        {
+            AddFolderPath(path);
+        }
+    }
+
+    public void RemoveFolder(ImageFolder folder)
+    {
+        ImageFolders.Remove(folder);
+        CollectionChanged?.Invoke(this, new(NotifyCollectionChangedAction.Remove, folder));
+    }
+}

QuickDraw.Core/Models/Settings.cs

@@ -0,0 +1,52 @@
+using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
+
+namespace QuickDraw.Core.Models;
+
+public enum TimerEnum
+{
+    [Display(Name = "30s")]
+    T30s,
+    [Display(Name = "1m")]
+    T1m,
+    [Display(Name = "2m")]
+    T2m,
+    [Display(Name = "5m")]
+    T5m,
+    [Display(Name = "No Limit")]
+    NoLimit
+};
+
+public static class TimerEnumExtension
+{
+    private static Dictionary<TimerEnum, uint> TimerEnumToSeconds { get; } = new()
+    {
+        { TimerEnum.T30s, 30 },
+        { TimerEnum.T1m, 60 },
+        { TimerEnum.T2m, 120 },
+        { TimerEnum.T5m, 300 },
+        { TimerEnum.NoLimit, 0 }
+    };
+
+    public static uint ToSeconds(this TimerEnum e)
+    {
+        return TimerEnumToSeconds[e];
+    }
+
+    public static double ToSliderValue(this TimerEnum e)
+    {
+        return (double)((int)e);
+    }
+
+    public static TimerEnum ToTimerEnum(this double e)
+    {
+        return (TimerEnum)(Math.Clamp((int)e,0, 4));
+    }
+}
+
+public class Settings
+{
+    public ImageFolderList ImageFolderList { get; set; } = new ImageFolderList();
+
+    public TimerEnum SlideTimerDuration { get; set; }
+}

QuickDraw.Core/QuickDraw.Core.csproj

@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>

QuickDraw.sln

@@ -1,25 +1,67 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31025.218
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11010.61
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickDraw", "QuickDrawWindows\QuickDraw.csproj", "{31B19DB2-2047-44DC-8C27-A34C113171CF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuickDraw", "QuickDrawWindows\QuickDraw.csproj", "{CBC43D79-6F32-480A-BC3A-54383C19E4DD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuickDraw.Core", "QuickDraw.Core\QuickDraw.Core.csproj", "{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM64 = Debug|ARM64
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|ARM64 = Release|ARM64
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{31B19DB2-2047-44DC-8C27-A34C113171CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{31B19DB2-2047-44DC-8C27-A34C113171CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{31B19DB2-2047-44DC-8C27-A34C113171CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{31B19DB2-2047-44DC-8C27-A34C113171CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Debug|Any CPU.Build.0 = Debug|x64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Debug|ARM64.Build.0 = Debug|ARM64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Debug|x64.ActiveCfg = Debug|x64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Debug|x64.Build.0 = Debug|x64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Debug|x64.Deploy.0 = Debug|x64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Debug|x86.ActiveCfg = Debug|x86
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Debug|x86.Build.0 = Debug|x86
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Debug|x86.Deploy.0 = Debug|x86
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Release|Any CPU.ActiveCfg = Release|x64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Release|Any CPU.Build.0 = Release|x64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Release|ARM64.ActiveCfg = Release|ARM64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Release|ARM64.Build.0 = Release|ARM64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Release|ARM64.Deploy.0 = Release|ARM64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Release|x64.ActiveCfg = Release|x64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Release|x64.Build.0 = Release|x64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Release|x64.Deploy.0 = Release|x64
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Release|x86.ActiveCfg = Release|x86
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Release|x86.Build.0 = Release|x86
+		{CBC43D79-6F32-480A-BC3A-54383C19E4DD}.Release|x86.Deploy.0 = Release|x86
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Debug|x64.Build.0 = Debug|Any CPU
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Debug|x86.Build.0 = Debug|Any CPU
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Release|ARM64.Build.0 = Release|Any CPU
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Release|x64.ActiveCfg = Release|Any CPU
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Release|x64.Build.0 = Release|Any CPU
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Release|x86.ActiveCfg = Release|Any CPU
+		{DC397900-3CE2-426A-B15B-A7CA3C2EEE2C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {03EDC6A8-A6C7-4B32-B248-CB1593722EC5}
+		SolutionGuid = {9BC0E5F9-D71B-443D-90F5-DBF6C0A50453}
 	EndGlobalSection
 EndGlobal

QuickDrawWindows/Activation/ActivationHandler.cs

@@ -0,0 +1,17 @@
+using System.Threading.Tasks;
+
+namespace QuickDraw.Activation;
+
+public abstract class ActivationHandler<T> : IActivationHandler
+    where T : class
+{
+    // Override this method to add the logic for whether to handle the activation.
+    protected virtual bool CanHandleInternal(T args) => true;
+
+    // Override this method to add the logic for your activation handler.
+    protected abstract Task HandleInternalAsync(T args);
+
+    public bool CanHandle(object args) => args is T && CanHandleInternal((args as T)!);
+
+    public async Task HandleAsync(object args) => await HandleInternalAsync((args as T)!);
+}

QuickDrawWindows/Activation/DefaultActivationHandler.cs

@@ -0,0 +1,26 @@
+using Microsoft.UI.Xaml;
+using QuickDraw.Contracts.Services;
+using QuickDraw.ViewModels;
+using System.Threading.Tasks;
+
+namespace QuickDraw.Activation;
+
+public class DefaultActivationHandler : ActivationHandler<LaunchActivatedEventArgs>
+{
+    private readonly INavigationService _navigationService;
+
+    public DefaultActivationHandler(INavigationService navigationService) => _navigationService = navigationService;
+
+    protected override bool CanHandleInternal(LaunchActivatedEventArgs args)
+    {
+        // None of the ActivationHandlers has handled the activation.
+        return _navigationService.Frame?.Content == null;
+    }
+
+    protected async override Task HandleInternalAsync(LaunchActivatedEventArgs args)
+    {
+        _navigationService.NavigateTo(typeof(MainViewModel).FullName!, args.Arguments);
+
+        await Task.CompletedTask;
+    }
+}

QuickDrawWindows/Activation/IActivationHandler.cs

@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+
+namespace QuickDraw.Activation;
+
+public interface IActivationHandler
+{
+    bool CanHandle(object args);
+
+    Task HandleAsync(object args);
+}