Resource optimisations 2

Bloxstrap/Bloxstrap.csproj

@@ -16,10 +16,10 @@
 
   <ItemGroup>
     <Resource Include="Bloxstrap.ico" />
-    <Resource Include="Resources\Fonts\NotoSansThai-VariableFont_wdth,wght.ttf" />
-    <Resource Include="Resources\Fonts\Rubik-VariableFont_wght.ttf" />
-    <Resource Include="Resources\BootstrapperStyles\ByfronDialog\ByfronLogoDark.jpg" />
-    <Resource Include="Resources\BootstrapperStyles\ByfronDialog\ByfronLogoLight.jpg" />
+    <Resource Include="Resources\Fonts\NotoSansThai-VariableFont_wdth,wght.woff2" />
+    <Resource Include="Resources\Fonts\Rubik-VariableFont_wght.woff2" />
+    <Resource Include="Resources\BootstrapperStyles\ByfronDialog\ByfronLogoDark.webp" />
+    <Resource Include="Resources\BootstrapperStyles\ByfronDialog\ByfronLogoLight.webp" />
     <Resource Include="Resources\BootstrapperStyles\ByfronDialog\Matt.png" />
     <Resource Include="Resources\MessageBox\Error.png" />
     <Resource Include="Resources\MessageBox\Information.png" />
@@ -38,7 +38,7 @@
     <EmbeddedResource Include="Resources\Icon2017.ico" />
     <EmbeddedResource Include="Resources\Icon2019.ico" />
     <EmbeddedResource Include="Resources\Icon2022.ico" />
-    <EmbeddedResource Include="Resources\IconBloxstrap.ico" />
+    <EmbeddedResource Include="Bloxstrap.ico" />
     <EmbeddedResource Include="Resources\IconEarly2015.ico" />
     <EmbeddedResource Include="Resources\IconLate2015.ico" />
     <EmbeddedResource Include="Resources\Mods\Cursor\From2006\ArrowCursor.png" />

Bloxstrap/Extensions/IconEx.cs

