From fa8284da526c8cd1e7de64be1a30e4a7c4be80e5 Mon Sep 17 00:00:00 2001
From: "waffle.lord" <waffle.lord@hotmail.com>
Date: Fri, 26 Jan 2024 12:35:57 -0500
Subject: [PATCH] add mod info page

---
 .../CustomControls/ModInfoCard.axaml          |   6 +-
 .../ViewModels/ModInfoViewModel.cs            |  10 +
 .../ViewModels/ProfileViewModel.cs            |   3 +-
 project/Aki.Launcher/Views/ModInfoView.axaml  |  14 +
 .../Aki.Launcher/Views/ModInfoView.axaml.cs   |  20 ++
 project/Aki.Launcher/Views/ProfileView.axaml  | 317 +++++++++---------
 6 files changed, 199 insertions(+), 171 deletions(-)
 create mode 100644 project/Aki.Launcher/ViewModels/ModInfoViewModel.cs
 create mode 100644 project/Aki.Launcher/Views/ModInfoView.axaml
 create mode 100644 project/Aki.Launcher/Views/ModInfoView.axaml.cs

diff --git a/project/Aki.Launcher/CustomControls/ModInfoCard.axaml b/project/Aki.Launcher/CustomControls/ModInfoCard.axaml
index 8982a1d..b045c5b 100644
--- a/project/Aki.Launcher/CustomControls/ModInfoCard.axaml
+++ b/project/Aki.Launcher/CustomControls/ModInfoCard.axaml
@@ -14,9 +14,9 @@
 			  >
 
 			<StackPanel Grid.Row="1" Grid.ColumnSpan="3" Grid.Column="1"
-						VerticalAlignment="Center"
-						Orientation="Horizontal" Spacing="5"
-						>
+			            VerticalAlignment="Center"
+			            Orientation="Horizontal" Spacing="5"
+			>
 				<Path Data="{StaticResource Server}" Fill="{StaticResource AKI_Brush_DarkGrayBlue}"
 					  IsVisible="{Binding IsInServer, RelativeSource={RelativeSource AncestorType=UserControl}}"
 				      />
diff --git a/project/Aki.Launcher/ViewModels/ModInfoViewModel.cs b/project/Aki.Launcher/ViewModels/ModInfoViewModel.cs
new file mode 100644
index 0000000..aa2177c
--- /dev/null
+++ b/project/Aki.Launcher/ViewModels/ModInfoViewModel.cs
@@ -0,0 +1,10 @@
+using ReactiveUI;
+
+namespace Aki.Launcher.ViewModels;
+
+public class ModInfoViewModel : ViewModelBase
+{
+    public ModInfoViewModel(IScreen Host) : base(Host)
+    {
+    }
+}
\ No newline at end of file
diff --git a/project/Aki.Launcher/ViewModels/ProfileViewModel.cs b/project/Aki.Launcher/ViewModels/ProfileViewModel.cs
index 03d1cbe..87bc112 100644
--- a/project/Aki.Launcher/ViewModels/ProfileViewModel.cs
+++ b/project/Aki.Launcher/ViewModels/ProfileViewModel.cs
@@ -104,7 +104,8 @@ namespace Aki.Launcher.ViewModels
             }
         }
 
