Fix UI namespaces

pizzaboxer · Jul 22, 2023 · 049b340 · 049b340
1 parent 6125592
commit 049b340
Show file tree

Hide file tree

Showing 25 changed files with 29 additions and 29 deletions.
diff --git a/Bloxstrap/UI/Controls.cs b/Bloxstrap/UI/Controls.cs
@@ -1,8 +1,8 @@
 using System.Windows;
 
 using Bloxstrap.UI.Elements.Bootstrapper;
-using Bloxstrap.UI.Menu;
-using Bloxstrap.UI.MessageBox;
+using Bloxstrap.UI.Elements.Dialogs;
+using Bloxstrap.UI.Elements.Menu;
 
 namespace Bloxstrap.UI
 {

diff --git a/Bloxstrap/UI/Elements/ExceptionDialog.xaml → .../UI/Elements/Dialogs/ExceptionDialog.xaml b/Bloxstrap/UI/Elements/ExceptionDialog.xaml → .../UI/Elements/Dialogs/ExceptionDialog.xaml
@@ -1,10 +1,10 @@
-<ui:UiWindow x:Class="Bloxstrap.UI.ExceptionDialog"
+<ui:UiWindow x:Class="Bloxstrap.UI.Elements.Dialogs.ExceptionDialog"
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
  xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- xmlns:local="clr-namespace:Bloxstrap.UI.MessageBox"
+ xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Dialogs"
  mc:Ignorable="d"
  Width="480"
  MinHeight="0"

diff --git a/...strap/UI/Elements/ExceptionDialog.xaml.cs → .../Elements/Dialogs/ExceptionDialog.xaml.cs b/...strap/UI/Elements/ExceptionDialog.xaml.cs → .../Elements/Dialogs/ExceptionDialog.xaml.cs
@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Interop;
 
-namespace Bloxstrap.UI
+namespace Bloxstrap.UI.Elements.Dialogs
 {
  // hmm... do i use MVVM for this?
  // this is entirely static, so i think im fine without it, and this way is just so much more efficient

diff --git a/Bloxstrap/UI/Elements/FluentMessageBox.xaml → ...UI/Elements/Dialogs/FluentMessageBox.xaml b/Bloxstrap/UI/Elements/FluentMessageBox.xaml → ...UI/Elements/Dialogs/FluentMessageBox.xaml
@@ -1,10 +1,10 @@
-<ui:UiWindow x:Class="Bloxstrap.UI.MessageBox.FluentMessageBox"
+<ui:UiWindow x:Class="Bloxstrap.UI.Elements.Dialogs.FluentMessageBox"
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
  xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- xmlns:local="clr-namespace:Bloxstrap.UI.MessageBox"
+ xmlns:local="clr-namespace:Bloxstrap.UI.Elements.Dialogs"
  mc:Ignorable="d"
  Title="Bloxstrap"
  d:DesignWidth="480"

diff --git a/...trap/UI/Elements/FluentMessageBox.xaml.cs → ...Elements/Dialogs/FluentMessageBox.xaml.cs b/...trap/UI/Elements/FluentMessageBox.xaml.cs → ...Elements/Dialogs/FluentMessageBox.xaml.cs
@@ -6,7 +6,7 @@
 
 using Bloxstrap.UI.Utility;
 
-namespace Bloxstrap.UI.MessageBox
+namespace Bloxstrap.UI.Elements.Dialogs
 {
  // wpfui does have its own messagebox control but it SUCKS so heres this instead
 

diff --git a/Bloxstrap/UI/Elements/Menu/MainWindow.xaml b/Bloxstrap/UI/Elements/Menu/MainWindow.xaml
@@ -1,10 +1,10 @@
-<ui:UiWindow x:Class="Bloxstrap.UI.Menu.MainWindow"
+<ui:UiWindow x:Class="Bloxstrap.UI.Elements.Menu.MainWindow"
  x:Name="ConfigurationWindow"
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:pages="clr-namespace:Bloxstrap.UI.Menu.Pages"
+ xmlns:pages="clr-namespace:Bloxstrap.UI.Elements.Menu.Pages"
  xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
  mc:Ignorable="d"
  Title="Bloxstrap Menu"

diff --git a/Bloxstrap/UI/Elements/Menu/MainWindow.xaml.cs b/Bloxstrap/UI/Elements/Menu/MainWindow.xaml.cs
@@ -7,7 +7,7 @@
 
 using Bloxstrap.UI.ViewModels.Menu;
 
-namespace Bloxstrap.UI.Menu
+namespace Bloxstrap.UI.Elements.Menu
 {
  /// <summary>
  /// Interaction logic for MainWindow.xaml

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/AboutPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/AboutPage.xaml
@@ -1,4 +1,4 @@
-<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.AboutPage"
+<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.AboutPage"
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/AboutPage.xaml.cs b/Bloxstrap/UI/Elements/Menu/Pages/AboutPage.xaml.cs
@@ -1,6 +1,6 @@
 using Bloxstrap.UI.ViewModels.Menu;
 
-namespace Bloxstrap.UI.Menu.Pages
+namespace Bloxstrap.UI.Elements.Menu.Pages
 {
  /// <summary>
  /// Interaction logic for AboutPage.xaml

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/AppearancePage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/AppearancePage.xaml
@@ -1,4 +1,4 @@
-<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.AppearancePage"
+<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.AppearancePage"
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/AppearancePage.xaml.cs b/Bloxstrap/UI/Elements/Menu/Pages/AppearancePage.xaml.cs
@@ -1,6 +1,6 @@
 using Bloxstrap.UI.ViewModels.Menu;
 
-namespace Bloxstrap.UI.Menu.Pages
+namespace Bloxstrap.UI.Elements.Menu.Pages
 {
  /// <summary>
  /// Interaction logic for AppearancePage.xaml

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml
@@ -1,4 +1,4 @@
-<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.BehaviourPage"
+<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.BehaviourPage"
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml.cs b/Bloxstrap/UI/Elements/Menu/Pages/BehaviourPage.xaml.cs
@@ -1,6 +1,6 @@
 using Bloxstrap.UI.ViewModels.Menu;
 
-namespace Bloxstrap.UI.Menu.Pages
+namespace Bloxstrap.UI.Elements.Menu.Pages
 {
  /// <summary>
  /// Interaction logic for BehaviourPage.xaml

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml
@@ -1,4 +1,4 @@
-<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.FastFlagsPage"
+<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.FastFlagsPage"
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml.cs b/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml.cs
@@ -2,7 +2,7 @@
 
 using Bloxstrap.UI.ViewModels.Menu;
 
-namespace Bloxstrap.UI.Menu.Pages
+namespace Bloxstrap.UI.Elements.Menu.Pages
 {
  /// <summary>
  /// Interaction logic for FastFlagsPage.xaml

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/InstallationPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/InstallationPage.xaml
@@ -1,4 +1,4 @@
-<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.InstallationPage"
+<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.InstallationPage"
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/InstallationPage.xaml.cs b/Bloxstrap/UI/Elements/Menu/Pages/InstallationPage.xaml.cs
@@ -1,6 +1,6 @@
 using Bloxstrap.UI.ViewModels.Menu;
 
-namespace Bloxstrap.UI.Menu.Pages
+namespace Bloxstrap.UI.Elements.Menu.Pages
 {
  /// <summary>
  /// Interaction logic for InstallationPage.xaml

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/IntegrationsPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/IntegrationsPage.xaml
@@ -1,4 +1,4 @@
-<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.IntegrationsPage"
+<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.IntegrationsPage"
  x:Name="IntegrationsPageView"
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/IntegrationsPage.xaml.cs b/Bloxstrap/UI/Elements/Menu/Pages/IntegrationsPage.xaml.cs
@@ -2,7 +2,7 @@
 
 using Bloxstrap.UI.ViewModels.Menu;
 
-namespace Bloxstrap.UI.Menu.Pages
+namespace Bloxstrap.UI.Elements.Menu.Pages
 {
  /// <summary>
  /// Interaction logic for IntegrationsPage.xaml

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml
@@ -1,4 +1,4 @@
-<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.ModsPage"
+<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.ModsPage"
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml.cs b/Bloxstrap/UI/Elements/Menu/Pages/ModsPage.xaml.cs
@@ -2,7 +2,7 @@
 
 using Bloxstrap.UI.ViewModels.Menu;
 
-namespace Bloxstrap.UI.Menu.Pages
+namespace Bloxstrap.UI.Elements.Menu.Pages
 {
  /// <summary>
  /// Interaction logic for ModsPage.xaml

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/PreInstallPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/PreInstallPage.xaml
@@ -1,4 +1,4 @@
-<ui:UiPage x:Class="Bloxstrap.UI.Menu.Pages.PreInstallPage"
+<ui:UiPage x:Class="Bloxstrap.UI.Elements.Menu.Pages.PreInstallPage"
  x:Name="PreInstallPageView"
  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

diff --git a/Bloxstrap/UI/Elements/Menu/Pages/PreInstallPage.xaml.cs b/Bloxstrap/UI/Elements/Menu/Pages/PreInstallPage.xaml.cs
@@ -1,4 +1,4 @@
-namespace Bloxstrap.UI.Menu.Pages
+namespace Bloxstrap.UI.Elements.Menu.Pages
 {
  /// <summary>
  /// Interaction logic for PreInstallPage.xaml

diff --git a/Bloxstrap/UI/ViewModels/Menu/AppearanceViewModel.cs b/Bloxstrap/UI/ViewModels/Menu/AppearanceViewModel.cs
@@ -7,7 +7,7 @@
 
 using Microsoft.Win32;
 
-using Bloxstrap.UI.Menu;
+using Bloxstrap.UI.Elements.Menu;
 
 namespace Bloxstrap.UI.ViewModels.Menu
 {

diff --git a/Bloxstrap/UI/ViewModels/Menu/MainWindowViewModel.cs b/Bloxstrap/UI/ViewModels/Menu/MainWindowViewModel.cs
@@ -7,7 +7,7 @@
 
 using Wpf.Ui.Mvvm.Contracts;
 
-using Bloxstrap.UI.Menu.Pages;
+using Bloxstrap.UI.Elements.Menu.Pages;
 
 namespace Bloxstrap.UI.ViewModels.Menu
 {