Reorganized namespaces

RolandKoenig · Dec 31, 2023 · 3f13d3a · 3f13d3a
1 parent 8aadaf3
commit 3f13d3a
Show file tree

Hide file tree

Showing 21 changed files with 32 additions and 32 deletions.
diff --git a/src/RolandK.AvaloniaExtensions.TestApp/MainWindow.axaml.cs b/src/RolandK.AvaloniaExtensions.TestApp/MainWindow.axaml.cs
@@ -1,4 +1,4 @@
-using RolandK.AvaloniaExtensions.Mvvm.Markup;
+using RolandK.AvaloniaExtensions.Mvvm.Controls;
 
 namespace RolandK.AvaloniaExtensions.TestApp;
 

diff --git a/src/RolandK.AvaloniaExtensions.Tests/Mvvm/MvvmUserControlTests.cs b/src/RolandK.AvaloniaExtensions.Tests/Mvvm/MvvmUserControlTests.cs
@@ -1,9 +1,9 @@
 using Avalonia.Controls;
 using CommunityToolkit.Mvvm.ComponentModel;
 using RolandK.AvaloniaExtensions.Mvvm;
-using RolandK.AvaloniaExtensions.Mvvm.Markup;
+using RolandK.AvaloniaExtensions.Mvvm.Controls;
 using RolandK.AvaloniaExtensions.Tests.Util;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 using RolandK.AvaloniaExtensions.ViewServices;
 using RolandK.AvaloniaExtensions.ViewServices.Base;
 

diff --git a/src/RolandK.AvaloniaExtensions.Tests/Mvvm/MvvmWindowTests.cs b/src/RolandK.AvaloniaExtensions.Tests/Mvvm/MvvmWindowTests.cs
@@ -1,9 +1,9 @@
 using Avalonia.Controls;
 using CommunityToolkit.Mvvm.ComponentModel;
 using RolandK.AvaloniaExtensions.Mvvm;
-using RolandK.AvaloniaExtensions.Mvvm.Markup;
+using RolandK.AvaloniaExtensions.Mvvm.Controls;
 using RolandK.AvaloniaExtensions.Tests.Util;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 using RolandK.AvaloniaExtensions.ViewServices;
 using RolandK.AvaloniaExtensions.ViewServices.Base;
 

diff --git a/src/RolandK.AvaloniaExtensions.Tests/ViewServices/DefaultViewServicesTests.cs b/src/RolandK.AvaloniaExtensions.Tests/ViewServices/DefaultViewServicesTests.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
-using RolandK.AvaloniaExtensions.Mvvm.Markup;
+using RolandK.AvaloniaExtensions.Mvvm.Controls;
 using RolandK.AvaloniaExtensions.Tests.Util;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 using RolandK.AvaloniaExtensions.ViewServices;
 
 namespace RolandK.AvaloniaExtensions.Tests.ViewServices;

diff --git a/src/RolandK.AvaloniaExtensions.Tests/ViewServices/ViewServiceHostUserControlTests.cs b/src/RolandK.AvaloniaExtensions.Tests/ViewServices/ViewServiceHostUserControlTests.cs
@@ -1,4 +1,4 @@
-using RolandK.AvaloniaExtensions.Mvvm.Markup;
+using RolandK.AvaloniaExtensions.Mvvm.Controls;
 using RolandK.AvaloniaExtensions.Tests.Util;
 using RolandK.AvaloniaExtensions.ViewServices;
 using RolandK.AvaloniaExtensions.ViewServices.Base;

diff --git a/src/RolandK.AvaloniaExtensions.Tests/Views/DialogBoxControlTests.cs b/src/RolandK.AvaloniaExtensions.Tests/Views/DialogBoxControlTests.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.LogicalTree;
 using RolandK.AvaloniaExtensions.Tests.Util;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 
 namespace RolandK.AvaloniaExtensions.Tests.Views;
 

diff --git a/src/RolandK.AvaloniaExtensions.Tests/Views/DialogHostControlTests.cs b/src/RolandK.AvaloniaExtensions.Tests/Views/DialogHostControlTests.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.LogicalTree;
 using RolandK.AvaloniaExtensions.Tests.Util;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 
 namespace RolandK.AvaloniaExtensions.Tests.Views;
 

diff --git a/src/RolandK.AvaloniaExtensions.Tests/Views/MainWindowFrameTests.cs b/src/RolandK.AvaloniaExtensions.Tests/Views/MainWindowFrameTests.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.LogicalTree;
 using RolandK.AvaloniaExtensions.Tests.Util;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 
 namespace RolandK.AvaloniaExtensions.Tests.Views;
 

