re-organized solution

jeremyknight-me · Oct 29, 2023 · e33b874 · e33b874
1 parent 4748dfb
commit e33b874
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 32 deletions.
diff --git a/PhotoCollageScreensaver/App.xaml.cs b/PhotoCollageScreensaver/App.xaml.cs
@@ -1,5 +1,6 @@
 using System.Windows.Threading;
 using Microsoft.Extensions.DependencyInjection;
+using PhotoCollageScreensaver.Collage.Presenters;
 using PhotoCollageScreensaver.Views;
 
 namespace PhotoCollageScreensaver;

diff --git a/...creensaver/UserControls/CollageImage.xaml → ...lageScreensaver/Collage/CollageImage.xaml b/...creensaver/UserControls/CollageImage.xaml → ...lageScreensaver/Collage/CollageImage.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="PhotoCollageScreensaver.UserControls.CollageImage"
+<UserControl x:Class="PhotoCollageScreensaver.Collage.CollageImage"
              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/...ensaver/UserControls/CollageImage.xaml.cs → ...eScreensaver/Collage/CollageImage.xaml.cs b/...ensaver/UserControls/CollageImage.xaml.cs → ...eScreensaver/Collage/CollageImage.xaml.cs
@@ -4,9 +4,10 @@
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 using PhotoCollage.Common.Enums;
-using PhotoCollageScreensaver.Views;
+using PhotoCollageScreensaver.Collage.Imaging;
+using PhotoCollageScreensaver.Collage.Presenters;
 
