From 61b2ce648a015d910a064b71c5254aff362ae11e Mon Sep 17 00:00:00 2001
From: trawzified <55751269+tr4wzified@users.noreply.github.com>
Date: Tue, 28 Nov 2023 23:19:03 +0100
Subject: [PATCH] Adjust LinksView & hovering colors

---
 Wabbajack.App.Wpf/Consts.cs                   |   3 +
 Wabbajack.App.Wpf/Themes/Styles.xaml          |  35 ++----
 Wabbajack.App.Wpf/Views/LinksView.xaml        | 104 +++++++++++++-----
 Wabbajack.App.Wpf/Views/LinksView.xaml.cs     |  12 +-
 Wabbajack.App.Wpf/Views/MainWindow.xaml       |  16 +--
 .../Views/ModeSelectionView.xaml              |  10 +-
 .../Views/ModeSelectionView.xaml.cs           |   2 +
 7 files changed, 105 insertions(+), 77 deletions(-)

diff --git a/Wabbajack.App.Wpf/Consts.cs b/Wabbajack.App.Wpf/Consts.cs
index 7e47b8e6..f664e793 100644
--- a/Wabbajack.App.Wpf/Consts.cs
+++ b/Wabbajack.App.Wpf/Consts.cs
@@ -10,6 +10,9 @@ public static class Consts
     public static string AppName = "Wabbajack";
     public static Uri WabbajackBuildServerUri => new("https://build.wabbajack.org");
     public static Uri WabbajackModlistWizardUri => new("https://wizard.wabbajack.org");
+    public static Uri WabbajackGithubUri => new("https://github.com/wabbajack-tools/wabbajack");
+    public static Uri WabbajackDiscordUri => new("https://discord.gg/wabbajack");
+    public static Uri WabbajackPatreonUri => new("https://www.patreon.com/user?u=11907933");
     public static Version CurrentMinimumWabbajackVersion { get; set; } = Version.Parse("2.3.0.0");
     public static bool UseNetworkWorkaroundMode { get; set; } = false;
     public static AbsolutePath CefCacheLocation { get; } = KnownFolders.WabbajackAppLocal.Combine("Cef");
diff --git a/Wabbajack.App.Wpf/Themes/Styles.xaml b/Wabbajack.App.Wpf/Themes/Styles.xaml
index e947c272..2ab55a1b 100644
--- a/Wabbajack.App.Wpf/Themes/Styles.xaml
+++ b/Wabbajack.App.Wpf/Themes/Styles.xaml
@@ -25,8 +25,8 @@
 
     <!--  Colors  -->
     <Color x:Key="WindowBackgroundColor">#222531</Color>
-    <Color x:Key="DarkBackgroundColor">#222531</Color>
-    <Color x:Key="DarkHoverBackgroundColor">#2A2B41</Color>
+    <Color x:Key="DarkBackgroundColor">#3c3652</Color>
+    <Color x:Key="DarkHoverBackgroundColor">#4e4571</Color>
     <Color x:Key="LightBackgroundColor">#424242</Color>
     <Color x:Key="BackgroundColor">#222531</Color>
     <Color x:Key="DisabledBackgroundColor">#424242</Color>
@@ -50,15 +50,15 @@
     <Color x:Key="PrimaryVariant">#8866ad</Color>
     <Color x:Key="DarkPrimaryVariant">#270080</Color>
     <Color x:Key="DarkerPrimaryVariant">#1b0059</Color>
-    <Color x:Key="Secondary">#03DAC6</Color>
+    <Color x:Key="Secondary">#3C3652</Color>
     <Color x:Key="DarkSecondary">#0e8f83</Color>
     <Color x:Key="DarkerSecondary">#095952</Color>
     <Color x:Key="SecondaryBackground">#042421</Color>
     <Color x:Key="OffWhiteSeconday">#cef0ed</Color>
     <Color x:Key="LightSecondary">#8cede5</Color>
     <Color x:Key="IntenseSecondary">#00ffe7</Color>
-    <Color x:Key="Complementary">#C7FC86</Color>
-    <Color x:Key="DarkComplementary">#8eb55e</Color>
+    <Color x:Key="Complementary">#4e4571</Color>
+    <Color x:Key="DarkComplementary">#3C3652</Color>
     <Color x:Key="ComplementaryBackground">#4b6130</Color>
     <Color x:Key="IntenseComplementary">#abf74d</Color>
     <Color x:Key="Analogous1">#868CFC</Color>