diff --git a/src/RolandK.AvaloniaExtensions/Attributes.cs b/src/RolandK.AvaloniaExtensions/Attributes.cs
@@ -3,9 +3,9 @@
 
 [assembly: XmlnsDefinition(
     "https://github.com/RolandK.AvaloniaExtensions", 
-    "RolandK.AvaloniaExtensions.Views")]
+    "RolandK.AvaloniaExtensions.Controls")]
 [assembly: XmlnsDefinition(
     "https://github.com/RolandK.AvaloniaExtensions", 
-    "RolandK.AvaloniaExtensions.Mvvm.Markup")]
+    "RolandK.AvaloniaExtensions.Mvvm.Controls")]
 
 [assembly: InternalsVisibleTo("RolandK.AvaloniaExtensions.Tests")]    
diff --git a/...iaExtensions/Views/DialogBoxControl.axaml → ...xtensions/Controls/DialogBoxControl.axaml b/...iaExtensions/Views/DialogBoxControl.axaml → ...xtensions/Controls/DialogBoxControl.axaml
@@ -3,7 +3,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="RolandK.AvaloniaExtensions.Views.DialogBoxControl">
+             x:Class="RolandK.AvaloniaExtensions.Controls.DialogBoxControl">
     <Border BorderThickness="1"
             BorderBrush="{DynamicResource DialogBoxControlBorderBrush}">
         <DockPanel LastChildFill="True">

diff --git a/...xtensions/Views/DialogBoxControl.axaml.cs → ...nsions/Controls/DialogBoxControl.axaml.cs b/...xtensions/Views/DialogBoxControl.axaml.cs → ...nsions/Controls/DialogBoxControl.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace RolandK.AvaloniaExtensions.Views;
+namespace RolandK.AvaloniaExtensions.Controls;
 
 public partial class DialogBoxControl : UserControl
 {
@@ -14,7 +14,7 @@ public string Header
         set => _txtHeader.Text = value;
     }
 
-    public Controls ContentArea
+    public Avalonia.Controls.Controls ContentArea
     {
         get => _gridContent.Children;
     }

diff --git a/...oniaExtensions/Views/DialogHostControl.cs → ...aExtensions/Controls/DialogHostControl.cs b/...oniaExtensions/Views/DialogHostControl.cs → ...aExtensions/Controls/DialogHostControl.cs
@@ -4,7 +4,7 @@
 using Avalonia.Layout;
 using Avalonia.Media;
 
