Merge pull request #49 from MattEqualsCoder/smz3-changes

v2.0.1 Changes

Author: MattEqualsCoder

MSURandomizer/MSURandomizer.csproj

@@ -6,9 +6,10 @@
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-        <PackageIcon>MSURandomizerIcon.ico</PackageIcon>
-        <Version>2.0.0</Version>
+        <Version>2.0.1-rc.1</Version>
         <ApplicationIcon>MSURandomizerIcon.ico</ApplicationIcon>
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <PackageId>MattEqualsCoder.MSURandomizer.Avalonia</PackageId>
     </PropertyGroup>
 
     <ItemGroup>
@@ -30,7 +31,7 @@
 
     <ItemGroup>
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Include="MattEqualsCoder.AvaloniaControls" Version="0.9.5" />
+        <PackageReference Include="MattEqualsCoder.AvaloniaControls" Version="0.9.14" />
         <PackageReference Include="MattEqualsCoder.GitHubReleaseChecker" Version="1.1.2" />
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
         <PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />

MSURandomizer/MsuRandomizerAppServiceExtensions.cs

@@ -1,16 +1,21 @@
 using AvaloniaControls.ControlServices;
+using AvaloniaControls.Extensions;
 using Microsoft.Extensions.DependencyInjection;
 using MSURandomizer.Views;
 using MSURandomizer.Services;
+using MSURandomizerLibrary;
 
 namespace MSURandomizer;
 
 public static class MsuRandomizerAppServiceExtensions
 {
     public static IServiceCollection AddMsuRandomizerAppServices(this IServiceCollection services)
     {
-        services.AddSingleton<MsuWindow>();
+        services.AddSingleton<AppInitializationService>();
+        services.AddTransient<MsuWindow>();
         services.AddTransient<MsuList>();
+        services.AddAvaloniaControlServices<Program>();
+        services.AddMsuRandomizerServices();
         return services;
     }
 }

MSURandomizer/Program.cs

@@ -60,10 +60,7 @@ public static void Main(string[] args)
             })
             .ConfigureServices(services =>
             {
-                services.AddAvaloniaControlServices<Program>();
-                services.AddMsuRandomizerServices();
                 services.AddMsuRandomizerAppServices();
-                services.AddSingleton<AppInitializationService>();
                 services.AddGitHubReleaseCheckerServices();
             })
             .Build();

MSURandomizer/Services/AppInitializationService.cs

