Flattens namespaces

roryclaasen · Jul 12, 2023 · f7fde6b · f7fde6b
1 parent 915927b
commit f7fde6b
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 19 deletions.
diff --git a/Mosaic.Infrastructure/Config/Loader/ConfigLoader.cs b/Mosaic.Infrastructure/Config/Loader/ConfigLoader.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // ------------------------------------------------------------------------------
 
-namespace Mosaic.Infrastructure.Config.Loader
+namespace Mosaic.Infrastructure
 {
     using Newtonsoft.Json;
 

diff --git a/Mosaic.Infrastructure/Config/Loader/ConfigLoader{T}.cs b/Mosaic.Infrastructure/Config/Loader/ConfigLoader{T}.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // ------------------------------------------------------------------------------
 
-namespace Mosaic.Infrastructure.Config.Loader
+namespace Mosaic.Infrastructure
 {
     using System.IO;
     using Newtonsoft.Json;

diff --git a/Mosaic.Infrastructure/Config/Loader/IConfigLoader{T}.cs b/Mosaic.Infrastructure/Config/Loader/IConfigLoader{T}.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // ------------------------------------------------------------------------------
 
-namespace Mosaic.Infrastructure.Config.Loader
+namespace Mosaic.Infrastructure
 {
     public interface IConfigLoader<T>
     {

diff --git a/Mosaic.Infrastructure/Config/MosaicConfig.cs b/Mosaic.Infrastructure/Config/MosaicConfig.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // ------------------------------------------------------------------------------
 
-namespace Mosaic.Infrastructure.Config
+namespace Mosaic.Infrastructure
 {
     using System.Collections.Generic;
     using Newtonsoft.Json;

diff --git a/Mosaic.Infrastructure/Config/SourceConfig.cs b/Mosaic.Infrastructure/Config/SourceConfig.cs
@@ -4,7 +4,7 @@
 // </copyright>
 // ------------------------------------------------------------------------------
 
-namespace Mosaic.Infrastructure.Config
+namespace Mosaic.Infrastructure
 {
     using Newtonsoft.Json;
 

diff --git a/Mosaic.Infrastructure/Events/TileSourceEventArgs.cs b/Mosaic.Infrastructure/Events/TileSourceEventArgs.cs
@@ -4,10 +4,9 @@
 // </copyright>
 // ------------------------------------------------------------------------------
 
-namespace Mosaic.Infrastructure.Events
+namespace Mosaic.Infrastructure
 {
     using System;
-    using Mosaic.Infrastructure.Config;
 
     public class TileSourceEventArgs : EventArgs
     {

diff --git a/Mosaic.Infrastructure/MosaicManager.Events.cs b/Mosaic.Infrastructure/MosaicManager.Events.cs
@@ -8,8 +8,6 @@ namespace Mosaic.Infrastructure
 {
     using System;
     using LibVLCSharp.Shared;
-    using Mosaic.Infrastructure.Config;
-    using Mosaic.Infrastructure.Events;
 
     public partial class MosaicManager
     {

diff --git a/Mosaic.Infrastructure/MosaicManager.cs b/Mosaic.Infrastructure/MosaicManager.cs
@@ -10,8 +10,6 @@ namespace Mosaic.Infrastructure
     using System.Collections.Generic;
     using System.Linq;
     using LibVLCSharp.Shared;
-    using Mosaic.Infrastructure.Config;
-    using Mosaic.Infrastructure.Events;
 
     public partial class MosaicManager
     {

diff --git a/Mosaic/App.xaml.cs b/Mosaic/App.xaml.cs
@@ -11,8 +11,7 @@ namespace Mosaic
 {
     using System.IO;
     using Microsoft.UI.Xaml;
-    using Mosaic.Infrastructure.Config;
-    using Mosaic.Infrastructure.Config.Loader;
+    using Mosaic.Infrastructure;
     using Newtonsoft.Json;
     using Windows.ApplicationModel;
 

diff --git a/Mosaic/Config/ConfigLoader.cs b/Mosaic/Config/ConfigLoader.cs
@@ -0,0 +1,19 @@
+// ------------------------------------------------------------------------------
+// <copyright file="ConfigLoader.cs" company="Rory Claasen">
+// Copyright (c) Rory Claasen. All rights reserved.
+// </copyright>
+// ------------------------------------------------------------------------------
+
+namespace Mosaic
+{
+    using Mosaic.Infrastructure;
+    using Newtonsoft.Json;
+
+    public class ConfigLoader : ConfigLoader<MosaicConfig>, IConfigLoader<MosaicConfig>
+    {
+        public ConfigLoader(JsonSerializer serializer)
+            : base(serializer)
+        {
+        }
+    }
+}
diff --git a/...ructure/Config/MosaicApplicationConfig.cs → Mosaic/Config/MosaicApplicationConfig.cs b/...ructure/Config/MosaicApplicationConfig.cs → Mosaic/Config/MosaicApplicationConfig.cs
@@ -4,8 +4,9 @@
 // </copyright>
 // ------------------------------------------------------------------------------
 
-namespace Mosaic.Infrastructure.Config
+namespace Mosaic
 {
+    using Mosaic.Infrastructure;
     using Newtonsoft.Json;
 
     public record MosaicApplicationConfig : MosaicConfig

diff --git a/Mosaic/MosaicWindow.xaml.cs b/Mosaic/MosaicWindow.xaml.cs
@@ -19,8 +19,6 @@ namespace Mosaic
     using Microsoft.UI.Xaml;
     using Microsoft.UI.Xaml.Controls;
     using Mosaic.Infrastructure;
-    using Mosaic.Infrastructure.Config;
-    using Mosaic.Infrastructure.Events;
     using Windows.UI.Core;
 
     /// <summary>
@@ -50,9 +48,6 @@ public MosaicWindow()
             };
             this.swapTimer.Tick += (o, e) => this.mosaicManager.SwapTiles(this.GetLibVLC);
 
-            // this.KeyUp += this.MosaicView_KeyUp;
-            // this.Closing += this.MosaicView_Closing;
-
             foreach (var tile in this.GetVideoTiles())
             {
                 tile.Initialized += this.ViewView_Initailized;