@@ -1165,7 +1165,7 @@
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="3">
+                            CornerRadius="16">
                             <ContentPresenter
                                 Margin="{TemplateBinding Padding}"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -1208,29 +1208,12 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
                     <Grid>
-                        <Border
-                            Background="{StaticResource ComplementaryBrush}"
-                            CornerRadius="3"
-                            Opacity="0.7">
-                            <Border.Effect>
-                                <BlurEffect Radius="5" />
-                            </Border.Effect>
-                            <Border.Style>
-                                <Style TargetType="Border">
-                                    <Setter Property="Visibility" Value="Hidden" />
-                                    <Style.Triggers>
-                                        <DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType={x:Type Button}}}" Value="True">
-                                            <Setter Property="Visibility" Value="Visible" />
-                                        </DataTrigger>
-                                    </Style.Triggers>
-                                </Style>
-                            </Border.Style>
-                        </Border>
                         <Border
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="3">
+                            CornerRadius="20"
+                            Padding="13">
                             <ContentPresenter
                                 Margin="{TemplateBinding Padding}"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -1319,7 +1302,7 @@
                 <Setter Property="Background" Value="Transparent" />
             </Trigger>
             <Trigger Property="IsMouseOver" Value="True">
-                <Setter Property="BorderBrush" Value="{StaticResource MahApps.Brushes.Gray7}" />
+                <Setter Property="BorderBrush" Value="{StaticResource ComplementaryBrush}" />
                 <Setter Property="Foreground" Value="{StaticResource PrimaryBrush}" />
                 <Setter Property="Background" Value="Transparent" />
             </Trigger>
diff --git a/Wabbajack.App.Wpf/Views/LinksView.xaml b/Wabbajack.App.Wpf/Views/LinksView.xaml
index ca346083..fe945a40 100644
--- a/Wabbajack.App.Wpf/Views/LinksView.xaml
+++ b/Wabbajack.App.Wpf/Views/LinksView.xaml
@@ -6,44 +6,90 @@
     xmlns:icon="http://metro.mahapps.com/winfx/xaml/iconpacks"
     xmlns:local="clr-namespace:Wabbajack"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ic="clr-namespace:FluentIcons.WPF;assembly=FluentIcons.WPF"
     mc:Ignorable="d">
-    <Grid>
+    <Grid Margin="0, 30">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="*" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <Button Grid.Column="1"
-                Width="40"
-                Height="35"
-                Margin="4,0,0,0"
-                Click="Patreon_Click"
-                Style="{StaticResource IconBareButtonStyle}">
-            <icon:PackIconMaterial
-                Width="25"
-                Height="25"
-                Kind="Patreon"/>
+        <Button Style="{StaticResource LargeButtonStyle}" Margin="10,0" Click="Patreon_Click" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <TextBlock FontWeight="DemiBold" FontSize="28" VerticalAlignment="Center" HorizontalAlignment="Left">
+                Patreon
+                </TextBlock>
+                <TextBlock Grid.Row="1" FontSize="14" VerticalAlignment="Center">
+                Help support the project
+                </TextBlock>
+                <icon:PackIconMaterial Grid.Column="1" Width="28" Height="28" Kind="Patreon" VerticalAlignment="Center" HorizontalAlignment="Right" />
+            </Grid>
         </Button>
-        <Button Grid.Column="2"
-                Width="40"
-                Height="35"
-                Click="GitHub_Click"
-                Style="{StaticResource IconBareButtonStyle}">
-            <icon:PackIconMaterial
-                Width="25"
-                Height="25"
-                Kind="GitHub" />
+        <Button Grid.Column="1" Style="{StaticResource LargeButtonStyle}" Margin="10,0" Click="GitHub_Click" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <TextBlock FontWeight="DemiBold" FontSize="28" VerticalAlignment="Center" HorizontalAlignment="Left">
+                GitHub
+                </TextBlock>
+                <TextBlock Grid.Row="1" FontSize="14" VerticalAlignment="Center">
+                Contribute to the project
+                </TextBlock>
+                <icon:PackIconMaterial Grid.Column="1" Width="28" Height="28" Kind="Github" VerticalAlignment="Center" HorizontalAlignment="Right" />
+            </Grid>
         </Button>
