From e87b5032beb11e3d2d57cddbe99de5ee7aa5d48c Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Sun, 11 Feb 2024 19:24:44 -0800
Subject: [PATCH] rearrange settings & add System.Drawing.Common reference?

---
 .../StabilityMatrix.Avalonia.csproj           |   1 +
 .../ViewModels/OpenArtBrowserViewModel.cs     |   1 -
 .../Settings/MainSettingsViewModel.cs         |   9 +
 .../Views/OpenArtBrowserPage.axaml.cs         |   2 +-
 .../Views/Settings/MainSettingsPage.axaml     | 188 +++++++++---------
 .../Models/Settings/Settings.cs               |   1 +
 .../StabilityMatrix.UITests.csproj            |   1 +
 7 files changed, 107 insertions(+), 96 deletions(-)

diff --git a/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj b/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj
index 63e08450..fa070fbd 100644
--- a/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj
+++ b/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj
@@ -95,6 +95,7 @@
         <PackageReference Include="Sylvan.Common" Version="0.4.3" />
         <PackageReference Include="Sylvan.Data" Version="0.2.12" />
         <PackageReference Include="Sylvan.Data.Csv" Version="1.3.5" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.1" />
         <PackageReference Include="TextMateSharp.Grammars" Version="1.0.56" />
         <PackageReference Include="URISchemeTools" Version="1.0.2" />
     </ItemGroup>
diff --git a/StabilityMatrix.Avalonia/ViewModels/OpenArtBrowserViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/OpenArtBrowserViewModel.cs
index c8463037..6f290e70 100644
--- a/StabilityMatrix.Avalonia/ViewModels/OpenArtBrowserViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/OpenArtBrowserViewModel.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/StabilityMatrix.Avalonia/ViewModels/Settings/MainSettingsViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Settings/MainSettingsViewModel.cs
index 55b6c896..2a28e275 100644
--- a/StabilityMatrix.Avalonia/ViewModels/Settings/MainSettingsViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/Settings/MainSettingsViewModel.cs
@@ -129,6 +129,9 @@ public partial class MainSettingsViewModel : PageViewModelBase
     [ObservableProperty]
     private HolidayMode holidayModeSetting;
 
+    [ObservableProperty]
+    private bool infinitelyScrollWorkflowBrowser;
+
     #region System Info
 
     private static Lazy<IReadOnlyList<GpuInfo>> GpuInfosLazy { get; } =
@@ -217,6 +220,12 @@ public partial class MainSettingsViewModel : PageViewModelBase
             settings => settings.HolidayModeSetting
         );
 
+        settingsManager.RelayPropertyFor(
+            this,
+            vm => vm.InfinitelyScrollWorkflowBrowser,
+            settings => settings.IsWorkflowInfiniteScrollEnabled
+        );
+
         DebugThrowAsyncExceptionCommand.WithNotificationErrorHandler(notificationService, LogLevel.Warn);
 
         hardwareInfoUpdateTimer.Tick += OnHardwareInfoUpdateTimerTick;
diff --git a/StabilityMatrix.Avalonia/Views/OpenArtBrowserPage.axaml.cs b/StabilityMatrix.Avalonia/Views/OpenArtBrowserPage.axaml.cs
index aceb5db4..c80793c2 100644
--- a/StabilityMatrix.Avalonia/Views/OpenArtBrowserPage.axaml.cs
+++ b/StabilityMatrix.Avalonia/Views/OpenArtBrowserPage.axaml.cs
@@ -23,7 +23,7 @@ public partial class OpenArtBrowserPage : UserControlBase
         if (scrollViewer.Offset.Y == 0)
             return;
 