-namespace PhotoCollageScreensaver.UserControls;
+namespace PhotoCollageScreensaver.Collage;
 
 public partial class CollageImage : UserControl, IDisposable
 {

diff --git a/...llageScreensaver/Views/CollageWindow.xaml → ...ageScreensaver/Collage/CollageWindow.xaml b/...llageScreensaver/Views/CollageWindow.xaml → ...ageScreensaver/Collage/CollageWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="PhotoCollageScreensaver.Views.CollageWindow"
+<Window x:Class="PhotoCollageScreensaver.Collage.CollageWindow"
         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"

diff --git a/...geScreensaver/Views/CollageWindow.xaml.cs → ...Screensaver/Collage/CollageWindow.xaml.cs b/...geScreensaver/Views/CollageWindow.xaml.cs → ...Screensaver/Collage/CollageWindow.xaml.cs
@@ -1,7 +1,7 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace PhotoCollageScreensaver.Views;
+namespace PhotoCollageScreensaver.Collage;
 
 public partial class CollageWindow : Window, ICollageView
 {

diff --git a/...oCollageScreensaver/Views/ICollageView.cs → ...ollageScreensaver/Collage/ICollageView.cs b/...oCollageScreensaver/Views/ICollageView.cs → ...ollageScreensaver/Collage/ICollageView.cs
@@ -1,6 +1,6 @@
 using System.Windows.Controls;
 
-namespace PhotoCollageScreensaver.Views;
+namespace PhotoCollageScreensaver.Collage;
 
 public interface ICollageView
 {

diff --git a/PhotoCollageScreensaver/ImagePositioner.cs → ...nsaver/Collage/Imaging/ImagePositioner.cs b/PhotoCollageScreensaver/ImagePositioner.cs → ...nsaver/Collage/Imaging/ImagePositioner.cs
@@ -1,6 +1,6 @@
-using PhotoCollageScreensaver.Views;
+using PhotoCollageScreensaver.Collage.Presenters;
 
-namespace PhotoCollageScreensaver;
+namespace PhotoCollageScreensaver.Collage.Imaging;
 
 internal abstract class ImagePositioner
 {

diff --git a/...lageScreensaver/ImagePositionerCollage.cs → ...Collage/Imaging/ImagePositionerCollage.cs b/...lageScreensaver/ImagePositionerCollage.cs → ...Collage/Imaging/ImagePositionerCollage.cs
@@ -1,7 +1,7 @@
 using System.Windows.Controls;
-using PhotoCollageScreensaver.Views;
+using PhotoCollageScreensaver.Collage.Presenters;
 
-namespace PhotoCollageScreensaver;
+namespace PhotoCollageScreensaver.Collage.Imaging;
 
 internal sealed class ImagePositionerCollage : ImagePositioner
 {

diff --git a/...eScreensaver/ImagePositionerFullscreen.cs → ...lage/Imaging/ImagePositionerFullscreen.cs b/...eScreensaver/ImagePositionerFullscreen.cs → ...lage/Imaging/ImagePositionerFullscreen.cs
@@ -1,7 +1,7 @@
 using System.Windows.Controls;
-using PhotoCollageScreensaver.Views;
+using PhotoCollageScreensaver.Collage.Presenters;
 
-namespace PhotoCollageScreensaver;
+namespace PhotoCollageScreensaver.Collage.Imaging;
 
 internal sealed class ImagePositionerFullscreen : ImagePositioner
 {

diff --git a/PhotoCollageScreensaver/ImageProcessor.cs → ...ensaver/Collage/Imaging/ImageProcessor.cs b/PhotoCollageScreensaver/ImageProcessor.cs → ...ensaver/Collage/Imaging/ImageProcessor.cs
@@ -1,8 +1,7 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using PhotoCollageScreensaver.Views;
 
-namespace PhotoCollageScreensaver;
+namespace PhotoCollageScreensaver.Collage.Imaging;
 
 internal abstract class ImageProcessor
 {

diff --git a/...llageScreensaver/ImageProcessorCollage.cs → .../Collage/Imaging/ImageProcessorCollage.cs b/...llageScreensaver/ImageProcessorCollage.cs → .../Collage/Imaging/ImageProcessorCollage.cs
@@ -1,8 +1,7 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using PhotoCollageScreensaver.Views;
 
-namespace PhotoCollageScreensaver;
+namespace PhotoCollageScreensaver.Collage.Imaging;
 
 internal sealed class ImageProcessorCollage : ImageProcessor
 {

diff --git a/...geScreensaver/ImageProcessorFullscreen.cs → ...llage/Imaging/ImageProcessorFullscreen.cs b/...geScreensaver/ImageProcessorFullscreen.cs → ...llage/Imaging/ImageProcessorFullscreen.cs
@@ -4,9 +4,8 @@
 using System.Linq;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using PhotoCollageScreensaver.Views;
 
-namespace PhotoCollageScreensaver;
+namespace PhotoCollageScreensaver.Collage.Imaging;
 
 internal sealed class ImageProcessorFullscreen : ImageProcessor
 {

diff --git a/PhotoCollageScreensaver/CollagePresenter.cs → ...er/Collage/Presenters/CollagePresenter.cs b/PhotoCollageScreensaver/CollagePresenter.cs → ...er/Collage/Presenters/CollagePresenter.cs
@@ -1,9 +1,8 @@
 using System.Threading;
 using System.Windows.Media;
 using System.Windows.Threading;
-using PhotoCollageScreensaver.Views;
 
-namespace PhotoCollageScreensaver;
+namespace PhotoCollageScreensaver.Collage.Presenters;
 
 public abstract class CollagePresenter
 {

diff --git a/...ageScreensaver/CollagePresenterCollage.cs → ...age/Presenters/CollagePresenterCollage.cs b/...ageScreensaver/CollagePresenterCollage.cs → ...age/Presenters/CollagePresenterCollage.cs
@@ -1,8 +1,7 @@
 using System.Collections.Concurrent;
-using PhotoCollageScreensaver.UserControls;
-using PhotoCollageScreensaver.Views;
+using PhotoCollageScreensaver.Collage.Imaging;
 
-namespace PhotoCollageScreensaver;
+namespace PhotoCollageScreensaver.Collage.Presenters;
 
 internal sealed class CollagePresenterCollage : CollagePresenter
 {

diff --git a/...Screensaver/CollagePresenterFullscreen.cs → .../Presenters/CollagePresenterFullscreen.cs b/...Screensaver/CollagePresenterFullscreen.cs → .../Presenters/CollagePresenterFullscreen.cs
@@ -1,8 +1,7 @@
 using System.Collections.Concurrent;
-using PhotoCollageScreensaver.UserControls;
-using PhotoCollageScreensaver.Views;
+using PhotoCollageScreensaver.Collage.Imaging;
 
-namespace PhotoCollageScreensaver;
+namespace PhotoCollageScreensaver.Collage.Presenters;
 
 internal sealed class CollagePresenterFullscreen : CollagePresenter
 {

diff --git a/PhotoCollageScreensaver/DependencyInjectionHelper.cs b/PhotoCollageScreensaver/DependencyInjectionHelper.cs
@@ -1,9 +1,9 @@
 using System.IO;
 using Microsoft.Extensions.DependencyInjection;
 using PhotoCollage.Common.Data;
-using PhotoCollageScreensaver.Data;
+using PhotoCollageScreensaver.Collage.Presenters;
 using PhotoCollageScreensaver.Logging;
-using PhotoCollageScreensaver.ViewModels;
+using PhotoCollageScreensaver.Setup;
 using PhotoCollageScreensaver.Views;
 
 namespace PhotoCollageScreensaver;

diff --git a/...aver/Data/FileSystemSettingsRepository.cs → ...reensaver/FileSystemSettingsRepository.cs b/...aver/Data/FileSystemSettingsRepository.cs → ...reensaver/FileSystemSettingsRepository.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using System.Text.Json;
 
-namespace PhotoCollageScreensaver.Data;
+namespace PhotoCollageScreensaver;
 
 internal class FileSystemSettingsRepository : ISettingsRepository
 {

diff --git a/...eScreensaver/ViewModels/SetupViewModel.cs → ...ollageScreensaver/Setup/SetupViewModel.cs b/...eScreensaver/ViewModels/SetupViewModel.cs → ...ollageScreensaver/Setup/SetupViewModel.cs
@@ -5,9 +5,10 @@
 using System.Windows.Forms;
 using System.Windows.Input;
 using PhotoCollage.Common.Enums;
+using PhotoCollageScreensaver.Collage.Presenters;
 using PhotoCollageScreensaver.Commands;
 
-namespace PhotoCollageScreensaver.ViewModels;
+namespace PhotoCollageScreensaver.Setup;
 
 public class SetupViewModel : INotifyPropertyChanged
 {
@@ -50,7 +51,7 @@ public SetupViewModel(
     public ICommand CancelCommand { get; private set; }
     public ICommand SelectDirectoryCommand { get; private set; }
 
-    
+
     public ObservableCollection<KeyValuePair<string, string>> BorderOptions { get; set; }
     public ObservableCollection<string> SpeedOptions { get; set; }
     public ObservableCollection<KeyValuePair<string, string>> FullScreenModeOptions { get; set; }

diff --git a/...CollageScreensaver/Views/SetupWindow.xaml → ...CollageScreensaver/Setup/SetupWindow.xaml b/...CollageScreensaver/Views/SetupWindow.xaml → ...CollageScreensaver/Setup/SetupWindow.xaml
diff --git a/...lageScreensaver/Views/SetupWindow.xaml.cs → ...lageScreensaver/Setup/SetupWindow.xaml.cs b/...lageScreensaver/Views/SetupWindow.xaml.cs → ...lageScreensaver/Setup/SetupWindow.xaml.cs
@@ -1,4 +1,4 @@
-using PhotoCollageScreensaver.ViewModels;
+using PhotoCollageScreensaver.Setup;
 
 namespace PhotoCollageScreensaver.Views;