Merge pull request #62 from TheJoeFin/dev

v 1.14

Author: TheJoeFin

.github/workflows/build.yml

@@ -0,0 +1,30 @@
+name: Build
+
+on:
+  pull_request:
+    branches:
+      - main
+      - dev
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '9.0.x'
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v2
+
+    - name: Restore dependencies
+      run: dotnet restore "Simple Icon File Maker.sln"
+
+    - name: Build solution
+      run: dotnet build "Simple Icon File Maker.sln" --configuration Release --no-restore

README.md

@@ -21,7 +21,7 @@ A small lightweight Windows app which creates .ico files with different resoluti
 
 ## How to use
 
-1. Open an image or drag an image on to the app
+1. Open an image or drag an image on to the app, or paste from clipboard (Ctrl+V)
 2. Review the preview images at each size
 3. Save .ico to a folder
 

Simple Icon File Maker/Simple Icon File Maker (Package)/Package.appxmanifest

@@ -9,7 +9,7 @@
   <Identity
     Name="40087JoeFinApps.SimpleIconFileMaker"
     Publisher="CN=153F3B0F-BA3D-4964-8098-71AC78A1DF6A"
-    Version="1.13.2.0" />
+    Version="1.14.0.0" />
 
   <Properties>
     <DisplayName>Simple Icon File Maker</DisplayName>

Simple Icon File Maker/Simple Icon File Maker (Package)/Simple Icon File Maker (Package).wapproj

@@ -120,13 +120,13 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250606001">
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002">
       <IncludeAssets>build</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948">
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7175">
       <IncludeAssets>build</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="WinUIEx" Version="2.6.0" />
+    <PackageReference Include="WinUIEx" Version="2.9.0" />
   </ItemGroup>
   <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
 </Project>

Simple Icon File Maker/Simple Icon File Maker/Activation/ActivationHandler.cs

@@ -4,12 +4,21 @@ 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;
+    protected virtual bool CanHandleInternal(T args)
+    {
+        return 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 bool CanHandle(object args)
+    {
+        return args is T && CanHandleInternal((args as T)!);
+    }
 
-    public async Task HandleAsync(object args) => await HandleInternalAsync((args as T)!);
+    public async Task HandleAsync(object args)
+    {
+        await HandleInternalAsync((args as T)!);
+    }
 }

Simple Icon File Maker/Simple Icon File Maker/Activation/DefaultActivationHandler.cs

@@ -21,7 +21,7 @@ protected override bool CanHandleInternal(LaunchActivatedEventArgs args)
         return _navigationService.Frame?.Content == null;
     }
 