-        var isAtEnd = Math.Abs(scrollViewer.Offset.Y - scrollViewer.ScrollBarMaximum.Y) < 0.1f;
+        var isAtEnd = Math.Abs(scrollViewer.Offset.Y - scrollViewer.ScrollBarMaximum.Y) < 1f;
         if (isAtEnd && DataContext is IInfinitelyScroll scroll)
         {
             scroll.LoadNextPageAsync().SafeFireAndForget();
diff --git a/StabilityMatrix.Avalonia/Views/Settings/MainSettingsPage.axaml b/StabilityMatrix.Avalonia/Views/Settings/MainSettingsPage.axaml
index 369c3f9a..2b846cc0 100644
--- a/StabilityMatrix.Avalonia/Views/Settings/MainSettingsPage.axaml
+++ b/StabilityMatrix.Avalonia/Views/Settings/MainSettingsPage.axaml
@@ -45,77 +45,6 @@
 
     <ScrollViewer VerticalScrollBarVisibility="Auto">
         <StackPanel Margin="8,16" Spacing="8">
-            <!--  Theme  -->
-            <Grid RowDefinitions="Auto,*,*,*">
-                <TextBlock
-                    Margin="0,0,0,8"
-                    FontWeight="Medium"
-                    Text="{x:Static lang:Resources.Label_Appearance}" />
-                <ui:SettingsExpander
-                    Grid.Row="1"
-                    Margin="8,0,8,4"
-                    Header="{x:Static lang:Resources.Label_Theme}"
-                    IconSource="WeatherMoon">
-                    <ui:SettingsExpander.Footer>
-                        <ComboBox
-                            MinWidth="100"
-                            ItemsSource="{Binding AvailableThemes}"
-                            SelectedItem="{Binding SelectedTheme}" />
-                    </ui:SettingsExpander.Footer>
-                </ui:SettingsExpander>
-                <ui:SettingsExpander
-                    Grid.Row="2"
-                    Margin="8,0,8,4"
-                    Header="{x:Static lang:Resources.Label_Language}"
-                    IconSource="Character">
-                    <ui:SettingsExpander.Footer>
-                        <ComboBox
-                            MinWidth="100"
-                            DisplayMemberBinding="{Binding Converter={StaticResource CultureInfoDisplayConverter}}"
-                            ItemsSource="{Binding AvailableLanguages}"
-                            SelectedItem="{Binding SelectedLanguage}" />
-                    </ui:SettingsExpander.Footer>
-                </ui:SettingsExpander>
-                <ui:SettingsExpander
-                    Grid.Row="3"
-                    Margin="8,0,8,4"
-                    ActionIconSource="ChevronRight"
-                    Command="{Binding NavigateToSubPageCommand}"
-                    CommandParameter="{x:Type vmSettings:InferenceSettingsViewModel}"
-                    Header="Inference (Test)"
-                    IconSource="Code"
-                    IsClickEnabled="True"
-                    IsVisible="{Binding SharedState.IsDebugMode}" />
-            </Grid>
-
-            <!--  Checkpoints Manager Options  -->
-            <Grid RowDefinitions="auto,*,Auto">
-                <TextBlock
-                    Margin="0,0,0,8"
-                    FontWeight="Medium"
-                    Text="{x:Static lang:Resources.Label_CheckpointManager}" />
-                <ui:SettingsExpander
-                    Grid.Row="1"
-                    Margin="8,0"
-                    Description="{x:Static lang:Resources.Label_RemoveSymlinksOnShutdown_Details}"
-                    Header="{x:Static lang:Resources.Label_RemoveSymlinksOnShutdown}"
-                    IconSource="Folder">
-                    <ui:SettingsExpander.Footer>
-                        <CheckBox IsChecked="{Binding RemoveSymlinksOnShutdown}" />
-                    </ui:SettingsExpander.Footer>
-                </ui:SettingsExpander>
-                <ui:SettingsExpander
-                    Grid.Row="2"
-                    Margin="8,4"
-                    Description="{x:Static lang:Resources.Label_ResetCheckpointsCache_Details}"
-                    Header="{x:Static lang:Resources.Label_ResetCheckpointsCache}"
-                    IconSource="Refresh">
-                    <ui:SettingsExpander.Footer>
-                        <Button Command="{Binding ResetCheckpointCache}" Content="{x:Static lang:Resources.Label_ResetCheckpointsCache}" />
-                    </ui:SettingsExpander.Footer>
-                </ui:SettingsExpander>
-            </Grid>
-
             <!--  General  -->
             <sg:SpacedGrid RowDefinitions="Auto,*,*,*" RowSpacing="4">
                 <TextBlock
@@ -167,6 +96,68 @@
                     </ui:SettingsExpander.Footer>
                 </ui:SettingsExpander>
             </sg:SpacedGrid>
+            
+            <!--  Integrations  -->
+            <sg:SpacedGrid RowDefinitions="Auto,*,*" RowSpacing="4">
+                <TextBlock
+                    Margin="0,0,0,4"
+                    FontWeight="Medium"
+                    Text="{x:Static lang:Resources.Label_Integrations}" />
+                <ui:SettingsExpander
+                    Grid.Row="1"
+                    Margin="8,0"
+                    ActionIconSource="ChevronRight"
+                    Command="{Binding NavigateToSubPageCommand}"
+                    CommandParameter="{x:Type vmSettings:AccountSettingsViewModel}"
+                    Header="{x:Static lang:Resources.Label_Accounts}"
+                    IsClickEnabled="True">
+                    <ui:SettingsExpander.IconSource>
+                        <fluentIcons:SymbolIconSource
+                            FontSize="10"
+                            IsFilled="True"
+                            Symbol="Person" />
+                    </ui:SettingsExpander.IconSource>
+                </ui:SettingsExpander>
+                <ui:SettingsExpander
+                    Grid.Row="2"
+                    Margin="8,0,8,4"
+                    Header="{x:Static lang:Resources.Label_DiscordRichPresence}">
+                    <ui:SettingsExpander.IconSource>
+                        <controls:FASymbolIconSource Symbol="fa-brands fa-discord" />
+                    </ui:SettingsExpander.IconSource>
+                    <ui:SettingsExpander.Footer>
+                        <ToggleSwitch IsChecked="{Binding IsDiscordRichPresenceEnabled}" />
+                    </ui:SettingsExpander.Footer>
+                </ui:SettingsExpander>
+            </sg:SpacedGrid>
+            
+            <!--  Checkpoints Manager Options  -->
+            <Grid RowDefinitions="auto,*,Auto">
+                <TextBlock
+                    Margin="0,0,0,8"
+                    FontWeight="Medium"
+                    Text="{x:Static lang:Resources.Label_CheckpointManager}" />
+                <ui:SettingsExpander
+                    Grid.Row="1"
+                    Margin="8,0"
+                    Description="{x:Static lang:Resources.Label_RemoveSymlinksOnShutdown_Details}"
+                    Header="{x:Static lang:Resources.Label_RemoveSymlinksOnShutdown}"
+                    IconSource="Folder">
+                    <ui:SettingsExpander.Footer>
+                        <CheckBox IsChecked="{Binding RemoveSymlinksOnShutdown}" />
+                    </ui:SettingsExpander.Footer>
+                </ui:SettingsExpander>
+                <ui:SettingsExpander
+                    Grid.Row="2"
+                    Margin="8,4"
+                    Description="{x:Static lang:Resources.Label_ResetCheckpointsCache_Details}"
+                    Header="{x:Static lang:Resources.Label_ResetCheckpointsCache}"
+                    IconSource="Refresh">
+                    <ui:SettingsExpander.Footer>
+                        <Button Command="{Binding ResetCheckpointCache}" Content="{x:Static lang:Resources.Label_ResetCheckpointsCache}" />
+                    </ui:SettingsExpander.Footer>
+                </ui:SettingsExpander>
+            </Grid>
 
             <!--  Environment Options  -->
             <Grid RowDefinitions="Auto, Auto, Auto">
@@ -204,40 +195,49 @@
                     </ui:SettingsExpander.Footer>
                 </ui:SettingsExpander>
             </Grid>
-
-            <!--  Integrations  -->
-            <sg:SpacedGrid RowDefinitions="Auto,*,*" RowSpacing="4">
+            
+            <!--  Theme  -->
+            <Grid RowDefinitions="Auto,*,*,*">
                 <TextBlock
-                    Margin="0,0,0,4"
+                    Margin="0,0,0,8"
                     FontWeight="Medium"
-                    Text="{x:Static lang:Resources.Label_Integrations}" />
+                    Text="{x:Static lang:Resources.Label_Appearance}" />
                 <ui:SettingsExpander
                     Grid.Row="1"
-                    Margin="8,0"
-                    ActionIconSource="ChevronRight"
-                    Command="{Binding NavigateToSubPageCommand}"
-                    CommandParameter="{x:Type vmSettings:AccountSettingsViewModel}"
-                    Header="{x:Static lang:Resources.Label_Accounts}"
-                    IsClickEnabled="True">
-                    <ui:SettingsExpander.IconSource>
-                        <fluentIcons:SymbolIconSource
-                            FontSize="10"
-                            IsFilled="True"
-                            Symbol="Person" />
-                    </ui:SettingsExpander.IconSource>
+                    Margin="8,0,8,4"
+                    Header="{x:Static lang:Resources.Label_Theme}"
+                    IconSource="WeatherMoon">
+                    <ui:SettingsExpander.Footer>
+                        <ComboBox
+                            MinWidth="100"
+                            ItemsSource="{Binding AvailableThemes}"
+                            SelectedItem="{Binding SelectedTheme}" />
+                    </ui:SettingsExpander.Footer>
                 </ui:SettingsExpander>
                 <ui:SettingsExpander
                     Grid.Row="2"
                     Margin="8,0,8,4"
-                    Header="{x:Static lang:Resources.Label_DiscordRichPresence}">
-                    <ui:SettingsExpander.IconSource>
-                        <controls:FASymbolIconSource Symbol="fa-brands fa-discord" />
-                    </ui:SettingsExpander.IconSource>
+                    Header="{x:Static lang:Resources.Label_Language}"
+                    IconSource="Character">
                     <ui:SettingsExpander.Footer>
-                        <ToggleSwitch IsChecked="{Binding IsDiscordRichPresenceEnabled}" />
+                        <ComboBox
+                            MinWidth="100"
+                            DisplayMemberBinding="{Binding Converter={StaticResource CultureInfoDisplayConverter}}"
+                            ItemsSource="{Binding AvailableLanguages}"
+                            SelectedItem="{Binding SelectedLanguage}" />
                     </ui:SettingsExpander.Footer>
                 </ui:SettingsExpander>
-            </sg:SpacedGrid>
+                <ui:SettingsExpander
+                    Grid.Row="3"
+                    Margin="8,0,8,4"
+                    ActionIconSource="ChevronRight"
+                    Command="{Binding NavigateToSubPageCommand}"
+                    CommandParameter="{x:Type vmSettings:InferenceSettingsViewModel}"
+                    Header="Inference (Test)"
+                    IconSource="Code"
+                    IsClickEnabled="True"
+                    IsVisible="{Binding SharedState.IsDebugMode}" />
+            </Grid>
 
             <!--  System Options  -->
             <sg:SpacedGrid RowDefinitions="Auto,Auto,Auto,Auto,Auto" RowSpacing="4">
diff --git a/StabilityMatrix.Core/Models/Settings/Settings.cs b/StabilityMatrix.Core/Models/Settings/Settings.cs
index 50f34f11..fb72ac43 100644
--- a/StabilityMatrix.Core/Models/Settings/Settings.cs
+++ b/StabilityMatrix.Core/Models/Settings/Settings.cs
@@ -120,6 +120,7 @@ public class Settings
     public Size InferenceImageSize { get; set; } = new(150, 190);
     public Size OutputsImageSize { get; set; } = new(300, 300);
     public HolidayMode HolidayModeSetting { get; set; } = HolidayMode.Automatic;
+    public bool IsWorkflowInfiniteScrollEnabled { get; set; } = true;
 
     [JsonIgnore]
     public bool IsHolidayModeActive =>
diff --git a/StabilityMatrix.UITests/StabilityMatrix.UITests.csproj b/StabilityMatrix.UITests/StabilityMatrix.UITests.csproj
index 47cee6c9..b1cc9ba9 100644
--- a/StabilityMatrix.UITests/StabilityMatrix.UITests.csproj
+++ b/StabilityMatrix.UITests/StabilityMatrix.UITests.csproj
@@ -19,6 +19,7 @@
         <PackageReference Include="DotNet.Bundle" Version="0.9.13" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
         <PackageReference Include="NSubstitute" Version="5.1.0" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.1" />
         <PackageReference Include="Verify" Version="23.0.0" />
         <PackageReference Include="Verify.CommunityToolkit.Mvvm" Version="0.1.0" />
         <PackageReference Include="Verify.Avalonia" Version="1.0.1" />