@@ -19,7 +19,10 @@ public static ImageSource GetImageSource(this Icon icon, bool handleException =
             {
                 try
                 {
-                    return BitmapFrame.Create(stream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
+                    var decoder = new IconBitmapDecoder(stream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
+                    return decoder.Frames
+                        .OrderByDescending(f => f.PixelWidth * f.PixelHeight)
+                        .First();
                 }
                 catch (Exception ex)
                 {
@@ -30,7 +33,10 @@ public static ImageSource GetImageSource(this Icon icon, bool handleException =
             }
             else
             {
-                return BitmapFrame.Create(stream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
+                var decoder = new IconBitmapDecoder(stream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
+                return decoder.Frames
+                    .OrderByDescending(f => f.PixelWidth * f.PixelHeight)
+                    .First();
             }
         }
     }

Bloxstrap/Properties/Resources.resx

@@ -119,16 +119,16 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="CancelButton" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\CancelButton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\CancelButton.webp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="CancelButtonHover" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\CancelButtonHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\CancelButtonHover.webp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="DarkCancelButton" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DarkCancelButton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\DarkCancelButton.webp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="DarkCancelButtonHover" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DarkCancelButtonHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\DarkCancelButtonHover.webp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Icon2008" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Icon2008.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -146,7 +146,7 @@
     <value>..\Resources\Icon2022.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="IconBloxstrap" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\IconBloxstrap.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Bloxstrap.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="IconEarly2015" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\IconEarly2015.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

Bloxstrap/UI/Elements/About/Pages/AboutPage.xaml

@@ -30,7 +30,7 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
-            <Image x:Name="Image1" Grid.Column="0" Width="72" Height="72" VerticalAlignment="Center" Source="pack://application:,,,/Bloxstrap.ico" RenderOptions.BitmapScalingMode="HighQuality" />
+            <Image x:Name="Image1" Grid.Column="0" Width="72" Height="72" VerticalAlignment="Center" RenderOptions.BitmapScalingMode="HighQuality" />
             <Image x:Name="Image2" Grid.Column="0" Width="72" Height="72" VerticalAlignment="Center" Source="pack://application:,,,/Resources/BootstrapperStyles/ByfronDialog/Matt.png" RenderOptions.BitmapScalingMode="HighQuality" Opacity="0" />
 
             <StackPanel Grid.Column="1" Margin="12,0,0,0" VerticalAlignment="Center">

Bloxstrap/UI/Elements/About/Pages/AboutPage.xaml.cs

@@ -20,6 +20,7 @@ public AboutPage()
         {
             DataContext = new AboutViewModel();
             InitializeComponent();
+            Image1.Source = BootstrapperIcon.IconBloxstrap.GetIcon().GetImageSource();
         }
 
         private void UiPage_KeyDown(object sender, KeyEventArgs e)

Bloxstrap/UI/Elements/Bootstrapper/ByfronDialog.xaml.cs

@@ -118,7 +118,7 @@ public ByfronDialog()
                 _viewModel.Foreground = new SolidColorBrush(Color.FromRgb(57, 59, 61));
                 _viewModel.IconColor = new SolidColorBrush(Color.FromRgb(57, 59, 61));
                 _viewModel.ProgressBarBackground = new SolidColorBrush(Color.FromRgb(189, 190, 190));
-                _viewModel.ByfronLogoLocation = new BitmapImage(new Uri("pack://application:,,,/Resources/BootstrapperStyles/ByfronDialog/ByfronLogoLight.jpg"));
+                _viewModel.ByfronLogoLocation = new BitmapImage(new Uri("pack://application:,,,/Resources/BootstrapperStyles/ByfronDialog/ByfronLogoLight.webp"));
             }
 
             InitializeComponent();

Bloxstrap/UI/Elements/ContextMenu/MenuContainer.xaml

@@ -30,7 +30,7 @@
                             <ColumnDefinition Width="20" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
-                        <Image Grid.Column="0" Source="pack://application:,,,/Bloxstrap.ico" RenderOptions.BitmapScalingMode="HighQuality" />
+                        <Image x:Name="Image" Grid.Column="0" RenderOptions.BitmapScalingMode="HighQuality" />
                         <TextBlock x:Name="VersionTextBlock" Foreground="{DynamicResource TextFillColorSecondaryBrush}" Grid.Column="1" VerticalAlignment="Center" Margin="6,0,0,0" Text="Bloxstrap v2.4.1" />
                     </Grid>
                 </MenuItem.Header>

Bloxstrap/UI/Elements/ContextMenu/MenuContainer.xaml.cs

@@ -29,6 +29,8 @@ public MenuContainer(Watcher watcher)
         {
             InitializeComponent();
 
+            Image.Source = BootstrapperIcon.IconBloxstrap.GetIcon().GetImageSource();
+
             _watcher = watcher;
 
             if (_activityWatcher is not null)

Bloxstrap/UI/Elements/Dialogs/LaunchMenuDialog.xaml

@@ -44,7 +44,7 @@
                         <ColumnDefinition Width="*" />
                     </Grid.ColumnDefinitions>
 
-                    <Image Grid.Column="0" Width="64" Height="64" Source="pack://application:,,,/Bloxstrap.ico" RenderOptions.BitmapScalingMode="HighQuality" />
+                    <Image x:Name="Image" Grid.Column="0" Width="64" Height="64" RenderOptions.BitmapScalingMode="HighQuality" />
                     <StackPanel Grid.Column="1" Margin="12,0,0,0" VerticalAlignment="Center">
                         <TextBlock Text="Bloxstrap" FontSize="24" />
                         <TextBlock Text="{Binding Version, Mode=OneTime}" VerticalAlignment="Bottom" FontSize="12" Foreground="{DynamicResource TextFillColorTertiaryBrush}" />

Bloxstrap/UI/Elements/Dialogs/LaunchMenuDialog.xaml.cs

@@ -36,6 +36,8 @@ public LaunchMenuDialog()
             DataContext = viewModel;
 
             InitializeComponent();
+
+            Image.Source = BootstrapperIcon.IconBloxstrap.GetIcon().GetImageSource();
         }
     }
 }

Bloxstrap/UI/ViewModels/Bootstrapper/ByfronDialogViewModel.cs

@@ -7,7 +7,7 @@ namespace Bloxstrap.UI.ViewModels.Bootstrapper
     public class ByfronDialogViewModel : BootstrapperDialogViewModel
     {
         // Using dark theme for default values.
-        public ImageSource ByfronLogoLocation { get; set; } = new BitmapImage(new Uri("pack://application:,,,/Resources/BootstrapperStyles/ByfronDialog/ByfronLogoDark.jpg"));
+        public ImageSource ByfronLogoLocation { get; set; } = new BitmapImage(new Uri("pack://application:,,,/Resources/BootstrapperStyles/ByfronDialog/ByfronLogoDark.webp"));
         public Thickness DialogBorder { get; set; } = new Thickness(0);
         public Brush Background { get; set; } = Brushes.Black;
         public Brush Foreground { get; set; } = new SolidColorBrush(Color.FromRgb(239, 239, 239));

README.md

@@ -5,8 +5,8 @@
 > Bloxstrap is not under active development anymore. Any issues or pull requests opened may take a while to get a response.
 
 <p align="center">
-    <img src="https://github.com/bloxstraplabs/bloxstrap/raw/main/Images/Bloxstrap-full-dark.png#gh-dark-mode-only" width="380">
-    <img src="https://github.com/bloxstraplabs/bloxstrap/raw/main/Images/Bloxstrap-full-light.png#gh-light-mode-only" width="380">
+    <img src="https://github.com/bloxstraplabs/bloxstrap/raw/main/Images/Bloxstrap-full-dark.webp#gh-dark-mode-only" width="380">
+    <img src="https://github.com/bloxstraplabs/bloxstrap/raw/main/Images/Bloxstrap-full-light.webp#gh-light-mode-only" width="380">
 </p>
 
 <div align="center">