-    protected async override Task HandleInternalAsync(LaunchActivatedEventArgs args)
+    protected override async Task HandleInternalAsync(LaunchActivatedEventArgs args)
     {
         _navigationService.NavigateTo(typeof(MainViewModel).FullName!, args.Arguments);
 

Simple Icon File Maker/Simple Icon File Maker/App.xaml.cs

@@ -1,13 +1,12 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.UI.Xaml;
-
-using Simple_Icon_File_Maker.Contracts.Services;
-using Simple_Icon_File_Maker.Services;
 using Simple_Icon_File_Maker.Activation;
+using Simple_Icon_File_Maker.Contracts.Services;
 using Simple_Icon_File_Maker.Models;
-using Simple_Icon_File_Maker.Views;
+using Simple_Icon_File_Maker.Services;
 using Simple_Icon_File_Maker.ViewModels;
+using Simple_Icon_File_Maker.Views;
 
 namespace Simple_Icon_File_Maker;
 
@@ -73,6 +72,7 @@ public App()
             services.AddTransient<AboutViewModel>();
             services.AddTransient<MultiPage>();
             services.AddTransient<MultiViewModel>();
+            services.AddTransient<SizesControlViewModel>();
 
             // Configuration
             services.Configure<LocalSettingsOptions>(context.Configuration.GetSection(nameof(LocalSettingsOptions)));
@@ -90,7 +90,7 @@ private void App_UnhandledException(object sender, Microsoft.UI.Xaml.UnhandledEx
         e.Handled = true;
     }
 
-    protected async override void OnLaunched(LaunchActivatedEventArgs args)
+    protected override async void OnLaunched(LaunchActivatedEventArgs args)
     {
         base.OnLaunched(args);
         await App.GetService<IActivationService>().ActivateAsync(args);

Simple Icon File Maker/Simple Icon File Maker/Contracts/Services/IIconSizesService.cs

@@ -5,7 +5,9 @@ namespace Simple_Icon_File_Maker.Contracts.Services;
 public interface IIconSizesService
 {
     List<IconSize> IconSizes { get; }
+    IconSortOrder SortOrder { get; }
     Task Save(IEnumerable<IconSize> iconSizes);
+    Task SaveSortOrder(IconSortOrder sortOrder);
 
     Task InitializeAsync();
 }

Simple Icon File Maker/Simple Icon File Maker/Controls/PreviewImage.xaml.cs

@@ -17,9 +17,9 @@ namespace Simple_Icon_File_Maker.Controls;
 
 public sealed partial class PreviewImage : UserControl
 {
-    readonly string OriginalName = string.Empty;
-    readonly StorageFile _imageFile;
-    readonly int _sideLength = 0;
+    private readonly string OriginalName = string.Empty;
+    private readonly StorageFile _imageFile;
+    private readonly int _sideLength = 0;
 
     public PreviewImage(StorageFile imageFile, int sideLength, string originalName)
     {
@@ -35,10 +35,7 @@ public PreviewImage(StorageFile imageFile, int sideLength, string originalName)
 
     public bool ZoomPreview
     {
-        get
-        {
-            return isZooming;
-        }
+        get => isZooming;
         set
         {
             if (value != isZooming)
@@ -148,8 +145,10 @@ private void LoadImageOnToCanvas()
         };
 
         // add the visual as a child to canvas
-        Grid tempGrid = new();
-        tempGrid.Background = new SolidColorBrush(Colors.Transparent);
+        Grid tempGrid = new()
+        {
+            Background = new SolidColorBrush(Colors.Transparent)
+        };
         ElementCompositionPreview.SetElementChildVisual(tempGrid, imageVisual);
         mainImageCanvas.Children.Add(tempGrid);
     }

Simple Icon File Maker/Simple Icon File Maker/Controls/PreviewStack.xaml.cs

@@ -25,6 +25,8 @@ public sealed partial class PreviewStack : UserControl
 
     public int SmallerSourceSide { get; private set; }
 
+    public IconSortOrder SortOrder { get; set; } = IconSortOrder.LargestFirst;
+
     public PreviewStack(string path, List<IconSize> sizes, bool showTitle = false)
     {
         StorageFolder sf = ApplicationData.Current.LocalCacheFolder;
@@ -70,11 +72,19 @@ public void ClearChildren()
         PreviewStackPanel.Children.Clear();
     }
 
-    public async Task SaveIconAsync(string outputPath = "")
+    public async Task SaveIconAsync(string outputPath = "", IconSortOrder sortOrder = IconSortOrder.LargestFirst)
     {
         MagickImageCollection collection = [];
 
-        foreach ((_, string path) in imagePaths)
+        // Sort the imagePaths based on the sort order
+        List<(string sideLength, string path)> sortedPaths = sortOrder switch
+        {
+            IconSortOrder.LargestFirst => [.. imagePaths.OrderByDescending(p => int.TryParse(p.Item1, out int size) ? size : 0)],
+            IconSortOrder.SmallestFirst => [.. imagePaths.OrderBy(p => int.TryParse(p.Item1, out int size) ? size : 0)],
+            _ => [.. imagePaths.OrderByDescending(p => int.TryParse(p.Item1, out int size) ? size : 0)]
+        };
+
+        foreach ((_, string path) in sortedPaths)
             collection.Add(path);
 
         if (string.IsNullOrWhiteSpace(outputPath))
@@ -95,15 +105,15 @@ await Task.Run(async () =>
     });
     }
 
-    public async Task SaveAllImagesAsync(string outputPath = "")
+    public async Task SaveAllImagesAsync(string outputPath = "", IconSortOrder sortOrder = IconSortOrder.LargestFirst)
     {
         if (string.IsNullOrWhiteSpace(outputPath))
         {
             outputPath = Path.Combine(Path.GetDirectoryName(imagePath) ?? string.Empty,
                 $"{Path.GetFileNameWithoutExtension(imagePath)}.ico");
         }
 
-        await SaveIconAsync(outputPath);
+        await SaveIconAsync(outputPath, sortOrder);
 
         string outputFolderPath = Path.GetDirectoryName(outputPath) ?? string.Empty;
 
@@ -338,13 +348,22 @@ private void ClearOutputImages()
 
     public async Task UpdatePreviewsAsync()
     {
+        PreviewStackPanel.Children.Clear();
+
         string originalName = Path.GetFileNameWithoutExtension(imagePath);
-        foreach ((string sideLength, string path) pair in imagePaths)
+
+        // Sort imagePaths based on the sort order
+        List<(string sideLength, string path)> sortedPaths = SortOrder switch
         {
-            if (pair.path is not string imagePath)
-                continue;
+            IconSortOrder.LargestFirst => [.. imagePaths.OrderByDescending(p => int.TryParse(p.Item1, out int size) ? size : 0)],
+            IconSortOrder.SmallestFirst => [.. imagePaths.OrderBy(p => int.TryParse(p.Item1, out int size) ? size : 0)],
+            _ => [.. imagePaths.OrderByDescending(p => int.TryParse(p.Item1, out int size) ? size : 0)]
+        };
 
-            if (!int.TryParse(pair.sideLength, out int sideLength))
+        foreach ((string sideLength, string path) pair in sortedPaths)
+        {
+            if (pair.path is not string imagePath
+                || !int.TryParse(pair.sideLength, out int sideLength))
                 continue;
 
             StorageFile imageSF = await StorageFile.GetFileFromPathAsync(imagePath);
@@ -357,6 +376,11 @@ public async Task UpdatePreviewsAsync()
         await Task.CompletedTask;
     }
 
+    public async Task RefreshPreviewsWithSortOrder()
+    {
+        await UpdatePreviewsAsync();
+    }
+
     private bool CheckIfRefreshIsNeeded()
     {
         if (imagePaths.Count < 1)
@@ -384,12 +408,12 @@ public void UpdateSizeAndZoom()
 
         foreach (UIElement? child in previewBoxes)
         {
-            if (child is PreviewImage img)
-            {
-                if (!double.IsNaN(ActualWidth) && ActualWidth > 40)
-                    img.ZoomedWidthSpace = (int)ActualWidth - 40;
-                img.ZoomPreview = IsZoomingPreview;
-            }
+            if (child is not PreviewImage img)
+                continue;
+
+            if (!double.IsNaN(ActualWidth) && ActualWidth > 40)
+                img.ZoomedWidthSpace = (int)ActualWidth - 40;
+            img.ZoomPreview = IsZoomingPreview;
         }
     }
 }