-        public void ToggleModsListCommand() => ModsListIsVisible = !ModsListIsVisible;
+        public void OpenModsInfoCommand() =>
+            NavigateTo(new ModInfoViewModel(HostScreen));
 
         public void LogoutCommand()
         {
diff --git a/project/Aki.Launcher/Views/ModInfoView.axaml b/project/Aki.Launcher/Views/ModInfoView.axaml
new file mode 100644
index 0000000..1a08ff4
--- /dev/null
+++ b/project/Aki.Launcher/Views/ModInfoView.axaml
@@ -0,0 +1,14 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Aki.Launcher.Views.ModInfoView">
+    <Grid RowDefinitions="10, Auto, *, 10" ColumnDefinitions="10, *, 10">
+        <Button Grid.Row="1" Grid.Column="1" Content="Back"
+                Command="{Binding NavigateBack}"
+                />
+        <Label Grid.Row="2" Grid.Column="1" Content="Welcome to Avalonia!"
+               />
+    </Grid>
+</UserControl>
diff --git a/project/Aki.Launcher/Views/ModInfoView.axaml.cs b/project/Aki.Launcher/Views/ModInfoView.axaml.cs
new file mode 100644
index 0000000..be36404
--- /dev/null
+++ b/project/Aki.Launcher/Views/ModInfoView.axaml.cs
@@ -0,0 +1,20 @@
+using Aki.Launcher.ViewModels;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+
+namespace Aki.Launcher.Views;
+
+public partial class ModInfoView : ReactiveUserControl<ModInfoViewModel>
+{
+    public ModInfoView()
+    {
+        InitializeComponent();
+    }
+    
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
\ No newline at end of file
diff --git a/project/Aki.Launcher/Views/ProfileView.axaml b/project/Aki.Launcher/Views/ProfileView.axaml
index a37723b..10873d4 100644
--- a/project/Aki.Launcher/Views/ProfileView.axaml
+++ b/project/Aki.Launcher/Views/ProfileView.axaml
@@ -4,183 +4,166 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:helpers="using:Aki.Launcher.Helpers"
              xmlns:cvt="using:Aki.Launcher.Converters"
-			 xmlns:cc="using:Aki.Launcher.CustomControls"
-			 xmlns:launcher="using:Aki.Launcher.Models.Aki"
+             xmlns:cc="using:Aki.Launcher.CustomControls"
+             xmlns:launcher="using:Aki.Launcher.Models.Aki"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Aki.Launcher.Views.ProfileView">
-  
-  <UserControl.Resources>
-    <cvt:ImageSourceConverter x:Key="imageSourceCvt"/>
-  </UserControl.Resources>
 
-  <Grid RowDefinitions="10,AUTO,10,AUTO,10,*,10,AUTO,10" ColumnDefinitions="10,AUTO,10,*,10">
+    <UserControl.Resources>
+        <cvt:ImageSourceConverter x:Key="imageSourceCvt" />
+    </UserControl.Resources>
 
-    <!-- profile info -->
-    <Border Grid.Row="1" Grid.Column="1" CornerRadius="5"
-            BorderBrush="{StaticResource AKI_Background_Dark}"
-            BorderThickness="5">
-		<Grid RowDefinitions="10,AUTO,AUTO,AUTO,AUTO,10" ColumnDefinitions="10,AUTO,*,10"
-			  Background="{StaticResource AKI_Background_Dark}"
-			  >
-			<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1">
-				<Label Content="{Binding CurrentUsername}" Margin="5 0"/>
+    <Grid RowDefinitions="10,AUTO,10,AUTO,10,*,10,AUTO,10" ColumnDefinitions="10,AUTO,10,*,10">
 
-				<!-- profile name and version -->
-				<Label x:Name="akiVersion"
-					   Background="Transparent"
-					   ToolTip.Tip="{Binding ProfileInfo.MismatchMessage}"
-					   Classes.versionMismatch="{Binding ProfileInfo.VersionMismatch}"
-									   >
-					<StackPanel Orientation="Horizontal" Background="Transparent">
-						<TextBlock Text="{Binding ProfileInfo.Aki.version}"/>
-						<Path Data="{StaticResource Alert}" Fill="{Binding ElementName=akiVersion, Path=Foreground}"
-							  Margin="10 0"
-							  IsVisible="{Binding ProfileInfo.VersionMismatch}"
-		                    />
-					</StackPanel>
-				</Label>
-			</StackPanel>
+        <!-- profile info -->
+        <Border Grid.Row="1" Grid.Column="1" CornerRadius="5"
+                BorderBrush="{StaticResource AKI_Background_Dark}"
+                BorderThickness="5">
+            <Grid RowDefinitions="10,AUTO,AUTO,AUTO,AUTO,10" ColumnDefinitions="10,AUTO,*,10"
+                  Background="{StaticResource AKI_Background_Dark}">
+                <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1">
+                    <Label Content="{Binding CurrentUsername}" Margin="5 0" />
 
-			<!-- delete profile button -->
-			<Button HorizontalAlignment="Right" Grid.Row="1" Grid.Column="2"
-					Classes="icon"
-					Command="{Binding RemoveProfileCommand}"
-					IsEnabled="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=!GameRunning}"
-					>
-				<Path Data="{StaticResource Delete}" Fill="IndianRed"/>
-			</Button>
+                    <!-- profile name and version -->
+                    <Label x:Name="akiVersion"
+                           Background="Transparent"
+                           ToolTip.Tip="{Binding ProfileInfo.MismatchMessage}"
+                           Classes.versionMismatch="{Binding ProfileInfo.VersionMismatch}">
+                        <StackPanel Orientation="Horizontal" Background="Transparent">
+                            <TextBlock Text="{Binding ProfileInfo.Aki.version}" />
+                            <Path Data="{StaticResource Alert}"
+                                  Fill="{Binding ElementName=akiVersion, Path=Foreground}"
+                                  Margin="10 0"
+                                  IsVisible="{Binding ProfileInfo.VersionMismatch}" />
+                        </StackPanel>
+                    </Label>
+                </StackPanel>
 
-			<!-- profile id button -->
-			<Button Content="{Binding CurrentID}" Classes="link"
-					Grid.Row="2" Grid.Column="1"
-					Command="{Binding CopyCommand}"
-					CommandParameter="{Binding CurrentID}"
-					/>
+                <!-- delete profile button -->
+                <Button HorizontalAlignment="Right" Grid.Row="1" Grid.Column="2"
+                        Classes="icon"
+                        Command="{Binding RemoveProfileCommand}"
+                        IsEnabled="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=!GameRunning}">
+                    <Path Data="{StaticResource Delete}" Fill="IndianRed" />
+                </Button>
 
-			<!-- profile edition button -->
-			<Button Content="{Binding CurrentEdition}" Classes="link"
-					Grid.Row="3" Grid.Column="1"
-					Command="{Binding ChangeEditionCommand}"
-					IsEnabled="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=!GameRunning}"
-					/>
+                <!-- profile id button -->
+                <Button Content="{Binding CurrentID}" Classes="link"
+                        Grid.Row="2" Grid.Column="1"
+                        Command="{Binding CopyCommand}"
+                        CommandParameter="{Binding CurrentID}" />
 
-			<!-- wipe profile checkbox -->
-			<CheckBox Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=wipe_on_start}"
-					  Grid.Row="4" Grid.Column="1"
-					  IsChecked="{Binding WipeProfileOnStart}"
-					  IsEnabled="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=!GameRunning}"
-					  IsVisible="{Binding !ProfileWipePending}"
-					  />
-		</Grid>
-    </Border>
-	  
-	<!-- Total Mods Info -->
-	  <Border Grid.Row="3" Grid.Column="1" CornerRadius="5"
-			  BorderBrush="{StaticResource AKI_Background_Dark}" 
-			  BorderThickness="5" IsVisible="{Binding ModInfoCollection.HasMods}"
-			  >
-		  <Grid RowDefinitions="10,AUTO,AUTO,10" ColumnDefinitions="10,AUTO,*,AUTO,AUTO,AUTO,10" 
-				Background="{StaticResource AKI_Background_Dark}">
-			  <Label Grid.Row="1" Grid.Column="1" Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=server_mods}"
-					 />
-			  <Label Grid.Row="2" Grid.Column="1" Content="{Binding ModInfoCollection.ServerModsCount}"
-					 />
-			  <Label Grid.Row="1" Grid.Column="3" Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=profile_mods}"
-					 />
-			  <Path Grid.Row="1" Grid.Column="4" Margin="10 4 0 0" IsVisible="{Binding ModInfoCollection.HasProfileOnlyMods}"
-				    Data="{StaticResource Alert}" Fill="{StaticResource AKI_Brush_Yellow}"
-					/>
-			  <Label Grid.Row="2" Grid.Column="3" Content="{Binding ModInfoCollection.ProfileModsCount}"
-					 />
-			  <Button Grid.Row="0" Grid.RowSpan="4" Grid.Column="5" Grid.ColumnSpan="2"
-					  VerticalAlignment="Stretch" FontSize="18" Margin="10 0 0 0"
-					  Command="{Binding ToggleModsListCommand}"
-					  Classes="icon"
-					  >
-				  <Button.Content>
-					  <DockPanel LastChildFill="True">
-						  <Path Data="{StaticResource Visible}" Fill="{StaticResource AKI_Foreground_Light}"
-								VerticalAlignment="Center"
-							    IsVisible="{Binding !ModsListIsVisible}"
-								/>
-						  <Path Data="{StaticResource Hide}" Fill="{StaticResource AKI_Foreground_Light}"
-								VerticalAlignment="Center"
-							    IsVisible="{Binding ModsListIsVisible}"
-								/>
-					  </DockPanel>
-				  </Button.Content>
-			  </Button>
-		  </Grid>
-	  </Border>
+                <!-- profile edition button -->
+                <Button Content="{Binding CurrentEdition}" Classes="link"
+                        Grid.Row="3" Grid.Column="1"
+                        Command="{Binding ChangeEditionCommand}"
+                        IsEnabled="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=!GameRunning}" />
 