-namespace RolandK.AvaloniaExtensions.Views;
+namespace RolandK.AvaloniaExtensions.Controls;
 
 public class DialogHostControl : Grid
 {

diff --git a/...niaExtensions/Views/MainWindowFrame.axaml → ...Extensions/Controls/MainWindowFrame.axaml b/...niaExtensions/Views/MainWindowFrame.axaml → ...Extensions/Controls/MainWindowFrame.axaml
@@ -2,9 +2,9 @@
              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:local="clr-namespace:RolandK.AvaloniaExtensions.Views"
+             xmlns:local="clr-namespace:RolandK.AvaloniaExtensions.Controls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="RolandK.AvaloniaExtensions.Views.MainWindowFrame">
+             x:Class="RolandK.AvaloniaExtensions.Controls.MainWindowFrame">
     <Grid x:Name="CtrlFullWindowGrid">
         <Grid.RowDefinitions>
             <RowDefinition Height="30" />

diff --git a/...Extensions/Views/MainWindowFrame.axaml.cs → ...ensions/Controls/MainWindowFrame.axaml.cs b/...Extensions/Views/MainWindowFrame.axaml.cs → ...ensions/Controls/MainWindowFrame.axaml.cs
@@ -7,7 +7,7 @@
 using Avalonia.Media;
 using Avalonia.Threading;
 
-namespace RolandK.AvaloniaExtensions.Views;
+namespace RolandK.AvaloniaExtensions.Controls;
 
 public partial class MainWindowFrame : UserControl
 {
@@ -25,15 +25,15 @@ public partial class MainWindowFrame : UserControl
     private Panel _ctrlFooterArea;
     private Panel _ctrlStatusBar;
 
-    public Controls FullBackgroundArea => _ctrlFullBackgroundPanel.Children;
+    public Avalonia.Controls.Controls FullBackgroundArea => _ctrlFullBackgroundPanel.Children;
 
-    public Controls CustomTitleArea => _ctrlCustomTitleArea.Children;
+    public Avalonia.Controls.Controls CustomTitleArea => _ctrlCustomTitleArea.Children;
 
-    public Controls HeaderMenuArea => _ctrlHeaderMenuArea.Children;
+    public Avalonia.Controls.Controls HeaderMenuArea => _ctrlHeaderMenuArea.Children;
 
-    public Controls MainContentArea => _ctrlMainContentArea.Children;
+    public Avalonia.Controls.Controls MainContentArea => _ctrlMainContentArea.Children;
 
-    public Controls FooterArea => _ctrlFooterArea.Children;
+    public Avalonia.Controls.Controls FooterArea => _ctrlFooterArea.Children;
 
     public DialogHostControl Overlay { get; }
 

diff --git a/...Extensions/Views/MainWindowFrameStatus.cs → ...ensions/Controls/MainWindowFrameStatus.cs b/...Extensions/Views/MainWindowFrameStatus.cs → ...ensions/Controls/MainWindowFrameStatus.cs
@@ -1,4 +1,4 @@
-namespace RolandK.AvaloniaExtensions.Views;
+namespace RolandK.AvaloniaExtensions.Controls;
 
 public enum MainWindowFrameStatus
 {

diff --git a/...Extensions/Mvvm/Markup/MvvmUserControl.cs → ...tensions/Mvvm/Controls/MvvmUserControl.cs b/...Extensions/Mvvm/Markup/MvvmUserControl.cs → ...tensions/Mvvm/Controls/MvvmUserControl.cs
@@ -5,7 +5,7 @@
 using RolandK.AvaloniaExtensions.ViewServices;
 using RolandK.AvaloniaExtensions.ViewServices.Base;
 
-namespace RolandK.AvaloniaExtensions.Mvvm.Markup;
+namespace RolandK.AvaloniaExtensions.Mvvm.Controls;
 
 public class MvvmUserControl : UserControl, IViewServiceHost
 {

diff --git a/...loniaExtensions/Mvvm/Markup/MvvmWindow.cs → ...niaExtensions/Mvvm/Controls/MvvmWindow.cs b/...loniaExtensions/Mvvm/Markup/MvvmWindow.cs → ...niaExtensions/Mvvm/Controls/MvvmWindow.cs
@@ -3,7 +3,7 @@
 using RolandK.AvaloniaExtensions.ViewServices;
 using RolandK.AvaloniaExtensions.ViewServices.Base;
 
-namespace RolandK.AvaloniaExtensions.Mvvm.Markup;
+namespace RolandK.AvaloniaExtensions.Mvvm.Controls;
 
 public class MvvmWindow : Window, IViewServiceHost
 {

diff --git a/...Mvvm/Markup/ViewServiceHostUserControl.cs → ...vm/Controls/ViewServiceHostUserControl.cs b/...Mvvm/Markup/ViewServiceHostUserControl.cs → ...vm/Controls/ViewServiceHostUserControl.cs
@@ -2,7 +2,7 @@
 using RolandK.AvaloniaExtensions.ViewServices;
 using RolandK.AvaloniaExtensions.ViewServices.Base;
 
-namespace RolandK.AvaloniaExtensions.Mvvm.Markup;
+namespace RolandK.AvaloniaExtensions.Mvvm.Controls;
 
 public class ViewServiceHostUserControl : UserControl, IViewServiceHost
 {

diff --git a/src/RolandK.AvaloniaExtensions/ViewServices/DefaultViewServices.cs b/src/RolandK.AvaloniaExtensions/ViewServices/DefaultViewServices.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.LogicalTree;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 using RolandK.AvaloniaExtensions.ViewServices.FileDialogs;
 using RolandK.AvaloniaExtensions.ViewServices.MessageBox;
 

diff --git a/src/RolandK.AvaloniaExtensions/ViewServices/MessageBox/MessageBoxControl.axaml.cs b/src/RolandK.AvaloniaExtensions/ViewServices/MessageBox/MessageBoxControl.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using System.Threading.Tasks;
 using Avalonia.Markup.Xaml;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 
 // Simple message box implementation
 // Based on: https://stackoverflow.com/questions/55706291/how-to-show-a-message-box-in-avaloniaui-beta

diff --git a/src/RolandK.AvaloniaExtensions/ViewServices/MessageBox/MessageBoxViewControlService.cs b/src/RolandK.AvaloniaExtensions/ViewServices/MessageBox/MessageBoxViewControlService.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using RolandK.AvaloniaExtensions.Views;
+using RolandK.AvaloniaExtensions.Controls;
 using RolandK.AvaloniaExtensions.ViewServices.Base;
 
 namespace RolandK.AvaloniaExtensions.ViewServices.MessageBox;