re-organized photo repositories

jeremyknight-me · Oct 29, 2023 · 2072e29 · 2072e29
1 parent 774d04d
commit 2072e29
Show file tree

Hide file tree

Showing 29 changed files with 63 additions and 49 deletions.
diff --git a/PhotoCollage.Common/Enums/BorderType.cs b/PhotoCollage.Common/Enums/BorderType.cs
diff --git a/PhotoCollage.Common/Enums/FullScreenMode.cs b/PhotoCollage.Common/Enums/FullScreenMode.cs
diff --git a/PhotoCollage.Common/Enums/ScreensaverSpeed.cs b/PhotoCollage.Common/Enums/ScreensaverSpeed.cs
diff --git a/...mon/Data/FileSystemPhotoRepositoryBase.cs → ...leSystem/FileSystemPhotoRepositoryBase.cs b/...mon/Data/FileSystemPhotoRepositoryBase.cs → ...leSystem/FileSystemPhotoRepositoryBase.cs
@@ -2,8 +2,9 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using PhotoCollage.Common.Settings;
 
-namespace PhotoCollage.Common.Data;
+namespace PhotoCollage.Common.Photos.FileSystem;
 
 public abstract class FileSystemPhotoRepositoryBase : IPhotoRepository
 {

diff --git a/.../Data/OrderedFileSystemPhotoRepository.cs → ...ystem/OrderedFileSystemPhotoRepository.cs b/.../Data/OrderedFileSystemPhotoRepository.cs → ...ystem/OrderedFileSystemPhotoRepository.cs
@@ -1,6 +1,7 @@
 using System.IO;
+using PhotoCollage.Common.Settings;
 
-namespace PhotoCollage.Common.Data;
+namespace PhotoCollage.Common.Photos.FileSystem;
 
 public sealed class OrderedFileSystemPhotoRepository : FileSystemPhotoRepositoryBase
 {

diff --git a/...n/Data/RandomFileSystemPhotoRepository.cs → ...System/RandomFileSystemPhotoRepository.cs b/...n/Data/RandomFileSystemPhotoRepository.cs → ...System/RandomFileSystemPhotoRepository.cs
@@ -1,7 +1,8 @@
 using System.IO;
 using System.Linq;
+using PhotoCollage.Common.Settings;
 
-namespace PhotoCollage.Common.Data;
+namespace PhotoCollage.Common.Photos.FileSystem;
 
 public sealed class RandomFileSystemPhotoRepository : FileSystemPhotoRepositoryBase
 {

diff --git a/PhotoCollage.Common/IPhotoRepository.cs → ...Collage.Common/Photos/IPhotoRepository.cs b/PhotoCollage.Common/IPhotoRepository.cs → ...Collage.Common/Photos/IPhotoRepository.cs
@@ -1,4 +1,4 @@
-namespace PhotoCollage.Common;
+namespace PhotoCollage.Common.Photos;
 
 public interface IPhotoRepository
 {

diff --git a/...oCollage.Common/Enums/BorderTypeHelper.cs → PhotoCollage.Common/Settings/BorderType.cs b/...oCollage.Common/Enums/BorderTypeHelper.cs → PhotoCollage.Common/Settings/BorderType.cs
@@ -1,4 +1,12 @@
-namespace PhotoCollage.Common.Enums;
+namespace PhotoCollage.Common.Settings;
+
+public enum BorderType
+{
+    None,
+    Border,
+    BorderHeader,
+    BorderFooter
+}
 
 public static class BorderTypeHelper
 {

diff --git a/PhotoCollage.Common/CollageSettings.cs → ...ollage.Common/Settings/CollageSettings.cs b/PhotoCollage.Common/CollageSettings.cs → ...ollage.Common/Settings/CollageSettings.cs
@@ -1,6 +1,4 @@
-using PhotoCollage.Common.Enums;
-
-namespace PhotoCollage.Common;
+namespace PhotoCollage.Common.Settings;
 
 public sealed class CollageSettings
 {

diff --git a/...lage.Common/Enums/FullScreenModeHelper.cs → ...Collage.Common/Settings/FullScreenMode.cs b/...lage.Common/Enums/FullScreenModeHelper.cs → ...Collage.Common/Settings/FullScreenMode.cs
@@ -1,4 +1,10 @@
-namespace PhotoCollage.Common.Enums;
+namespace PhotoCollage.Common.Settings;
+
+public enum FullScreenMode
+{
+    Stretched,
+    Centered
+}
 
 public static class FullScreenModeHelper
 {

diff --git a/PhotoCollage.Common/ISettingsRepository.cs → ...ge.Common/Settings/ISettingsRepository.cs b/PhotoCollage.Common/ISettingsRepository.cs → ...ge.Common/Settings/ISettingsRepository.cs
@@ -1,4 +1,4 @@
-namespace PhotoCollage.Common;
+namespace PhotoCollage.Common.Settings;
 
 public interface ISettingsRepository
 {

diff --git a/...ge.Common/Enums/ScreensaverSpeedHelper.cs → ...llage.Common/Settings/ScreensaverSpeed.cs b/...ge.Common/Enums/ScreensaverSpeedHelper.cs → ...llage.Common/Settings/ScreensaverSpeed.cs
@@ -1,4 +1,13 @@
-namespace PhotoCollage.Common.Enums;
+namespace PhotoCollage.Common.Settings;
+
+public enum ScreensaverSpeed
+{
+    SuperSlow = 20,
+    ReallySlow = 10,
+    Slow = 6,
+    Medium = 4,
+    Fast = 2
+}
 
 public static class ScreensaverSpeedHelper
 {

diff --git a/PhotoCollageScreensaver/Collage/CollageImage.xaml.cs b/PhotoCollageScreensaver/Collage/CollageImage.xaml.cs
@@ -3,7 +3,7 @@
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
-using PhotoCollage.Common.Enums;
+using PhotoCollage.Common.Settings;
 using PhotoCollageScreensaver.Collage.Presenters;
 
 namespace PhotoCollageScreensaver.Collage;

diff --git a/PhotoCollageScreensaver/Collage/Imaging/ImagePositionerFullscreen.cs b/PhotoCollageScreensaver/Collage/Imaging/ImagePositionerFullscreen.cs
@@ -1,4 +1,5 @@
 using System.Windows.Controls;
+using PhotoCollage.Common.Settings;
 using PhotoCollageScreensaver.Collage.Presenters;
 
 namespace PhotoCollageScreensaver.Collage.Imaging;
@@ -17,7 +18,7 @@ public override void Position()
     {
         if (this.Presenter.Configuration.IsFullScreen)
         {
-            if (this.Presenter.Configuration.PhotoFullScreenMode == PhotoCollage.Common.Enums.FullScreenMode.Stretched)
+            if (this.Presenter.Configuration.PhotoFullScreenMode == FullScreenMode.Stretched)
             {
                 Canvas.SetLeft(this.Control, 0);
                 Canvas.SetTop(this.Control, 0);

diff --git a/PhotoCollageScreensaver/Collage/Imaging/ImageProcessor.cs b/PhotoCollageScreensaver/Collage/Imaging/ImageProcessor.cs
@@ -1,5 +1,6 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using PhotoCollage.Common.Settings;
 
 namespace PhotoCollageScreensaver.Collage.Imaging;
 

diff --git a/PhotoCollageScreensaver/Collage/Imaging/ImageProcessorCollage.cs b/PhotoCollageScreensaver/Collage/Imaging/ImageProcessorCollage.cs
@@ -1,5 +1,6 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using PhotoCollage.Common.Settings;
 
 namespace PhotoCollageScreensaver.Collage.Imaging;
 

diff --git a/PhotoCollageScreensaver/Collage/Imaging/ImageProcessorFullscreen.cs b/PhotoCollageScreensaver/Collage/Imaging/ImageProcessorFullscreen.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using PhotoCollage.Common.Settings;
 
 namespace PhotoCollageScreensaver.Collage.Imaging;
 
@@ -91,7 +92,7 @@ private TransformedBitmap GetFullScreenScaledImage(BitmapSource original, IColla
     {
         var scaledHeight = view.WindowActualHeight / original.Height;
         var scaledWidth = view.WindowActualWidth / original.Width;
-        if (this.Configuration.PhotoFullScreenMode == PhotoCollage.Common.Enums.FullScreenMode.Centered)
+        if (this.Configuration.PhotoFullScreenMode == FullScreenMode.Centered)
         {
             scaledHeight = view.WindowActualHeight / original.Height;
             scaledWidth = view.WindowActualWidth / original.Width;

diff --git a/PhotoCollageScreensaver/Collage/Presenters/CollagePresenter.cs b/PhotoCollageScreensaver/Collage/Presenters/CollagePresenter.cs
@@ -1,5 +1,7 @@
 using System.Windows.Media;
 using System.Windows.Threading;
+using PhotoCollage.Common.Photos;
+using PhotoCollage.Common.Settings;
 using PhotoCollageScreensaver.Collage.Imaging;
 
 namespace PhotoCollageScreensaver.Collage.Presenters;

diff --git a/PhotoCollageScreensaver/Collage/Presenters/CollagePresenterCollage.cs b/PhotoCollageScreensaver/Collage/Presenters/CollagePresenterCollage.cs
@@ -1,4 +1,6 @@
 using System.Collections.Concurrent;
+using PhotoCollage.Common.Photos;
+using PhotoCollage.Common.Settings;
 using PhotoCollageScreensaver.Collage.Imaging;
 
 namespace PhotoCollageScreensaver.Collage.Presenters;

diff --git a/PhotoCollageScreensaver/Collage/Presenters/CollagePresenterFullscreen.cs b/PhotoCollageScreensaver/Collage/Presenters/CollagePresenterFullscreen.cs
@@ -1,4 +1,6 @@
 using System.Collections.Concurrent;
+using PhotoCollage.Common.Photos;
+using PhotoCollage.Common.Settings;
 using PhotoCollageScreensaver.Collage.Imaging;
 
 namespace PhotoCollageScreensaver.Collage.Presenters;

diff --git a/PhotoCollageScreensaver/DependencyInjectionHelper.cs b/PhotoCollageScreensaver/DependencyInjectionHelper.cs
@@ -1,6 +1,8 @@
 using System.IO;
 using Microsoft.Extensions.DependencyInjection;
-using PhotoCollage.Common.Data;
+using PhotoCollage.Common.Photos;
+using PhotoCollage.Common.Photos.FileSystem;
+using PhotoCollage.Common.Settings;
 using PhotoCollageScreensaver.Collage.Presenters;
 using PhotoCollageScreensaver.Logging;
 using PhotoCollageScreensaver.Setup;

diff --git a/PhotoCollageScreensaver/ErrorHandler.cs b/PhotoCollageScreensaver/ErrorHandler.cs
@@ -1,4 +1,5 @@
-using PhotoCollageScreensaver.Logging;
+using PhotoCollage.Common.Settings;
+using PhotoCollageScreensaver.Logging;
 
 namespace PhotoCollageScreensaver;
 

diff --git a/PhotoCollageScreensaver/FileSystemSettingsRepository.cs b/PhotoCollageScreensaver/FileSystemSettingsRepository.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using System.Text.Json;
+using PhotoCollage.Common.Settings;
 
 namespace PhotoCollageScreensaver;
 

diff --git a/PhotoCollageScreensaver/Setup/SetupViewModel.cs b/PhotoCollageScreensaver/Setup/SetupViewModel.cs
@@ -4,7 +4,7 @@
 using System.Runtime.CompilerServices;
 using System.Windows.Forms;
 using System.Windows.Input;
-using PhotoCollage.Common.Enums;
+using PhotoCollage.Common.Settings;
 using PhotoCollageScreensaver.Collage.Presenters;
 using PhotoCollageScreensaver.Commands;
 

diff --git a/PhotoCollageWeb/Client/Pages/Collage.razor b/PhotoCollageWeb/Client/Pages/Collage.razor
@@ -1,7 +1,7 @@
 @page "/collage"
 @using Microsoft.AspNetCore.SignalR.Client
 @using PhotoCollage.Common
-@using PhotoCollage.Common.Enums
+@using PhotoCollage.Common.Settings
 @using PhotoCollageWeb.Client.Extensions
 @using PhotoCollageWeb.Client.Models
 @using PhotoCollageWeb.Shared

diff --git a/PhotoCollageWeb/Server/Extensions/ServiceCollectionExtensions.cs b/PhotoCollageWeb/Server/Extensions/ServiceCollectionExtensions.cs
@@ -1,5 +1,6 @@
-using PhotoCollage.Common;
-using PhotoCollage.Common.Data;
+using PhotoCollage.Common.Photos;
+using PhotoCollage.Common.Photos.FileSystem;
+using PhotoCollage.Common.Settings;
 using PhotoCollageWeb.Server.Workers;
 
 namespace PhotoCollageWeb.Server.Extensions

diff --git a/PhotoCollageWeb/Server/Hubs/CollageHub.cs b/PhotoCollageWeb/Server/Hubs/CollageHub.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Options;
-using PhotoCollage.Common;
+using PhotoCollage.Common.Settings;
 
 namespace PhotoCollageWeb.Server.Hubs
 {

diff --git a/PhotoCollageWeb/Server/Hubs/ICollageClient.cs b/PhotoCollageWeb/Server/Hubs/ICollageClient.cs
@@ -1,4 +1,4 @@
-using PhotoCollage.Common;
+using PhotoCollage.Common.Settings;
 using PhotoCollageWeb.Shared;
 
 namespace PhotoCollageWeb.Server.Hubs

diff --git a/PhotoCollageWeb/Server/Workers/CollageWorker.cs b/PhotoCollageWeb/Server/Workers/CollageWorker.cs
@@ -1,7 +1,8 @@
 using System.Collections.Concurrent;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Options;
-using PhotoCollage.Common;
+using PhotoCollage.Common.Photos;
+using PhotoCollage.Common.Settings;
 using PhotoCollageWeb.Server.Hubs;
 using PhotoCollageWeb.Shared;