From 3c34589107b3649a100204051a7c70ddb1f09a98 Mon Sep 17 00:00:00 2001 From: Jimmy White Date: Sat, 13 Jul 2024 15:29:20 +0100 Subject: [PATCH 1/3] Updated Material Design Themes --- AddApp.xaml | 12 +++++++----- App.xaml | 21 +++++++++++++++++---- Elite Dangerous Addon Launcher V2.csproj | 8 ++++---- MainWindow.xaml | 12 ++++++------ WhatsNew.xaml | 5 +++-- 5 files changed, 37 insertions(+), 21 deletions(-) diff --git a/AddApp.xaml b/AddApp.xaml index b1cf3f3..1c25769 100644 --- a/AddApp.xaml +++ b/AddApp.xaml @@ -6,14 +6,16 @@ Title="Add App" SizeToContent="WidthAndHeight" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" - TextElement.Foreground="{DynamicResource MaterialDesignBody}" - TextElement.FontWeight="Regular" - TextElement.FontSize="13" + TextElement.Foreground="{DynamicResource MaterialDesign.Brush.Foreground}" + Background="{DynamicResource MaterialDesign.Brush.Background}" + TextElement.FontWeight="Regular" + TextElement.FontSize="12" + FontFamily="{materialDesign:MaterialDesignFont}" + TextOptions.TextFormattingMode="Ideal" TextOptions.TextRenderingMode="Auto" UseLayoutRounding="True" - Background="{DynamicResource MaterialDesignPaper}" - FontFamily="{DynamicResource MaterialDesignFont}"> + > diff --git a/App.xaml b/App.xaml index 922fc8c..967c07f 100644 --- a/App.xaml +++ b/App.xaml @@ -1,14 +1,27 @@  + - - - - + + + + + + + + + + + diff --git a/Elite Dangerous Addon Launcher V2.csproj b/Elite Dangerous Addon Launcher V2.csproj index 0c737c7..704469d 100644 --- a/Elite Dangerous Addon Launcher V2.csproj +++ b/Elite Dangerous Addon Launcher V2.csproj @@ -6,8 +6,8 @@ Elite_Dangerous_Addon_Launcher_V2 enable true - 1.1.5.387 - 1.1.5.387 + 1.1.5.395 + 1.1.5.395 elite-dangerous-icon.ico app.png https://github.com/jimmyeao/Elite-Dangerous-Addon-Launcher-V2 @@ -36,8 +36,8 @@ - - + + diff --git a/MainWindow.xaml b/MainWindow.xaml index 591bca9..1a8ac34 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -9,22 +9,22 @@ xmlns:av="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="av" x:Class="Elite_Dangerous_Addon_Launcher_V2.MainWindow" Title="{Binding ElementName=Main, Path=ApplicationVersion, StringFormat='ED AddOn Helper v{0}'}" Height="450" Width="741" - TextElement.Foreground="{DynamicResource MaterialDesignBody}" + TextElement.Foreground="{DynamicResource MaterialDesign.Brush.Foreground}" + Background="{DynamicResource MaterialDesign.Brush.Background}" TextElement.FontWeight="Regular" TextElement.FontSize="13" TextOptions.TextFormattingMode="Ideal" TextOptions.TextRenderingMode="Auto" - Background="{DynamicResource MaterialDesignPaper}" + FontFamily="{DynamicResource MaterialDesignFont}"> - - - - + + + diff --git a/WhatsNew.xaml b/WhatsNew.xaml index d1d383d..a8292ad 100644 --- a/WhatsNew.xaml +++ b/WhatsNew.xaml @@ -6,12 +6,13 @@ Title="What's New" Width="600" Height="400" - TextElement.Foreground="{DynamicResource MaterialDesignBody}" + TextElement.Foreground="{DynamicResource MaterialDesign.Brush.Foreground}" + Background="{DynamicResource MaterialDesign.Brush.Background}" TextElement.FontWeight="Regular" TextElement.FontSize="14" TextOptions.TextFormattingMode="Ideal" TextOptions.TextRenderingMode="Auto" - Background="{DynamicResource MaterialDesignPaper}" + FontFamily="{DynamicResource MaterialDesignFont}"> From 7b2e7388f5925d85dede67dbb68633b016b41336 Mon Sep 17 00:00:00 2001 From: Jimmy White Date: Sat, 13 Jul 2024 15:37:44 +0100 Subject: [PATCH 2/3] Published --- Elite Dangerous Addon Launcher V2.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Elite Dangerous Addon Launcher V2.csproj b/Elite Dangerous Addon Launcher V2.csproj index 704469d..6c7c593 100644 --- a/Elite Dangerous Addon Launcher V2.csproj +++ b/Elite Dangerous Addon Launcher V2.csproj @@ -6,8 +6,8 @@ Elite_Dangerous_Addon_Launcher_V2 enable true - 1.1.5.395 - 1.1.5.395 + 1.1.5.396 + 1.1.5.396 elite-dangerous-icon.ico app.png https://github.com/jimmyeao/Elite-Dangerous-Addon-Launcher-V2 From fad555a9a86e0785dc62a17cd9a90bcf34507b88 Mon Sep 17 00:00:00 2001 From: Jimmy White Date: Sun, 14 Jul 2024 14:38:17 +0100 Subject: [PATCH 3/3] Upgrade project to .NET 8.0 and bump version Upgraded the project's target framework from `.NET 7.0` (version `net7.0-windows10.0.22621.0`) to `.NET 8.0` (version `net8.0-windows10.0.22621.0`) to leverage the latest features, performance enhancements, and bug fixes. Incremented the assembly and file version from `1.1.5.396` to `1.1.5.397`, indicating minor changes or fixes. --- Elite Dangerous Addon Launcher V2.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Elite Dangerous Addon Launcher V2.csproj b/Elite Dangerous Addon Launcher V2.csproj index 6c7c593..96d7d35 100644 --- a/Elite Dangerous Addon Launcher V2.csproj +++ b/Elite Dangerous Addon Launcher V2.csproj @@ -2,12 +2,12 @@ WinExe - net7.0-windows10.0.22621.0 + net8.0-windows10.0.22621.0 Elite_Dangerous_Addon_Launcher_V2 enable true - 1.1.5.396 - 1.1.5.396 + 1.1.5.397 + 1.1.5.397 elite-dangerous-icon.ico app.png https://github.com/jimmyeao/Elite-Dangerous-Addon-Launcher-V2