-        <Button Grid.Column="3"
-                Width="40"
-                Height="35"
-                Click="Discord_Click"
-                Style="{StaticResource IconBareButtonStyle}">
-            <icon:PackIconMaterial
-                Width="25"
-                Height="25"
-                Kind="Discord" />
+        <Button Grid.Column="2" Style="{StaticResource LargeButtonStyle}" Margin="10,0" Click="Discord_Click" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <TextBlock FontWeight="DemiBold" FontSize="28" VerticalAlignment="Center" HorizontalAlignment="Left">
+                Discord
+                </TextBlock>
+                <TextBlock Grid.Row="1" FontSize="14" VerticalAlignment="Center">
+                Visit the Wabbajack community
+                </TextBlock>
+                <icon:PackIconMaterial Grid.Column="1" Width="28" Height="28" Kind="Discord" VerticalAlignment="Center" HorizontalAlignment="Right" />
+            </Grid>
+        </Button>
+        <Button Grid.Column="3" Style="{StaticResource LargeButtonStyle}" Margin="10,0" Click="Discord_Click" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <TextBlock FontWeight="DemiBold" FontSize="28" VerticalAlignment="Center" HorizontalAlignment="Left">
+                Wiki
+                </TextBlock>
+                <TextBlock Grid.Row="1" FontSize="14" VerticalAlignment="Center">
+                Read the general documentation
+                </TextBlock>
+                <ic:SymbolIcon Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Right" Symbol="TextQuote" FontSize="28" />
+            </Grid>
         </Button>
     </Grid>
 </UserControl>
diff --git a/Wabbajack.App.Wpf/Views/LinksView.xaml.cs b/Wabbajack.App.Wpf/Views/LinksView.xaml.cs
index cd86e41d..2c043542 100644
--- a/Wabbajack.App.Wpf/Views/LinksView.xaml.cs
+++ b/Wabbajack.App.Wpf/Views/LinksView.xaml.cs
@@ -17,18 +17,12 @@ namespace Wabbajack
         }
 
         private void GitHub_Click(object sender, RoutedEventArgs e)
-        {
-            UIUtils.OpenWebsite(new Uri("https://github.com/wabbajack-tools/wabbajack"));
-        }
+            => UIUtils.OpenWebsite(Consts.WabbajackGithubUri);
 
         private void Discord_Click(object sender, RoutedEventArgs e)
-        {
-            UIUtils.OpenWebsite(new Uri("https://discord.gg/wabbajack"));
-        }
+            => UIUtils.OpenWebsite(Consts.WabbajackDiscordUri);
 
         private void Patreon_Click(object sender, RoutedEventArgs e)
-        {
-            UIUtils.OpenWebsite(new Uri("https://www.patreon.com/user?u=11907933"));
-        }
+            => UIUtils.OpenWebsite(Consts.WabbajackPatreonUri);
     }
 }
diff --git a/Wabbajack.App.Wpf/Views/MainWindow.xaml b/Wabbajack.App.Wpf/Views/MainWindow.xaml
index 068196a7..656734f0 100644
--- a/Wabbajack.App.Wpf/Views/MainWindow.xaml
+++ b/Wabbajack.App.Wpf/Views/MainWindow.xaml
@@ -46,16 +46,16 @@
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Column="0" FontSize="16" Padding="8, 8" Name="AppName"></TextBlock>
             <TextBlock Grid.Column="1" FontSize="16" Padding="8, 8" Name="ResourceUsage" HorizontalAlignment="Right" VerticalAlignment="Center"></TextBlock>
-            <Button Grid.Column="2" Name="SettingsButton" Padding="12, 8" ToolTip="Open Wabbajack settings">
+            <Button Grid.Column="2" Style="{StaticResource IconBareButtonStyle}" Name="SettingsButton" Padding="12, 8" ToolTip="Open Wabbajack settings">
                 <ic:SymbolIcon Symbol="Settings"/>
             </Button>
-            <Button Grid.Column="3" Name="MinimizeButton" Padding="12, 8">
+            <Button Grid.Column="3" Style="{StaticResource IconBareButtonStyle}" Name="MinimizeButton" Padding="12, 8">
                 <ic:SymbolIcon Symbol="Subtract"/>
             </Button>
