Color Coded Resolutions

.github/workflows/dotnet.yml

@@ -2,11 +2,14 @@ name: .NET
 
 env:
   PACK_ID: Sims1WidescreenPatcher
-  PACK_VER: 3.6.0
+  PACK_VER: 3.7.0
 
 on: 
   push:
+    branches: ["master"]
   pull_request:
+    branches: ["master"]
+  workflow_dispatch:
 
 jobs:
   linux:

README.md

@@ -2,7 +2,7 @@
 
 This program patches **The Sims 1** to a custom resolution.
 
-![The Sims 1 Widescreen Patcher](https://i.imgur.com/PdKHV0k.png)
+![The Sims 1 Widescreen Patcher](https://i.imgur.com/b8BU9lG.png)
 
 ## Requirements
 

Sims1WidescreenPatcher.Core/Models/AspectRatio.cs

@@ -0,0 +1,84 @@
+using System.Numerics;
+
+namespace Sims1WidescreenPatcher.Core.Models;
+
+public class AspectRatio : IEqualityComparer<AspectRatio>, IComparable<AspectRatio>
+{
+    protected bool Equals(AspectRatio other)
+    {
+        return Numerator == other.Numerator && Denominator == other.Denominator;
+    }
+
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(null, obj)) return false;
+        if (ReferenceEquals(this, obj)) return true;
+        if (obj.GetType() != this.GetType()) return false;
+        return Equals((AspectRatio) obj);
+    }
+
+    public override int GetHashCode()
+    {
+        unchecked
+        {
+            return (Numerator * 397) ^ Denominator;
+        }
+    }
+
+    public int Numerator;
+    public int Denominator;
+
+    public AspectRatio(int width, int height)
+    {
+        CalculateAspectRatio(width, height);
+    }
+
+    public override string ToString()
+    {
+        return $"{Numerator}:{Denominator}";
+    }
+
+    public static bool operator ==(AspectRatio obj1, AspectRatio obj2)
+    {
+        return (obj1.Numerator == obj2.Numerator
+             && obj1.Denominator == obj2.Denominator);
+    }
+
+    public static bool operator !=(AspectRatio obj1, AspectRatio obj2)
+    {
+        return !(obj1 == obj2);
+    }
+
+    private void CalculateAspectRatio(int width, int height)
+    {
+        var gcd = BigInteger.GreatestCommonDivisor(width, height);
+        Numerator = width / (int)gcd;
+        Denominator = height / (int)gcd;
+    }
+
+    public bool Equals(AspectRatio x, AspectRatio y)
+    {
+        if (ReferenceEquals(x, y)) return true;
+        if (ReferenceEquals(x, null)) return false;
+        if (ReferenceEquals(y, null)) return false;
+        if (x.GetType() != y.GetType()) return false;
+        return x.Numerator == y.Numerator && x.Denominator == y.Denominator;
+    }
+
+    public int GetHashCode(AspectRatio obj)
+    {
+        unchecked
+        {
+            return (obj.Numerator * 397) ^ obj.Denominator;
+        }
+    }
+
+    public int CompareTo(AspectRatio? other)
+    {
+        if (ReferenceEquals(this, other)) return 0;
+        if (ReferenceEquals(null, other)) return 1;
+        var numeratorComparison = Numerator.CompareTo(other.Numerator);
+        if (numeratorComparison != 0) return numeratorComparison;
+        return Denominator.CompareTo(other.Denominator);
+    }
+}

Sims1WidescreenPatcher.Core/Models/Resolution.cs

@@ -1,6 +1,8 @@
-namespace Sims1WidescreenPatcher.Core.Models;
+using System.Numerics;
 
