diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj index 16faf36..05de60f 100644 --- a/Bloxstrap/Bloxstrap.csproj +++ b/Bloxstrap/Bloxstrap.csproj @@ -14,8 +14,6 @@ - - diff --git a/Bloxstrap/Dialogs/HyperionDialog.xaml b/Bloxstrap/Dialogs/HyperionDialog.xaml index 41b86c1..f0677e1 100644 --- a/Bloxstrap/Dialogs/HyperionDialog.xaml +++ b/Bloxstrap/Dialogs/HyperionDialog.xaml @@ -12,25 +12,33 @@ WindowStartupLocation="CenterScreen" AllowsTransparency="True" Background="Transparent"> - - - - - - - + + + + + + + + + + + + - - + + + \ No newline at end of file diff --git a/Bloxstrap/Dialogs/HyperionDialog.xaml.cs b/Bloxstrap/Dialogs/HyperionDialog.xaml.cs index a8514fc..feee352 100644 --- a/Bloxstrap/Dialogs/HyperionDialog.xaml.cs +++ b/Bloxstrap/Dialogs/HyperionDialog.xaml.cs @@ -1,6 +1,7 @@ using System; using System.Windows; using System.Windows.Forms; +using System.Windows.Media; using Bloxstrap.Enums; using Bloxstrap.Extensions; @@ -62,7 +63,17 @@ namespace Bloxstrap.Dialogs public HyperionDialog() { _viewModel = new HyperionDialogViewModel(this); + if (App.Settings.Prop.Theme.GetFinal() == Theme.Light) + { + // Matching the roblox website light theme as close as possible. + _viewModel.DialogBorder = new Thickness(1); + _viewModel.Background = new SolidColorBrush(Color.FromRgb(242, 244, 245)); + _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)); + } DataContext = _viewModel; + InitializeComponent(); } diff --git a/Bloxstrap/Resources/CancelButtonSmall.png b/Bloxstrap/Resources/CancelButtonSmall.png deleted file mode 100644 index 77e6a39..0000000 Binary files a/Bloxstrap/Resources/CancelButtonSmall.png and /dev/null differ diff --git a/Bloxstrap/Resources/WordmarkRoblox.png b/Bloxstrap/Resources/WordmarkRoblox.png deleted file mode 100644 index b7a23c8..0000000 Binary files a/Bloxstrap/Resources/WordmarkRoblox.png and /dev/null differ diff --git a/Bloxstrap/ViewModels/HyperionDialogViewModel.cs b/Bloxstrap/ViewModels/HyperionDialogViewModel.cs index c8415f2..d052fe5 100644 --- a/Bloxstrap/ViewModels/HyperionDialogViewModel.cs +++ b/Bloxstrap/ViewModels/HyperionDialogViewModel.cs @@ -1,4 +1,6 @@ using System.ComponentModel; +using System.Windows; +using System.Windows.Media; using Bloxstrap.Dialogs; namespace Bloxstrap.ViewModels @@ -6,7 +8,12 @@ namespace Bloxstrap.ViewModels public class HyperionDialogViewModel : FluentDialogViewModel, INotifyPropertyChanged { public string Version => $"Bloxstrap v{App.Version}"; - + // Using dark theme for default values. + public Thickness DialogBorder { get; set; } = new Thickness(0); + public Brush Background { get; set; } = Brushes.Black; + public Brush Foreground { get; set; } = new SolidColorBrush(Color.FromRgb(216, 216, 216)); + 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 HyperionDialogViewModel(IBootstrapperDialog dialog) : base(dialog) { }