diff --git a/Bloxstrap/App.xaml.cs b/Bloxstrap/App.xaml.cs index 0d25ce7..34a229c 100644 --- a/Bloxstrap/App.xaml.cs +++ b/Bloxstrap/App.xaml.cs @@ -13,11 +13,11 @@ using System.Windows.Threading; using Microsoft.Win32; -using Bloxstrap.Dialogs; using Bloxstrap.Extensions; using Bloxstrap.Models; using Bloxstrap.Singletons; -using Bloxstrap.Views; +using Bloxstrap.UI.BootstrapperDialogs; +using Bloxstrap.UI.Menu.Views; namespace Bloxstrap { diff --git a/Bloxstrap/Bootstrapper.cs b/Bloxstrap/Bootstrapper.cs index 0875010..75f27ae 100644 --- a/Bloxstrap/Bootstrapper.cs +++ b/Bloxstrap/Bootstrapper.cs @@ -12,11 +12,11 @@ using System.Windows; using Microsoft.Win32; -using Bloxstrap.Dialogs; using Bloxstrap.Enums; using Bloxstrap.Integrations; using Bloxstrap.Models; using Bloxstrap.Tools; +using Bloxstrap.UI.BootstrapperDialogs; namespace Bloxstrap { diff --git a/Bloxstrap/Extensions/BootstrapperStyleEx.cs b/Bloxstrap/Extensions/BootstrapperStyleEx.cs index f25c616..fa55578 100644 --- a/Bloxstrap/Extensions/BootstrapperStyleEx.cs +++ b/Bloxstrap/Extensions/BootstrapperStyleEx.cs @@ -1,5 +1,7 @@ -using Bloxstrap.Dialogs; -using Bloxstrap.Enums; +using Bloxstrap.Enums; +using Bloxstrap.UI.BootstrapperDialogs; +using Bloxstrap.UI.BootstrapperDialogs.WinForms; +using Bloxstrap.UI.BootstrapperDialogs.WPF.Views; namespace Bloxstrap.Extensions { diff --git a/Bloxstrap/Dialogs/IBootstrapperDialog.cs b/Bloxstrap/UI/BootstrapperDialogs/IBootstrapperDialog.cs similarity index 92% rename from Bloxstrap/Dialogs/IBootstrapperDialog.cs rename to Bloxstrap/UI/BootstrapperDialogs/IBootstrapperDialog.cs index e66b687..0531c1e 100644 --- a/Bloxstrap/Dialogs/IBootstrapperDialog.cs +++ b/Bloxstrap/UI/BootstrapperDialogs/IBootstrapperDialog.cs @@ -1,6 +1,6 @@ using System.Windows.Forms; -namespace Bloxstrap.Dialogs +namespace Bloxstrap.UI.BootstrapperDialogs { public interface IBootstrapperDialog { diff --git a/Bloxstrap/ViewModels/ByfronDialogViewModel.cs b/Bloxstrap/UI/BootstrapperDialogs/WPF/ViewModels/ByfronDialogViewModel.cs similarity index 92% rename from Bloxstrap/ViewModels/ByfronDialogViewModel.cs rename to Bloxstrap/UI/BootstrapperDialogs/WPF/ViewModels/ByfronDialogViewModel.cs index 6178606..36ed3b8 100644 --- a/Bloxstrap/ViewModels/ByfronDialogViewModel.cs +++ b/Bloxstrap/UI/BootstrapperDialogs/WPF/ViewModels/ByfronDialogViewModel.cs @@ -6,9 +6,7 @@ using System.Windows; using System.Windows.Media; using System.Windows.Media.Imaging; -using Bloxstrap.Dialogs; - -namespace Bloxstrap.ViewModels +namespace Bloxstrap.UI.BootstrapperDialogs.WPF.ViewModels { public class ByfronDialogViewModel : FluentDialogViewModel, INotifyPropertyChanged { @@ -21,9 +19,9 @@ namespace Bloxstrap.ViewModels public Brush ProgressBarBackground { get; set; } = new SolidColorBrush(Color.FromRgb(86, 86, 86)); public Visibility VersionTextVisibility => CancelButtonVisibility == Visibility.Collapsed ? Visibility.Visible : Visibility.Collapsed; - public string VersionText - { - get + public string VersionText + { + get { string playerLocation = Path.Combine(Directories.Versions, App.State.Prop.VersionGuid, "RobloxPlayerBeta.exe"); @@ -36,7 +34,7 @@ namespace Bloxstrap.ViewModels return ""; return versionInfo.ProductVersion.Replace(", ", "."); - } + } } public ByfronDialogViewModel(IBootstrapperDialog dialog) : base(dialog) diff --git a/Bloxstrap/ViewModels/FluentDialogViewModel.cs b/Bloxstrap/UI/BootstrapperDialogs/WPF/ViewModels/FluentDialogViewModel.cs similarity index 95% rename from Bloxstrap/ViewModels/FluentDialogViewModel.cs rename to Bloxstrap/UI/BootstrapperDialogs/WPF/ViewModels/FluentDialogViewModel.cs index 881c4d4..89c95c1 100644 --- a/Bloxstrap/ViewModels/FluentDialogViewModel.cs +++ b/Bloxstrap/UI/BootstrapperDialogs/WPF/ViewModels/FluentDialogViewModel.cs @@ -5,10 +5,9 @@ using System.Windows.Media; using CommunityToolkit.Mvvm.Input; -using Bloxstrap.Dialogs; using Bloxstrap.Extensions; -namespace Bloxstrap.ViewModels +namespace Bloxstrap.UI.BootstrapperDialogs.WPF.ViewModels { public class FluentDialogViewModel : INotifyPropertyChanged { diff --git a/Bloxstrap/Dialogs/ByfronDialog.xaml b/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/ByfronDialog.xaml similarity index 98% rename from Bloxstrap/Dialogs/ByfronDialog.xaml rename to Bloxstrap/UI/BootstrapperDialogs/WPF/Views/ByfronDialog.xaml index d2cda20..6f3d053 100644 --- a/Bloxstrap/Dialogs/ByfronDialog.xaml +++ b/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/ByfronDialog.xaml @@ -1,9 +1,8 @@ - /// Interaction logic for ByfronDialog.xaml diff --git a/Bloxstrap/Dialogs/FluentDialog.xaml b/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/FluentDialog.xaml similarity index 95% rename from Bloxstrap/Dialogs/FluentDialog.xaml rename to Bloxstrap/UI/BootstrapperDialogs/WPF/Views/FluentDialog.xaml index fad49b8..1d51f7a 100644 --- a/Bloxstrap/Dialogs/FluentDialog.xaml +++ b/Bloxstrap/UI/BootstrapperDialogs/WPF/Views/FluentDialog.xaml @@ -1,9 +1,8 @@ - /// Interaction logic for FluentDialog.xaml diff --git a/Bloxstrap/Dialogs/BootstrapperDialogForm.cs b/Bloxstrap/UI/BootstrapperDialogs/WinForms/DialogBase.cs similarity index 70% rename from Bloxstrap/Dialogs/BootstrapperDialogForm.cs rename to Bloxstrap/UI/BootstrapperDialogs/WinForms/DialogBase.cs index 64e5c5f..3bec0eb 100644 --- a/Bloxstrap/Dialogs/BootstrapperDialogForm.cs +++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/DialogBase.cs @@ -1,12 +1,11 @@ using System; using System.Windows; using System.Windows.Forms; - using Bloxstrap.Extensions; -namespace Bloxstrap.Dialogs +namespace Bloxstrap.UI.BootstrapperDialogs.WinForms { - public class BootstrapperDialogForm : Form, IBootstrapperDialog + public class DialogBase : Form, IBootstrapperDialog { public Bootstrapper? Bootstrapper { get; set; } @@ -16,16 +15,16 @@ namespace Bloxstrap.Dialogs protected virtual int _progressValue { get; set; } protected virtual bool _cancelEnabled { get; set; } - public string Message - { - get => _message; - set - { - if (this.InvokeRequired) - this.Invoke(() => _message = value); + public string Message + { + get => _message; + set + { + if (InvokeRequired) + Invoke(() => _message = value); else _message = value; - } + } } public ProgressBarStyle ProgressStyle @@ -33,8 +32,8 @@ namespace Bloxstrap.Dialogs get => _progressStyle; set { - if (this.InvokeRequired) - this.Invoke(() => _progressStyle = value); + if (InvokeRequired) + Invoke(() => _progressStyle = value); else _progressStyle = value; } @@ -45,8 +44,8 @@ namespace Bloxstrap.Dialogs get => _progressValue; set { - if (this.InvokeRequired) - this.Invoke(() => _progressValue = value); + if (InvokeRequired) + Invoke(() => _progressValue = value); else _progressValue = value; } @@ -57,8 +56,8 @@ namespace Bloxstrap.Dialogs get => _cancelEnabled; set { - if (this.InvokeRequired) - this.Invoke(() => _cancelEnabled = value); + if (InvokeRequired) + Invoke(() => _cancelEnabled = value); else _cancelEnabled = value; } @@ -67,9 +66,9 @@ namespace Bloxstrap.Dialogs public void ScaleWindow() { - this.Size = this.MinimumSize = this.MaximumSize = WindowScaling.GetScaledSize(this.Size); + Size = MinimumSize = MaximumSize = WindowScaling.GetScaledSize(Size); - foreach (Control control in this.Controls) + foreach (Control control in Controls) { control.Size = WindowScaling.GetScaledSize(control.Size); control.Location = WindowScaling.GetScaledPoint(control.Location); @@ -79,25 +78,25 @@ namespace Bloxstrap.Dialogs public void SetupDialog() { - this.Text = App.Settings.Prop.BootstrapperTitle; - this.Icon = App.Settings.Prop.BootstrapperIcon.GetIcon(); + Text = App.Settings.Prop.BootstrapperTitle; + Icon = App.Settings.Prop.BootstrapperIcon.GetIcon(); } public void ButtonCancel_Click(object? sender, EventArgs e) { Bootstrapper?.CancelInstall(); - this.Close(); + Close(); } #region IBootstrapperDialog Methods - public void ShowBootstrapper() => this.ShowDialog(); + public void ShowBootstrapper() => ShowDialog(); public virtual void CloseBootstrapper() { - if (this.InvokeRequired) - this.Invoke(CloseBootstrapper); + if (InvokeRequired) + Invoke(CloseBootstrapper); else - this.Close(); + Close(); } public virtual void ShowSuccess(string message) @@ -124,5 +123,5 @@ namespace Bloxstrap.Dialogs Environment.Exit(Bootstrapper.ERROR_INSTALL_USEREXIT); } #endregion - } + } } diff --git a/Bloxstrap/Dialogs/LegacyDialog2009.Designer.cs b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2009.Designer.cs similarity index 98% rename from Bloxstrap/Dialogs/LegacyDialog2009.Designer.cs rename to Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2009.Designer.cs index e6cf932..97ffbac 100644 --- a/Bloxstrap/Dialogs/LegacyDialog2009.Designer.cs +++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2009.Designer.cs @@ -1,6 +1,6 @@ using System.Windows.Forms; -namespace Bloxstrap.Dialogs +namespace Bloxstrap.UI.BootstrapperDialogs.WinForms { partial class LegacyDialog2009 { diff --git a/Bloxstrap/Dialogs/LegacyDialog2009.cs b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2009.cs similarity index 90% rename from Bloxstrap/Dialogs/LegacyDialog2009.cs rename to Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2009.cs index 684870b..93d9199 100644 --- a/Bloxstrap/Dialogs/LegacyDialog2009.cs +++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2009.cs @@ -1,12 +1,12 @@ using System; using System.Windows.Forms; -namespace Bloxstrap.Dialogs +namespace Bloxstrap.UI.BootstrapperDialogs.WinForms { // windows: https://youtu.be/VpduiruysuM?t=18 // mac: https://youtu.be/ncHhbcVDRgQ?t=63 - public partial class LegacyDialog2009 : BootstrapperDialogForm + public partial class LegacyDialog2009 : DialogBase { protected override string _message { diff --git a/Bloxstrap/Dialogs/LegacyDialog2009.resx b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2009.resx similarity index 100% rename from Bloxstrap/Dialogs/LegacyDialog2009.resx rename to Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2009.resx diff --git a/Bloxstrap/Dialogs/LegacyDialog2011.Designer.cs b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2011.Designer.cs similarity index 98% rename from Bloxstrap/Dialogs/LegacyDialog2011.Designer.cs rename to Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2011.Designer.cs index 3c00096..84be1a7 100644 --- a/Bloxstrap/Dialogs/LegacyDialog2011.Designer.cs +++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2011.Designer.cs @@ -1,6 +1,6 @@ using System.Windows.Forms; -namespace Bloxstrap.Dialogs +namespace Bloxstrap.UI.BootstrapperDialogs.WinForms { partial class LegacyDialog2011 { diff --git a/Bloxstrap/Dialogs/LegacyDialog2011.cs b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2011.cs similarity index 91% rename from Bloxstrap/Dialogs/LegacyDialog2011.cs rename to Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2011.cs index 54ada74..9d802ca 100644 --- a/Bloxstrap/Dialogs/LegacyDialog2011.cs +++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2011.cs @@ -3,11 +3,11 @@ using System.Windows.Forms; using Bloxstrap.Extensions; -namespace Bloxstrap.Dialogs +namespace Bloxstrap.UI.BootstrapperDialogs.WinForms { // https://youtu.be/3K9oCEMHj2s?t=35 - public partial class LegacyDialog2011 : BootstrapperDialogForm + public partial class LegacyDialog2011 : DialogBase { protected override string _message { diff --git a/Bloxstrap/Dialogs/LegacyDialog2011.resx b/Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2011.resx similarity index 100% rename from Bloxstrap/Dialogs/LegacyDialog2011.resx rename to Bloxstrap/UI/BootstrapperDialogs/WinForms/LegacyDialog2011.resx diff --git a/Bloxstrap/Dialogs/ProgressDialog.Designer.cs b/Bloxstrap/UI/BootstrapperDialogs/WinForms/ProgressDialog.Designer.cs similarity index 99% rename from Bloxstrap/Dialogs/ProgressDialog.Designer.cs rename to Bloxstrap/UI/BootstrapperDialogs/WinForms/ProgressDialog.Designer.cs index 21b36a7..e0ef54c 100644 --- a/Bloxstrap/Dialogs/ProgressDialog.Designer.cs +++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/ProgressDialog.Designer.cs @@ -1,6 +1,6 @@ using System.Windows.Forms; -namespace Bloxstrap.Dialogs +namespace Bloxstrap.UI.BootstrapperDialogs.WinForms { partial class ProgressDialog { diff --git a/Bloxstrap/Dialogs/ProgressDialog.cs b/Bloxstrap/UI/BootstrapperDialogs/WinForms/ProgressDialog.cs similarity index 95% rename from Bloxstrap/Dialogs/ProgressDialog.cs rename to Bloxstrap/UI/BootstrapperDialogs/WinForms/ProgressDialog.cs index da62dd1..5e845e5 100644 --- a/Bloxstrap/Dialogs/ProgressDialog.cs +++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/ProgressDialog.cs @@ -5,11 +5,11 @@ using System.Windows.Forms; using Bloxstrap.Enums; using Bloxstrap.Extensions; -namespace Bloxstrap.Dialogs +namespace Bloxstrap.UI.BootstrapperDialogs.WinForms { // basically just the modern dialog - public partial class ProgressDialog : BootstrapperDialogForm + public partial class ProgressDialog : DialogBase { protected override string _message { diff --git a/Bloxstrap/Dialogs/ProgressDialog.resx b/Bloxstrap/UI/BootstrapperDialogs/WinForms/ProgressDialog.resx similarity index 100% rename from Bloxstrap/Dialogs/ProgressDialog.resx rename to Bloxstrap/UI/BootstrapperDialogs/WinForms/ProgressDialog.resx diff --git a/Bloxstrap/Dialogs/VistaDialog.Designer.cs b/Bloxstrap/UI/BootstrapperDialogs/WinForms/VistaDialog.Designer.cs similarity index 96% rename from Bloxstrap/Dialogs/VistaDialog.Designer.cs rename to Bloxstrap/UI/BootstrapperDialogs/WinForms/VistaDialog.Designer.cs index ce7b3b7..a086bf8 100644 --- a/Bloxstrap/Dialogs/VistaDialog.Designer.cs +++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/VistaDialog.Designer.cs @@ -1,4 +1,4 @@ -namespace Bloxstrap.Dialogs +namespace Bloxstrap.UI.BootstrapperDialogs.WinForms { partial class VistaDialog { diff --git a/Bloxstrap/Dialogs/VistaDialog.cs b/Bloxstrap/UI/BootstrapperDialogs/WinForms/VistaDialog.cs similarity index 97% rename from Bloxstrap/Dialogs/VistaDialog.cs rename to Bloxstrap/UI/BootstrapperDialogs/WinForms/VistaDialog.cs index 738f954..d211101 100644 --- a/Bloxstrap/Dialogs/VistaDialog.cs +++ b/Bloxstrap/UI/BootstrapperDialogs/WinForms/VistaDialog.cs @@ -3,7 +3,7 @@ using System.Windows.Forms; using Bloxstrap.Extensions; -namespace Bloxstrap.Dialogs +namespace Bloxstrap.UI.BootstrapperDialogs.WinForms { // https://youtu.be/h0_AL95Sc3o?t=48 @@ -11,7 +11,7 @@ namespace Bloxstrap.Dialogs // since taskdialog is part of winforms, it can't really be properly used without a form // for example, cross-threaded calls to ui controls can't really be done outside of a form - public partial class VistaDialog : BootstrapperDialogForm + public partial class VistaDialog : DialogBase { private TaskDialogPage _dialogPage; diff --git a/Bloxstrap/Dialogs/VistaDialog.resx b/Bloxstrap/UI/BootstrapperDialogs/WinForms/VistaDialog.resx similarity index 100% rename from Bloxstrap/Dialogs/VistaDialog.resx rename to Bloxstrap/UI/BootstrapperDialogs/WinForms/VistaDialog.resx diff --git a/Bloxstrap/ViewModels/AboutViewModel.cs b/Bloxstrap/UI/Menu/ViewModels/AboutViewModel.cs similarity index 71% rename from Bloxstrap/ViewModels/AboutViewModel.cs rename to Bloxstrap/UI/Menu/ViewModels/AboutViewModel.cs index 7731db3..89566dc 100644 --- a/Bloxstrap/ViewModels/AboutViewModel.cs +++ b/Bloxstrap/UI/Menu/ViewModels/AboutViewModel.cs @@ -1,4 +1,4 @@ -namespace Bloxstrap.ViewModels +namespace Bloxstrap.UI.Menu.ViewModels { public class AboutViewModel { diff --git a/Bloxstrap/ViewModels/AppearanceViewModel.cs b/Bloxstrap/UI/Menu/ViewModels/AppearanceViewModel.cs similarity index 97% rename from Bloxstrap/ViewModels/AppearanceViewModel.cs rename to Bloxstrap/UI/Menu/ViewModels/AppearanceViewModel.cs index ba85815..3a5dc3d 100644 --- a/Bloxstrap/ViewModels/AppearanceViewModel.cs +++ b/Bloxstrap/UI/Menu/ViewModels/AppearanceViewModel.cs @@ -9,12 +9,12 @@ using System.Windows.Media; using CommunityToolkit.Mvvm.Input; -using Bloxstrap.Dialogs; using Bloxstrap.Enums; using Bloxstrap.Extensions; -using Bloxstrap.Views; +using Bloxstrap.UI.BootstrapperDialogs; +using Bloxstrap.UI.Menu.Views; -namespace Bloxstrap.ViewModels +namespace Bloxstrap.UI.Menu.ViewModels { public class AppearanceViewModel : INotifyPropertyChanged { @@ -127,7 +127,7 @@ namespace Bloxstrap.ViewModels { App.Settings.Prop.BootstrapperIcon = BootstrapperIcon.IconCustom; App.Settings.Prop.BootstrapperIconCustomLocation = value; - + OnPropertyChanged(nameof(Icon)); OnPropertyChanged(nameof(IconPreviewSource)); } diff --git a/Bloxstrap/ViewModels/BehaviourViewModel.cs b/Bloxstrap/UI/Menu/ViewModels/BehaviourViewModel.cs similarity index 93% rename from Bloxstrap/ViewModels/BehaviourViewModel.cs rename to Bloxstrap/UI/Menu/ViewModels/BehaviourViewModel.cs index 86bb853..518cafd 100644 --- a/Bloxstrap/ViewModels/BehaviourViewModel.cs +++ b/Bloxstrap/UI/Menu/ViewModels/BehaviourViewModel.cs @@ -1,4 +1,4 @@ -namespace Bloxstrap.ViewModels +namespace Bloxstrap.UI.Menu.ViewModels { public class BehaviourViewModel { diff --git a/Bloxstrap/ViewModels/FastFlagsViewModel.cs b/Bloxstrap/UI/Menu/ViewModels/FastFlagsViewModel.cs similarity index 97% rename from Bloxstrap/ViewModels/FastFlagsViewModel.cs rename to Bloxstrap/UI/Menu/ViewModels/FastFlagsViewModel.cs index a7b0b7f..b4a175f 100644 --- a/Bloxstrap/ViewModels/FastFlagsViewModel.cs +++ b/Bloxstrap/UI/Menu/ViewModels/FastFlagsViewModel.cs @@ -8,7 +8,7 @@ using CommunityToolkit.Mvvm.Input; using Bloxstrap.Singletons; using System.ComponentModel; -namespace Bloxstrap.ViewModels +namespace Bloxstrap.UI.Menu.ViewModels { public class FastFlagsViewModel : INotifyPropertyChanged { @@ -21,7 +21,7 @@ namespace Bloxstrap.ViewModels public int FramerateLimit { - get => Int32.TryParse(App.FastFlags.GetValue("DFIntTaskSchedulerTargetFps"), out int x) ? x : 60; + get => int.TryParse(App.FastFlags.GetValue("DFIntTaskSchedulerTargetFps"), out int x) ? x : 60; set => App.FastFlags.SetValue("DFIntTaskSchedulerTargetFps", value); } diff --git a/Bloxstrap/ViewModels/GlobalViewModel.cs b/Bloxstrap/UI/Menu/ViewModels/GlobalViewModel.cs similarity index 92% rename from Bloxstrap/ViewModels/GlobalViewModel.cs rename to Bloxstrap/UI/Menu/ViewModels/GlobalViewModel.cs index 14e11fc..0b292a5 100644 --- a/Bloxstrap/ViewModels/GlobalViewModel.cs +++ b/Bloxstrap/UI/Menu/ViewModels/GlobalViewModel.cs @@ -1,7 +1,7 @@ using System.Windows.Input; using CommunityToolkit.Mvvm.Input; -namespace Bloxstrap.ViewModels +namespace Bloxstrap.UI.Menu.ViewModels { public static class GlobalViewModel { diff --git a/Bloxstrap/ViewModels/InstallationViewModel.cs b/Bloxstrap/UI/Menu/ViewModels/InstallationViewModel.cs similarity index 97% rename from Bloxstrap/ViewModels/InstallationViewModel.cs rename to Bloxstrap/UI/Menu/ViewModels/InstallationViewModel.cs index d64607b..d3aa6a6 100644 --- a/Bloxstrap/ViewModels/InstallationViewModel.cs +++ b/Bloxstrap/UI/Menu/ViewModels/InstallationViewModel.cs @@ -13,7 +13,7 @@ using CommunityToolkit.Mvvm.Input; using Bloxstrap.Enums; using Bloxstrap.Models; -namespace Bloxstrap.ViewModels +namespace Bloxstrap.UI.Menu.ViewModels { public class InstallationViewModel : INotifyPropertyChanged { @@ -79,7 +79,7 @@ namespace Bloxstrap.ViewModels public string InstallLocation { - get => App.BaseDirectory; + get => App.BaseDirectory; set => App.BaseDirectory = value; } @@ -106,7 +106,7 @@ namespace Bloxstrap.ViewModels { // roblox typically sets channels in all lowercase, so here we find if a case insensitive match exists string? matchingChannel = Channels.Where(x => x.ToLower() == Channel.ToLower()).FirstOrDefault(); - Channel = String.IsNullOrEmpty(matchingChannel) ? RobloxDeployment.DefaultChannel : matchingChannel; + Channel = string.IsNullOrEmpty(matchingChannel) ? RobloxDeployment.DefaultChannel : matchingChannel; } OnPropertyChanged(nameof(Channel)); diff --git a/Bloxstrap/ViewModels/IntegrationsViewModel.cs b/Bloxstrap/UI/Menu/ViewModels/IntegrationsViewModel.cs similarity index 96% rename from Bloxstrap/ViewModels/IntegrationsViewModel.cs rename to Bloxstrap/UI/Menu/ViewModels/IntegrationsViewModel.cs index 1e1c04c..ba99065 100644 --- a/Bloxstrap/ViewModels/IntegrationsViewModel.cs +++ b/Bloxstrap/UI/Menu/ViewModels/IntegrationsViewModel.cs @@ -6,13 +6,13 @@ using CommunityToolkit.Mvvm.Input; using Bloxstrap.Models; -namespace Bloxstrap.ViewModels +namespace Bloxstrap.UI.Menu.ViewModels { public class IntegrationsViewModel : INotifyPropertyChanged { public event PropertyChangedEventHandler? PropertyChanged; public void OnPropertyChanged(string propertyName) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); - + public ICommand AddIntegrationCommand => new RelayCommand(AddIntegration); public ICommand DeleteIntegrationCommand => new RelayCommand(DeleteIntegration); @@ -24,7 +24,7 @@ namespace Bloxstrap.ViewModels }); SelectedCustomIntegrationIndex = CustomIntegrations.Count - 1; - + OnPropertyChanged(nameof(SelectedCustomIntegrationIndex)); OnPropertyChanged(nameof(IsCustomIntegrationSelected)); } @@ -74,7 +74,7 @@ namespace Bloxstrap.ViewModels public ObservableCollection CustomIntegrations { - get => App.Settings.Prop.CustomIntegrations; + get => App.Settings.Prop.CustomIntegrations; set => App.Settings.Prop.CustomIntegrations = value; } diff --git a/Bloxstrap/ViewModels/MainWindowViewModel.cs b/Bloxstrap/UI/Menu/ViewModels/MainWindowViewModel.cs similarity index 95% rename from Bloxstrap/ViewModels/MainWindowViewModel.cs rename to Bloxstrap/UI/Menu/ViewModels/MainWindowViewModel.cs index cc29b5f..d4f398b 100644 --- a/Bloxstrap/ViewModels/MainWindowViewModel.cs +++ b/Bloxstrap/UI/Menu/ViewModels/MainWindowViewModel.cs @@ -10,7 +10,7 @@ using CommunityToolkit.Mvvm.Input; using Wpf.Ui.Controls.Interfaces; using Wpf.Ui.Mvvm.Contracts; -namespace Bloxstrap.ViewModels +namespace Bloxstrap.UI.Menu.ViewModels { public class MainWindowViewModel { @@ -33,7 +33,7 @@ namespace Bloxstrap.ViewModels private void ConfirmSettings() { - if (String.IsNullOrEmpty(App.BaseDirectory)) + if (string.IsNullOrEmpty(App.BaseDirectory)) { App.ShowMessageBox("You must set an install location", MessageBoxImage.Error); return; @@ -89,7 +89,7 @@ namespace Bloxstrap.ViewModels }; dialogControl.ShowAndWaitAsync( - "What to know before you install", + "What to know before you install", "After installation, you can open this menu again by searching for it in the Start menu.\n" + "If you want to revert back to the original Roblox launcher, just uninstall Bloxstrap and it will automatically revert." ); diff --git a/Bloxstrap/ViewModels/ModsViewModel.cs b/Bloxstrap/UI/Menu/ViewModels/ModsViewModel.cs similarity index 97% rename from Bloxstrap/ViewModels/ModsViewModel.cs rename to Bloxstrap/UI/Menu/ViewModels/ModsViewModel.cs index 4452c1e..9be1101 100644 --- a/Bloxstrap/ViewModels/ModsViewModel.cs +++ b/Bloxstrap/UI/Menu/ViewModels/ModsViewModel.cs @@ -4,7 +4,7 @@ using System.Windows.Input; using CommunityToolkit.Mvvm.Input; -namespace Bloxstrap.ViewModels +namespace Bloxstrap.UI.Menu.ViewModels { public class ModsViewModel { diff --git a/Bloxstrap/Views/MainWindow.xaml b/Bloxstrap/UI/Menu/Views/MainWindow.xaml similarity index 96% rename from Bloxstrap/Views/MainWindow.xaml rename to Bloxstrap/UI/Menu/Views/MainWindow.xaml index 05e841a..a8a20ce 100644 --- a/Bloxstrap/Views/MainWindow.xaml +++ b/Bloxstrap/UI/Menu/Views/MainWindow.xaml @@ -1,11 +1,10 @@ - /// Interaction logic for MainWindow.xaml diff --git a/Bloxstrap/Views/Pages/AboutPage.xaml b/Bloxstrap/UI/Menu/Views/Pages/AboutPage.xaml similarity index 99% rename from Bloxstrap/Views/Pages/AboutPage.xaml rename to Bloxstrap/UI/Menu/Views/Pages/AboutPage.xaml index ef622f1..06146c9 100644 --- a/Bloxstrap/Views/Pages/AboutPage.xaml +++ b/Bloxstrap/UI/Menu/Views/Pages/AboutPage.xaml @@ -1,9 +1,9 @@ - /// Interaction logic for AboutPage.xaml diff --git a/Bloxstrap/Views/Pages/AppearancePage.xaml b/Bloxstrap/UI/Menu/Views/Pages/AppearancePage.xaml similarity index 97% rename from Bloxstrap/Views/Pages/AppearancePage.xaml rename to Bloxstrap/UI/Menu/Views/Pages/AppearancePage.xaml index a2cb776..211d320 100644 --- a/Bloxstrap/Views/Pages/AppearancePage.xaml +++ b/Bloxstrap/UI/Menu/Views/Pages/AppearancePage.xaml @@ -1,9 +1,9 @@ - + /// Interaction logic for AppearancePage.xaml + /// + public partial class AppearancePage + { + public AppearancePage() + { + DataContext = new AppearanceViewModel(this); + InitializeComponent(); + } + } +} diff --git a/Bloxstrap/Views/Pages/BehaviourPage.xaml b/Bloxstrap/UI/Menu/Views/Pages/BehaviourPage.xaml similarity index 95% rename from Bloxstrap/Views/Pages/BehaviourPage.xaml rename to Bloxstrap/UI/Menu/Views/Pages/BehaviourPage.xaml index daaa9fe..76d73a0 100644 --- a/Bloxstrap/Views/Pages/BehaviourPage.xaml +++ b/Bloxstrap/UI/Menu/Views/Pages/BehaviourPage.xaml @@ -1,9 +1,8 @@ - /// Interaction logic for BehaviourPage.xaml diff --git a/Bloxstrap/Views/Pages/FastFlagsPage.xaml b/Bloxstrap/UI/Menu/Views/Pages/FastFlagsPage.xaml similarity index 98% rename from Bloxstrap/Views/Pages/FastFlagsPage.xaml rename to Bloxstrap/UI/Menu/Views/Pages/FastFlagsPage.xaml index 930d83d..d10c6b3 100644 --- a/Bloxstrap/Views/Pages/FastFlagsPage.xaml +++ b/Bloxstrap/UI/Menu/Views/Pages/FastFlagsPage.xaml @@ -1,10 +1,9 @@ - /// Interaction logic for FastFlagsPage.xaml diff --git a/Bloxstrap/Views/Pages/InstallationPage.xaml b/Bloxstrap/UI/Menu/Views/Pages/InstallationPage.xaml similarity index 98% rename from Bloxstrap/Views/Pages/InstallationPage.xaml rename to Bloxstrap/UI/Menu/Views/Pages/InstallationPage.xaml index 007f021..464f46d 100644 --- a/Bloxstrap/Views/Pages/InstallationPage.xaml +++ b/Bloxstrap/UI/Menu/Views/Pages/InstallationPage.xaml @@ -1,9 +1,9 @@ - /// Interaction logic for InstallationPage.xaml diff --git a/Bloxstrap/Views/Pages/IntegrationsPage.xaml b/Bloxstrap/UI/Menu/Views/Pages/IntegrationsPage.xaml similarity index 98% rename from Bloxstrap/Views/Pages/IntegrationsPage.xaml rename to Bloxstrap/UI/Menu/Views/Pages/IntegrationsPage.xaml index b1cc07d..0a88e82 100644 --- a/Bloxstrap/Views/Pages/IntegrationsPage.xaml +++ b/Bloxstrap/UI/Menu/Views/Pages/IntegrationsPage.xaml @@ -1,10 +1,9 @@ - /// Interaction logic for IntegrationsPage.xaml diff --git a/Bloxstrap/Views/Pages/ModsPage.xaml b/Bloxstrap/UI/Menu/Views/Pages/ModsPage.xaml similarity index 98% rename from Bloxstrap/Views/Pages/ModsPage.xaml rename to Bloxstrap/UI/Menu/Views/Pages/ModsPage.xaml index 4fc81ac..1f1b805 100644 --- a/Bloxstrap/Views/Pages/ModsPage.xaml +++ b/Bloxstrap/UI/Menu/Views/Pages/ModsPage.xaml @@ -1,9 +1,9 @@ - /// Interaction logic for ModsPage.xaml diff --git a/Bloxstrap/Updater.cs b/Bloxstrap/Updater.cs index 0bb4314..5a7e979 100644 --- a/Bloxstrap/Updater.cs +++ b/Bloxstrap/Updater.cs @@ -2,12 +2,10 @@ using System.Diagnostics; using System.IO; using System.Windows; -using System.Windows.Forms; using System.Threading; using System.Threading.Tasks; -using Bloxstrap.Properties; -using Bloxstrap.Views; +using Bloxstrap.UI.Menu.Views; namespace Bloxstrap { diff --git a/Bloxstrap/Views/Pages/AppearancePage.xaml.cs b/Bloxstrap/Views/Pages/AppearancePage.xaml.cs deleted file mode 100644 index 42760cd..0000000 --- a/Bloxstrap/Views/Pages/AppearancePage.xaml.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Bloxstrap.ViewModels; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace Bloxstrap.Views.Pages -{ - /// - /// Interaction logic for AppearancePage.xaml - /// - public partial class AppearancePage - { - public AppearancePage() - { - DataContext = new AppearanceViewModel(this); - InitializeComponent(); - } - } -}