-	  <!-- Mods List -->
-	  <ScrollViewer Grid.Row="1" Grid.RowSpan="5" Grid.Column="3" IsVisible="{Binding ModsListIsVisible}">
-		  <ItemsControl Items="{Binding ModInfoCollection.Mods}">
-			  <ItemsControl.ItemTemplate>
-				  <DataTemplate DataType="{x:Type launcher:AkiMod}">
-					  <cc:ModInfoCard ModName="{Binding Name}"
-									  Author="{Binding Author}"
-									  Version="{Binding Version}"
-									  IsInServer="{Binding InServer}"
-									  IsInProfile="{Binding InProfile}"
-									  Margin="0 0 0 10"
-									  />
-				  </DataTemplate>
-			  </ItemsControl.ItemTemplate>
-		  </ItemsControl>
-	  </ScrollViewer>
-
-    <!-- Bottom bar -->
-    <Border Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="3" CornerRadius="5"
-            BorderBrush="{StaticResource AKI_Background_Dark}"
-            BorderThickness="5"
-            >
-      <DockPanel Background="{StaticResource AKI_Background_Dark}">
-
-        <StackPanel Orientation="Horizontal"
-                    HorizontalAlignment="Stretch"
-                    Spacing="10"
-                    IsVisible="{Binding ProfileInfo.HasData}"
-                >
-            <Grid RowDefinitions="AUTO,AUTO" ColumnDefinitions="AUTO,AUTO">
-              <Image Source="{Binding SideImage.Path, Converter={StaticResource imageSourceCvt}}"
-                     Grid.RowSpan="2" Height="40" Margin="10 0"/>
-              <Label Content="{Binding ProfileInfo.Nickname}" Grid.Row="0" Grid.Column="2"/>
-              <Label Content="{Binding ProfileInfo.Side}" Grid.Row="1" Grid.Column="2"/>
+                <!-- wipe profile checkbox -->
+                <CheckBox
+                    Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=wipe_on_start}"
+                    Grid.Row="4" Grid.Column="1"
+                    IsChecked="{Binding WipeProfileOnStart}"
+                    IsEnabled="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=!GameRunning}"
+                    IsVisible="{Binding !ProfileWipePending}" />
             </Grid>