-            <Button Grid.Column="4" Name="MaximizeButton" Padding="12, 8">
+            <Button Grid.Column="4" Style="{StaticResource IconBareButtonStyle}" Name="MaximizeButton" Padding="12, 8">
                 <ic:SymbolIcon Symbol="Maximize"/>
             </Button>
-            <Button Grid.Column="5" Name="CloseButton" Padding="12, 8">
+            <Button Grid.Column="5" Style="{StaticResource IconBareButtonStyle}" Name="CloseButton" Padding="12, 8">
                 <ic:SymbolIcon Symbol="ArrowExit"/>
             </Button>
         </Grid>
@@ -102,22 +102,22 @@
                 </Button.ToolTip>
             </Button>
             <Button Grid.Column="1"
-                    Margin="5,0"
+                    Style="{StaticResource IconBareButtonStyle}"
                     Command="{Binding OpenSettingsCommand}">
                 <ic:SymbolIcon Symbol="Settings" FontSize="17"/>
             </Button>
             <Button Grid.Column="1"
-                    Margin="5,0"
+                    Style="{StaticResource IconBareButtonStyle}"
                     Command="{Binding MinimizeCommand}">
                 <ic:SymbolIcon Symbol="Subtract" FontSize="17"/>
             </Button>
             <Button Grid.Column="1"
-                    Margin="5,0"
+                    Style="{StaticResource IconBareButtonStyle}"
                     Command="{Binding MaximizeCommand}">
                 <ic:SymbolIcon Symbol="Maximize" FontSize="17"/>
             </Button>
             <Button Grid.Column="1"
-                    Margin="5,0"
+                    Style="{StaticResource IconBareButtonStyle}"
                     Command="{Binding CloseCommand}">
                 <ic:SymbolIcon Symbol="ArrowExit" FontSize="17"/>
             </Button>
diff --git a/Wabbajack.App.Wpf/Views/ModeSelectionView.xaml b/Wabbajack.App.Wpf/Views/ModeSelectionView.xaml
index 5b5bba54..1e50fc77 100644
--- a/Wabbajack.App.Wpf/Views/ModeSelectionView.xaml
+++ b/Wabbajack.App.Wpf/Views/ModeSelectionView.xaml
@@ -15,8 +15,8 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="3*" />
+            <RowDefinition Height="0.2*" />
             <RowDefinition Height="1*" />
-            <RowDefinition Height="0.05*" />
         </Grid.RowDefinitions>
         <Grid Grid.Row="0" Grid.Column="0">
             <Grid.RowDefinitions>
@@ -184,6 +184,7 @@
             </Grid>
         </Grid>
 
+<!--
         <Grid Grid.Row="1" Margin="5,15">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
@@ -647,9 +648,8 @@
                 </Grid>
             </Button>
         </Grid>
-        <local:LinksView Grid.Row="0" Grid.RowSpan="3" Grid.Column="0"
-            Margin="10"
-            HorizontalAlignment="Right"
-            VerticalAlignment="Top" />
+        -->
+        <GridSplitter Grid.Row="1" Background="White" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Stretch" />
+        <local:LinksView Grid.Row="2" Grid.Column="0"/>
     </Grid>
 </rxui:ReactiveUserControl>
diff --git a/Wabbajack.App.Wpf/Views/ModeSelectionView.xaml.cs b/Wabbajack.App.Wpf/Views/ModeSelectionView.xaml.cs
index 05a838fa..d669bd1f 100644
--- a/Wabbajack.App.Wpf/Views/ModeSelectionView.xaml.cs
+++ b/Wabbajack.App.Wpf/Views/ModeSelectionView.xaml.cs
@@ -29,6 +29,7 @@ namespace Wabbajack
             InitializeComponent();
             this.WhenActivated(dispose =>
             {
+                /*
                 this.WhenAny(x => x.ViewModel.BrowseCommand)
                     .BindToStrict(this, x => x.BrowseButton.Command)
                     .DisposeWith(dispose);
@@ -38,6 +39,7 @@ namespace Wabbajack
                 this.WhenAny(x => x.ViewModel.CompileCommand)
                     .BindToStrict(this, x => x.CompileButton.Command)
                     .DisposeWith(dispose);
+                */
                 this.WhenAnyValue(x => x.ViewModel.Modlists)
                     .Select(x => x?.Length.ToString() ?? "0")
                     .BindToStrict(this, x => x.ModlistAmountTextBlock.Text)