@@ -23,6 +23,11 @@ public class AppInitializationService(
 {
     public void Initialize(string[] args)
     {
+        if (!IsEnabled)
+        {
+            return;
+        }
+        
         msuRandomizerInitializationService.Initialize(new MsuRandomizerInitializationRequest()
         {
             InitializeAppSettings = true,
@@ -55,8 +60,16 @@ public void Initialize(string[] args)
         }
     }
 
+    public bool IsEnabled { get; set; } = true;
+
     public void FinishInitialization()
     {
+        if (!IsEnabled)
+        {
+            IsLoading = false;
+            return;
+        }
+        
         Task.Run(() =>
         {
             _ = VerifyVersionNumber();

MSURandomizer/Services/MsuMonitorWindowService.cs

@@ -1,11 +1,13 @@
 using System;
+using System.IO;
 using System.Linq;
 using AutoMapper;
 using AvaloniaControls;
 using AvaloniaControls.ControlServices;
 using AvaloniaControls.Services;
 using Microsoft.Extensions.Logging;
 using MSURandomizer.ViewModels;
+using MSURandomizerLibrary;
 using MSURandomizerLibrary.Configs;
 using MSURandomizerLibrary.Models;
 using MSURandomizerLibrary.Services;
@@ -37,6 +39,9 @@ public MsuMonitorWindowViewModel InitializeModel()
         return _model;
     }
 
+    public string RestoreFilePath =>
+        Path.Combine(msuAppSettingsService.MsuAppSettings.SaveDataDirectory.ExpandSpecialFolders(), "msu-monitor.json");
+
     public void StartMonitor(Msu? msu = null, MsuType? outputMsuType = null)
     {
         if (msu == null)

MSURandomizer/Services/MsuWindowService.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Avalonia.Threading;
 using AvaloniaControls.Controls;
@@ -27,7 +28,10 @@ public class MsuWindowService(ILogger<MsuWindowService> logger,
     IRomCopyService romCopyService) : ControlService
 {
     public MsuWindowViewModel Model { get; set; } = new();
-
+    
+    public string RestoreFilePath =>
+        Path.Combine(appSettings.MsuAppSettings.SaveDataDirectory.ExpandSpecialFolders(), "main-window.json");
+    
     public event EventHandler? MsuMonitorStarted;
 
     public event EventHandler? MsuMonitorStopped;
@@ -62,9 +66,20 @@ public MsuWindowViewModel InitializeModel()
         Model.CanDisplayRandomMsuButton = settings.MsuWindowDisplayRandomButton == true;
         Model.CanDisplayShuffledMsuButton = settings.MsuWindowDisplayShuffleButton == true;
         Model.CanDisplayContinuousShuffleButton = settings.MsuWindowDisplayContinuousButton == true;
+        Model.CanDisplaySelectMsuButton = settings.MsuWindowDisplaySelectButton == true;
         Model.CanDisplayCancelButton = settings.MsuWindowDisplaySelectButton == true;
-        Model.HasMsuFolder = userOptions.MsuUserOptions.HasMsuFolder();
         Model.IsHardwareModeButtonVisible = !appSettings.MsuAppSettings.DisableHardwareMode;
+        Model.MsuWindowDisplayOptionsButton = appSettings.MsuAppSettings.MsuWindowDisplayOptionsButton != false;
+        Model.HasMsuFolder = Model.MsuWindowDisplayOptionsButton && userOptions.MsuUserOptions.HasMsuFolder();
+        Model.AreMsusLoading = msuLookupService.Status is MsuLoadStatus.Default or MsuLoadStatus.Loading;
+        
+        if (!string.IsNullOrEmpty(settings.ForcedMsuType))
+        {
+            Model.SelectedMsuType = settings.ForcedMsuType;
+            Model.DisplayMsuTypeComboBox = false;
+            Model.FilterColumnIndex = 0;
+        }
+        
         return Model;
     }
 
@@ -273,6 +288,16 @@ public bool GenerateMsu(out string error, out bool openContinuousWindow, out Msu
 
     public bool ShouldOpenMonitorWindow => userOptions.MsuUserOptions.OpenMonitorWindow;
 
+    public void SetMsuBasePath(string? msuBasePath)
+    {
+        if (string.IsNullOrEmpty(msuBasePath) || !Directory.Exists(msuBasePath))
+        {
+            return;
+        }
+
+        userOptions.MsuUserOptions.DefaultMsuPath = msuBasePath;
+    }
+
     public MsuType? GetMsuType(string msuTypeName)
     {
         return msuTypeService.GetMsuType(msuTypeName);

MSURandomizer/ViewModels/MsuListViewModel.cs

@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using Avalonia.Controls;
+using AvaloniaControls.Models;
 using MSURandomizerLibrary.Configs;
 using ReactiveUI.Fody.Helpers;
 
@@ -25,4 +27,11 @@ public class MsuListViewModel : ViewModelBase
     [Reactive] public bool IsMsuMonitorDisabled { get; set; }
 
     [Reactive] public bool HardwareMode { get; set; }
+    
+    [Reactive]
+    [ReactiveLinkedProperties(nameof(SelectionMode))]
+    public bool IsSingleSelectionMode { get; set; }
+
+    public SelectionMode SelectionMode =>
+        IsSingleSelectionMode ? SelectionMode.Single : SelectionMode.Multiple | SelectionMode.Toggle;
 }

MSURandomizer/ViewModels/MsuWindowViewModel.cs

@@ -29,6 +29,10 @@ public class MsuWindowViewModel : ViewModelBase
     [Reactive] public bool WasClosed { get; set; }
 
     [Reactive] public bool IsHardwareModeButtonVisible { get; set; } = true;
+
+    [Reactive] public bool MsuWindowDisplayOptionsButton { get; set; } = true;
+    
+    [Reactive] public bool DisplayMsuTypeComboBox { get; set; } = true;
 
     [Reactive] 
     [ReactiveLinkedProperties(nameof(IsShuffledMsuButtonVisible), nameof(IsContinuousShuffleButtonVisible))]
@@ -62,6 +66,9 @@ public class MsuWindowViewModel : ViewModelBase
     [Reactive]
     [ReactiveLinkedProperties(nameof(HasGitHubUrl))]
     public string? GitHubUrl { get; set; }
+    
+    [Reactive]
+    public bool IsSingleSelectionMode { get; set; }
 
     public bool IsSelectMsuEnabled  => MsuCount > 0 && !AreMsusLoading && !IsMsuMonitorActive;
 
@@ -82,4 +89,6 @@ public class MsuWindowViewModel : ViewModelBase
     public bool HasGitHubUrl => !string.IsNullOrEmpty(GitHubUrl);
 
     public bool HasMsuFolder { get; set; }
+
+    public int FilterColumnIndex { get; set; } = 1;
 }

MSURandomizer/Views/MsuList.axaml

@@ -21,7 +21,7 @@
         </StackPanel>
         <ListBox IsVisible="{Binding !IsLoading}"
                  ItemsSource="{Binding FilteredMsus}"
-                 SelectionMode="Multiple,Toggle"
+                 SelectionMode="{Binding SelectionMode}"
                  SelectedItems="{Binding SelectedMsus}"
                  BorderThickness="0"
                  SelectionChanged="SelectingItemsControl_OnSelectionChanged"

MSURandomizer/Views/MsuList.axaml.cs

@@ -65,6 +65,11 @@ public int? SelectedMsuCount
         set => SetValue(SelectedMsuCountProperty, value);
     }
 
+    public void SetIsSingleSelectionMode(bool value)
+    {
+        _model.IsSingleSelectionMode = value;
+    }
+
     public void FilterMSUs(MsuType msuType, MsuFilter msuFilter)
     {
         _service?.FilterMSUs(msuType, msuFilter);