-          <Label Content="{Binding ProfileInfo.Level}" VerticalAlignment="Center"
-                 FontSize="22"/>
-          <ProgressBar Value="{Binding ProfileInfo.XPLevelProgress}"/>
-          <StackPanel>
-            <Label Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=next_level_in}" 
-                   HorizontalAlignment="Center"
-                   />
-            <Label Content="{Binding ProfileInfo.RemainingExp, StringFormat={}{0} xp}" 
-                   HorizontalAlignment="Center"
-                   />
-          </StackPanel>
-        </StackPanel>
+        </Border>
+
+        <!-- Total Mods Info -->
+        <Border Grid.Row="3" Grid.Column="1" CornerRadius="5"
+                BorderBrush="{StaticResource AKI_Background_Dark}"
+                BorderThickness="5" IsVisible="{Binding ModInfoCollection.HasMods}">
+            <Grid RowDefinitions="10,AUTO,AUTO,10" ColumnDefinitions="10,AUTO,*,AUTO,AUTO,AUTO,10"
+                  Background="{StaticResource AKI_Background_Dark}">
+                <Label Grid.Row="1" Grid.Column="1"
+                       Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=server_mods}" />
+                <Label Grid.Row="2" Grid.Column="1" Content="{Binding ModInfoCollection.ServerModsCount}" />
+                <Label Grid.Row="1" Grid.Column="3"
+                       Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=profile_mods}" />
+                <Path Grid.Row="1" Grid.Column="4" Margin="10 4 0 0"
+                      IsVisible="{Binding ModInfoCollection.HasProfileOnlyMods}"
+                      Data="{StaticResource Alert}" Fill="{StaticResource AKI_Brush_Yellow}" />
+                <Label Grid.Row="2" Grid.Column="3" Content="{Binding ModInfoCollection.ProfileModsCount}" />
+                <Button Grid.Row="0" Grid.RowSpan="4" Grid.Column="5" Grid.ColumnSpan="2"
+                        VerticalAlignment="Stretch" FontSize="18" Margin="10 0 0 0"
+                        Command="{Binding OpenModsInfoCommand}"
+                        Classes="icon">
+                    <Button.Content>
+                        <DockPanel LastChildFill="True">
+                            <Path Data="{StaticResource Visible}" Fill="{StaticResource AKI_Foreground_Light}"
+                                  VerticalAlignment="Center"
+                                  IsVisible="{Binding !ModsListIsVisible}" />
+                            <Path Data="{StaticResource Hide}" Fill="{StaticResource AKI_Foreground_Light}"
+                                  VerticalAlignment="Center"
+                                  IsVisible="{Binding ModsListIsVisible}" />
+                        </DockPanel>
+                    </Button.Content>
+                </Button>
+            </Grid>
+        </Border>
+
+        <!-- Mods List -->
+        <!-- <ScrollViewer Grid.Row="1" Grid.RowSpan="5" Grid.Column="3" IsVisible="{Binding ModsListIsVisible}"> -->
+        <!--     <ItemsControl Items="{Binding ModInfoCollection.Mods}"> -->
+        <!--         <ItemsControl.ItemTemplate> -->
+        <!--             <DataTemplate DataType="{x:Type launcher:AkiMod}"> -->
+        <!--                 <cc:ModInfoCard ModName="{Binding Name}" -->
+        <!--                                 Author="{Binding Author}" -->
+        <!--                                 Version="{Binding Version}" -->
+        <!--                                 IsInServer="{Binding InServer}" -->
+        <!--                                 IsInProfile="{Binding InProfile}" -->
+        <!--                                 Margin="0 0 0 10" /> -->
+        <!--             </DataTemplate> -->
+        <!--         </ItemsControl.ItemTemplate> -->
+        <!--     </ItemsControl> -->
+        <!-- </ScrollViewer> -->
+
+        <!-- Bottom bar -->
+        <Border Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="3" CornerRadius="5"
+                BorderBrush="{StaticResource AKI_Background_Dark}"
+                BorderThickness="5">
+            <DockPanel Background="{StaticResource AKI_Background_Dark}">
+
+                <StackPanel Orientation="Horizontal"
+                            HorizontalAlignment="Stretch"
+                            Spacing="10"
+                            IsVisible="{Binding ProfileInfo.HasData}">
+                    <Grid RowDefinitions="AUTO,AUTO" ColumnDefinitions="AUTO,AUTO">
+                        <Image Source="{Binding SideImage.Path, Converter={StaticResource imageSourceCvt}}"
+                               Grid.RowSpan="2" Height="40" Margin="10 0" />
+                        <Label Content="{Binding ProfileInfo.Nickname}" Grid.Row="0" Grid.Column="2" />
+                        <Label Content="{Binding ProfileInfo.Side}" Grid.Row="1" Grid.Column="2" />
+                    </Grid>
+                    <Label Content="{Binding ProfileInfo.Level}" VerticalAlignment="Center"
+                           FontSize="22" />
+                    <ProgressBar Value="{Binding ProfileInfo.XPLevelProgress}" />
+                    <StackPanel>
+                        <Label
+                            Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=next_level_in}"
+                            HorizontalAlignment="Center" />
+                        <Label Content="{Binding ProfileInfo.RemainingExp, StringFormat={}{0} xp}"
+                               HorizontalAlignment="Center" />
+                    </StackPanel>
+                </StackPanel>
 
 
-        <Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=start_game}"
-                HorizontalAlignment="Right"
-                VerticalContentAlignment="Center"
-                VerticalAlignment="Stretch"
-                DockPanel.Dock="Right"
-                Command="{Binding StartGameCommand}"
-                IsEnabled="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=!GameRunning}"
-                Classes="yellow"
-                />
-        
-        <Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=logout}"
-                  Command="{Binding LogoutCommand}"
-                  Margin="10 0"
-                  Classes="link"
-                  DockPanel.Dock="Right"
-                  HorizontalAlignment="Right"
-                  />
-        
-      </DockPanel>
-    </Border>
-  </Grid>
-</UserControl>
+                <Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=start_game}"
+                        HorizontalAlignment="Right"
+                        VerticalContentAlignment="Center"
+                        VerticalAlignment="Stretch"
+                        DockPanel.Dock="Right"
+                        Command="{Binding StartGameCommand}"
+                        IsEnabled="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=!GameRunning}"
+                        Classes="yellow" />
+
+                <Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=logout}"
+                        Command="{Binding LogoutCommand}"
+                        Margin="10 0"
+                        Classes="link"
+                        DockPanel.Dock="Right"
+                        HorizontalAlignment="Right" />
+
+            </DockPanel>
+        </Border>
+    </Grid>
+</UserControl>
\ No newline at end of file