Add Byfron logo

Bloxstrap/Bloxstrap.csproj

@@ -14,7 +14,9 @@
 
   <ItemGroup>
     <Resource Include="Bloxstrap.ico" />
-    <Resource Include="Fonts\Rubik-VariableFont_wght.ttf"/>
+    <Resource Include="Fonts\Rubik-VariableFont_wght.ttf" />
+    <Resource Include="Resources\ByfronLogo.png" />
+    <Resource Include="Resources\ByfronLogoDark.png" />
   </ItemGroup>
 
   <ItemGroup>

Bloxstrap/Bootstrapper.cs

@@ -709,6 +709,8 @@ namespace Bloxstrap
             {
                 Dialog.CancelEnabled = true;
                 Dialog.ProgressStyle = ProgressBarStyle.Continuous;
+                // Byfron dialog specific
+                Dialog.VersionVisibility = false;
             }
 
             // compute total bytes to download

Bloxstrap/Dialogs/BootstrapperDialogForm.cs

@@ -63,6 +63,9 @@ namespace Bloxstrap.Dialogs
                     _cancelEnabled = value;
             }
         }
+
+        // Byfron specific - not required here, bypassing
+        public bool VersionVisibility { get; set; }
         #endregion
 
         public void ScaleWindow()

Bloxstrap/Dialogs/ByfronDialog.xaml

@@ -15,6 +15,7 @@
     <Border CornerRadius="10" BorderBrush="#33393B3D" BorderThickness="{Binding DialogBorder}">
         <Border CornerRadius="10" Background="{Binding Background}">
             <Grid>
+                <Image Margin="15" HorizontalAlignment="Left" VerticalAlignment="Top" Height="110" Source="{Binding ByfronLogo}"></Image>
                 <Button Margin="12" VerticalAlignment="Top" HorizontalAlignment="Right" Width="20" Height="20" BorderThickness="0" Padding="1" Background="Transparent" BorderBrush="Transparent" Visibility="{Binding CancelButtonVisibility, Mode=OneWay}" Command="{Binding CancelInstallCommand}">
                     <Path Fill="{Binding IconColor}" Stretch="Fill">
                         <Path.Data>
@@ -23,7 +24,7 @@
                     </Path>
                 </Button>
                 <Grid Margin="12,12,36,12" VerticalAlignment="Top" Height="20">
-                    <TextBlock VerticalAlignment="Center" TextAlignment="Left" Foreground="{Binding Foreground}" FontFamily="{StaticResource Rubik}" FontSize="12" Text="{Binding Version}" />
+                    <TextBlock VerticalAlignment="Center" TextAlignment="Right" Foreground="{Binding Foreground}" FontFamily="{StaticResource Rubik}" FontSize="12" Text="{Binding Version}" Visibility="{Binding VersionNumberVisibility, Mode=OneWay}"/>
                 </Grid>
                 <Path Fill="{Binding IconColor}" Width="300" Height="56" Stretch="Fill">
                     <Path.Data>

Bloxstrap/Dialogs/ByfronDialog.xaml.cs

@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Media;
-
+using System.Windows.Media.Imaging;
 using Bloxstrap.Enums;
 using Bloxstrap.Extensions;
 using Bloxstrap.ViewModels;
@@ -58,6 +58,16 @@ namespace Bloxstrap.Dialogs
                 _viewModel.OnPropertyChanged(nameof(_viewModel.CancelButtonVisibility));
             }
         }
+
+        public bool VersionVisibility
+        {
+            get => _viewModel.VersionNumberVisibility == Visibility.Collapsed;
+            set
+            {
+                _viewModel.VersionNumberVisibility = (value ? Visibility.Visible : Visibility.Collapsed);
+                _viewModel.OnPropertyChanged(nameof(_viewModel.VersionNumberVisibility));
+            }
+        }
         #endregion
 
         public ByfronDialog()
@@ -75,6 +85,7 @@ namespace Bloxstrap.Dialogs
                 _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.ByfronLogo = new BitmapImage(new Uri("pack://application:,,,/Bloxstrap;component/Resources/ByfronLogoDark.png"));
             }
 
             InitializeComponent();

Bloxstrap/Dialogs/FluentDialog.xaml.cs

@@ -63,6 +63,9 @@ namespace Bloxstrap.Dialogs
                 _viewModel.OnPropertyChanged(nameof(_viewModel.CancelButtonVisibility));
             }
         }
+
+        // Byfron specific - not required here, bypassing
+        public bool VersionVisibility { get; set; }
         #endregion
 
         public FluentDialog()

Bloxstrap/Dialogs/IBootstrapperDialog.cs

@@ -10,6 +10,7 @@ namespace Bloxstrap.Dialogs
         ProgressBarStyle ProgressStyle { get; set; }
         int ProgressValue { get; set; }
         bool CancelEnabled { get; set; }
+        bool VersionVisibility { get; set; }
 
         void ShowBootstrapper();
         void CloseBootstrapper();

Bloxstrap/ViewModels/AppearanceViewModel.cs

@@ -36,6 +36,8 @@ namespace Bloxstrap.ViewModels
                 dialog.Message = "Style preview - Click Cancel to close";
 
             dialog.CancelEnabled = true;
+            // Byfron dialog specific
+            dialog.VersionVisibility = false;
             dialog.ShowBootstrapper();
         }
 

Bloxstrap/ViewModels/ByfronDialogViewModel.cs

@@ -1,7 +1,10 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 using System.Windows;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 using Bloxstrap.Dialogs;
+using Bloxstrap.Extensions;
 
 namespace Bloxstrap.ViewModels
 {
@@ -15,6 +18,11 @@ namespace Bloxstrap.ViewModels
         public Brush Foreground { get; set; } = new SolidColorBrush(Color.FromRgb(239, 239, 239));
         public Brush IconColor { get; set; } = new SolidColorBrush(Color.FromRgb(255, 255, 255));
         public Brush ProgressBarBackground { get; set; } = new SolidColorBrush(Color.FromRgb(86, 86, 86));
+        public ImageSource ByfronLogo { get; set; } = new BitmapImage(new Uri("pack://application:,,,/Bloxstrap;component/Resources/ByfronLogo.png"));
+
+        // When cancel button is visible, version number is hidden.
+        public Visibility VersionNumberVisibility { get; set; } = Visibility.Collapsed;
+
         public ByfronDialogViewModel(IBootstrapperDialog dialog) : base(dialog)
         {
         }