SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 10:01:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Byfron logo

Browse Source
This commit is contained in:
1011025m 2023-05-13 11:57:16 +08:00
parent 7e82dc4436
commit 74d15c9bf3
12 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Bloxstrap/Bloxstrap.csproj
View File

@ -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>

2
Bloxstrap/Bootstrapper.cs
View File

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

3
Bloxstrap/Dialogs/BootstrapperDialogForm.cs
View File

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

3
Bloxstrap/Dialogs/ByfronDialog.xaml
View File

@ -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>

13
Bloxstrap/Dialogs/ByfronDialog.xaml.cs
View File

@ -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();

3
Bloxstrap/Dialogs/FluentDialog.xaml.cs
View File

@ -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()

1
Bloxstrap/Dialogs/IBootstrapperDialog.cs
View File

@ -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();

BIN
Bloxstrap/Resources/ByfronLogo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
Bloxstrap/Resources/ByfronLogoDark.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

2
Bloxstrap/ViewModels/AppearanceViewModel.cs
View File

@ -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();
}

10
Bloxstrap/ViewModels/ByfronDialogViewModel.cs
View File

@ -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)
{
}