-public class Resolution
+namespace Sims1WidescreenPatcher.Core.Models;
+
+public class Resolution : IComparable<Resolution>
 {
     private sealed class WidthHeightEqualityComparer : IEqualityComparer<Resolution>
     {
@@ -25,21 +27,27 @@ public int GetHashCode(Resolution obj)
     public static IEqualityComparer<Resolution>? WidthHeightComparer { get; } = new WidthHeightEqualityComparer();
 
     public int Width { get; }
-
     public int Height { get; }
+    public AspectRatio AspectRatio { get; }
 
     public Resolution(int width, int height)
     {
         Width = width;
         Height = height;
+        AspectRatio = new AspectRatio(width, height);
     }
 
     public override string ToString()
     {
-        if (Width == -1 && Height == -1)
-        {
-            return @"<Custom Resolution>";
-        }
-        return $"{Width}x{Height}";
+        return $"{Width}x{Height} ({AspectRatio})";
+    }
+
+    public int CompareTo(Resolution? other)
+    {
+        if (ReferenceEquals(this, other)) return 0;
+        if (ReferenceEquals(null, other)) return 1;
+        var widthComparison = Width.CompareTo(other.Width);
+        if (widthComparison != 0) return widthComparison;
+        return Height.CompareTo(other.Height);
     }
 }

Sims1WidescreenPatcher.Core/Sims1WidescreenPatcher.Core.csproj

@@ -8,8 +8,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Avalonia" Version="11.0.0" />
-      <PackageReference Include="ReactiveUI" Version="19.2.1" />
+      <PackageReference Include="Avalonia" Version="11.0.4" />
+      <PackageReference Include="DynamicData" Version="7.14.2" />
+      <PackageReference Include="ReactiveUI" Version="19.4.1" />
     </ItemGroup>
 
     <ItemGroup>

Sims1WidescreenPatcher.Core/ViewModels/CustomResolutionDialogViewModel.cs

@@ -1,15 +1,17 @@
 using System.Reactive;
+using System.Reactive.Linq;
 using ReactiveUI;
 using Sims1WidescreenPatcher.Core.Models;
 
 namespace Sims1WidescreenPatcher.Core.ViewModels;
 
-public class CustomResolutionDialogViewModel : ViewModelBase
+public class CustomResolutionDialogViewModel : ViewModelBase, ICustomResolutionDialogViewModel
 {
     #region Fields
 
     private string _width = "";
     private string _height = "";
+    private readonly ObservableAsPropertyHelper<AspectRatio?> _aspectRatio;
 
     #endregion
 
@@ -18,6 +20,17 @@ public class CustomResolutionDialogViewModel : ViewModelBase
     public CustomResolutionDialogViewModel()
     {
         OkCommand = ReactiveCommand.Create(() => new Resolution(int.Parse(Width), int.Parse(Height)));
+        _aspectRatio = this
+            .WhenAnyValue(x => x.Width, x => x.Height, (w, h) =>
+            {
+                if (!int.TryParse(w, out var width) || !int.TryParse(h, out var height))
+                {
+                    return null;
+                }
+                return new AspectRatio(width, height);
+            })
+            .Throttle(TimeSpan.FromMilliseconds(100))
+            .ToProperty(this, x => x.AspectRatio);
     }
 
     #endregion
@@ -42,5 +55,7 @@ public string Height
         set => this.RaiseAndSetIfChanged(ref _height, value);
     }
 
+    public AspectRatio? AspectRatio => _aspectRatio.Value;
+
     #endregion
 }

Sims1WidescreenPatcher.Core/ViewModels/ICustomResolutionDialogViewModel.cs

@@ -0,0 +1,22 @@
+using System.ComponentModel;
+using System.Reactive;
+using ReactiveUI;
+using Sims1WidescreenPatcher.Core.Models;
+
+namespace Sims1WidescreenPatcher.Core.ViewModels;
+
+public interface ICustomResolutionDialogViewModel
+{
+    ReactiveCommand<Unit, Resolution> OkCommand { get; }
+    string Width { get; set; }
+    string Height { get; set; }
+    AspectRatio? AspectRatio { get; }
+    IObservable<IReactivePropertyChangedEventArgs<IReactiveObject>> Changing { get; }
+    IObservable<IReactivePropertyChangedEventArgs<IReactiveObject>> Changed { get; }
+    IObservable<Exception> ThrownExceptions { get; }
+    IDisposable SuppressChangeNotifications();
+    bool AreChangeNotificationsEnabled();
+    IDisposable DelayChangeNotifications();
+    event PropertyChangingEventHandler? PropertyChanging;
+    event PropertyChangedEventHandler? PropertyChanged;
+}

Sims1WidescreenPatcher.Core/ViewModels/IMainWindowViewModel.cs

@@ -0,0 +1,41 @@
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Reactive;
+using System.Windows.Input;
+using Avalonia.Collections;
+using Avalonia.Platform.Storage;
+using ReactiveUI;
+using Sims1WidescreenPatcher.Core.Models;
+using Sims1WidescreenPatcher.Utilities.Models;
+
+namespace Sims1WidescreenPatcher.Core.ViewModels;
+
+public interface IMainWindowViewModel
+{
+    ICommand PatchCommand { get; }
+    ICommand UninstallCommand { get; }
+    ICommand OpenFile { get; }
+    Interaction<Unit, IStorageFile?> ShowOpenFileDialog { get; }
+    ICommand CustomResolutionCommand { get; }
+    Interaction<ICustomResolutionDialogViewModel, Resolution?> ShowCustomResolutionDialog { get; }
+    Interaction<CustomYesNoDialogViewModel, YesNoDialogResponse?> ShowCustomYesNoDialog { get; }
+    Interaction<CustomInformationDialogViewModel, Unit> ShowCustomInformationDialog { get; }
+    string Path { get; set; }
+    AspectRatio? SelectedAspectRatio { get; set; }
+    bool SortByAspectRatio { get; set; }
+    bool IsResolutionsColored { get; set; }
+    ReadOnlyObservableCollection<AspectRatio> AspectRatios { get; }
+    ReadOnlyObservableCollection<Resolution> FilteredResolutions { get; }
+    Resolution? SelectedResolution { get; set; }
+    AvaloniaList<IWrapper> Wrappers { get; }
+    int SelectedWrapperIndex { get; set; }
+    double Progress { get; }
+    IObservable<IReactivePropertyChangedEventArgs<IReactiveObject>> Changing { get; }
+    IObservable<IReactivePropertyChangedEventArgs<IReactiveObject>> Changed { get; }
+    IObservable<Exception> ThrownExceptions { get; }
+    IDisposable SuppressChangeNotifications();
+    bool AreChangeNotificationsEnabled();
+    IDisposable DelayChangeNotifications();
+    event PropertyChangingEventHandler? PropertyChanging;
+    event PropertyChangedEventHandler? PropertyChanged;
+}