From 9b5a0f3123789481e573a9651b8557ee28a66c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81d=C3=A1m=20Kov=C3=A1cs?= Date: Wed, 30 Aug 2023 13:19:46 +0200 Subject: [PATCH] Move services to topic folders --- .../{Services => ContextMenu}/IContextMenuProvider.cs | 0 .../FileTime.GuiApp.App.Abstractions.csproj | 2 ++ .../{Services => Places}/IPlacesService.cs | 2 +- .../{Services => ContextMenu}/LinuxContextMenuProvider.cs | 3 ++- .../{Services => ContextMenu}/WindowsContextMenuProvider.cs | 3 ++- .../Avalonia/FileTime.GuiApp.App/FileTime.GuiApp.App.csproj | 2 ++ .../FileTime.GuiApp.App/IconProviders/MaterialIconProvider.cs | 1 + .../{Services => Places}/LinuxPlacesService.cs | 2 +- .../{Services => Places}/WindowsPlacesService.cs | 2 +- src/GuiApp/Avalonia/FileTime.GuiApp/Startup.cs | 2 ++ 10 files changed, 14 insertions(+), 5 deletions(-) rename src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/{Services => ContextMenu}/IContextMenuProvider.cs (100%) rename src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/{Services => Places}/IPlacesService.cs (82%) rename src/GuiApp/Avalonia/FileTime.GuiApp.App/{Services => ContextMenu}/LinuxContextMenuProvider.cs (80%) rename src/GuiApp/Avalonia/FileTime.GuiApp.App/{Services => ContextMenu}/WindowsContextMenuProvider.cs (99%) rename src/GuiApp/Avalonia/FileTime.GuiApp.App/{Services => Places}/LinuxPlacesService.cs (98%) rename src/GuiApp/Avalonia/FileTime.GuiApp.App/{Services => Places}/WindowsPlacesService.cs (98%) diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/Services/IContextMenuProvider.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/ContextMenu/IContextMenuProvider.cs similarity index 100% rename from src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/Services/IContextMenuProvider.cs rename to src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/ContextMenu/IContextMenuProvider.cs diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/FileTime.GuiApp.App.Abstractions.csproj b/src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/FileTime.GuiApp.App.Abstractions.csproj index eff3265..0e09af9 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/FileTime.GuiApp.App.Abstractions.csproj +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/FileTime.GuiApp.App.Abstractions.csproj @@ -26,4 +26,6 @@ + + diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/Services/IPlacesService.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/Places/IPlacesService.cs similarity index 82% rename from src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/Services/IPlacesService.cs rename to src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/Places/IPlacesService.cs index daf578f..af8fa88 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/Services/IPlacesService.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App.Abstractions/Places/IPlacesService.cs @@ -1,7 +1,7 @@ using FileTime.App.Core.Services; using FileTime.GuiApp.App.IconProviders; -namespace FileTime.GuiApp.App.Services; +namespace FileTime.GuiApp.App.Places; public interface IPlacesService : IStartupHandler { diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Services/LinuxContextMenuProvider.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/ContextMenu/LinuxContextMenuProvider.cs similarity index 80% rename from src/GuiApp/Avalonia/FileTime.GuiApp.App/Services/LinuxContextMenuProvider.cs rename to src/GuiApp/Avalonia/FileTime.GuiApp.App/ContextMenu/LinuxContextMenuProvider.cs index 7415b52..bbfddca 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Services/LinuxContextMenuProvider.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/ContextMenu/LinuxContextMenuProvider.cs @@ -1,6 +1,7 @@ using FileTime.Core.Models; +using FileTime.GuiApp.App.Services; -namespace FileTime.GuiApp.App.Services; +namespace FileTime.GuiApp.App.ContextMenu; public class LinuxContextMenuProvider : IContextMenuProvider { diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Services/WindowsContextMenuProvider.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/ContextMenu/WindowsContextMenuProvider.cs similarity index 99% rename from src/GuiApp/Avalonia/FileTime.GuiApp.App/Services/WindowsContextMenuProvider.cs rename to src/GuiApp/Avalonia/FileTime.GuiApp.App/ContextMenu/WindowsContextMenuProvider.cs index 78677f1..92c26b3 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Services/WindowsContextMenuProvider.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/ContextMenu/WindowsContextMenuProvider.cs @@ -6,10 +6,11 @@ using Avalonia.Media; using FileTime.Core.Models; using FileTime.GuiApp.App.Helper; using FileTime.GuiApp.App.IconProviders; +using FileTime.GuiApp.App.Services; using FileTime.Providers.Local; using Microsoft.Win32; -namespace FileTime.GuiApp.App.Services; +namespace FileTime.GuiApp.App.ContextMenu; [SupportedOSPlatform("windows")] public class WindowsContextMenuProvider : IContextMenuProvider diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/FileTime.GuiApp.App.csproj b/src/GuiApp/Avalonia/FileTime.GuiApp.App/FileTime.GuiApp.App.csproj index e676efb..319af6f 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/FileTime.GuiApp.App.csproj +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/FileTime.GuiApp.App.csproj @@ -56,6 +56,8 @@ + + diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/IconProviders/MaterialIconProvider.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/IconProviders/MaterialIconProvider.cs index 6bba598..b9eb4a9 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/IconProviders/MaterialIconProvider.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/IconProviders/MaterialIconProvider.cs @@ -1,5 +1,6 @@ using FileTime.Core.Models; using FileTime.GuiApp.App.Models; +using FileTime.GuiApp.App.Places; using FileTime.GuiApp.App.Services; using FileTime.Providers.Local; diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Services/LinuxPlacesService.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Places/LinuxPlacesService.cs similarity index 98% rename from src/GuiApp/Avalonia/FileTime.GuiApp.App/Services/LinuxPlacesService.cs rename to src/GuiApp/Avalonia/FileTime.GuiApp.App/Places/LinuxPlacesService.cs index 28dc038..963bfcb 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Services/LinuxPlacesService.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Places/LinuxPlacesService.cs @@ -5,7 +5,7 @@ using FileTime.GuiApp.App.IconProviders; using FileTime.GuiApp.App.ViewModels; using FileTime.Providers.Local; -namespace FileTime.GuiApp.App.Services; +namespace FileTime.GuiApp.App.Places; public class LinuxPlacesService : IPlacesService { diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Services/WindowsPlacesService.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Places/WindowsPlacesService.cs similarity index 98% rename from src/GuiApp/Avalonia/FileTime.GuiApp.App/Services/WindowsPlacesService.cs rename to src/GuiApp/Avalonia/FileTime.GuiApp.App/Places/WindowsPlacesService.cs index 9f8eeee..fb15a4e 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Services/WindowsPlacesService.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Places/WindowsPlacesService.cs @@ -6,7 +6,7 @@ using FileTime.GuiApp.App.ViewModels; using FileTime.Providers.Local; using Syroot.Windows.IO; -namespace FileTime.GuiApp.App.Services; +namespace FileTime.GuiApp.App.Places; public class WindowsPlacesService : IPlacesService { diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp/Startup.cs b/src/GuiApp/Avalonia/FileTime.GuiApp/Startup.cs index 8000839..bdc0376 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp/Startup.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp/Startup.cs @@ -6,10 +6,12 @@ using FileTime.App.Core.Services; using FileTime.App.Core.ViewModels; using FileTime.Core.Interactions; using FileTime.GuiApp.App.Configuration; +using FileTime.GuiApp.App.ContextMenu; using FileTime.GuiApp.CustomImpl.ViewModels; using FileTime.GuiApp.App.IconProviders; using FileTime.GuiApp.App.InstanceManagement; using FileTime.GuiApp.App.Logging; +using FileTime.GuiApp.App.Places; using FileTime.GuiApp.App.Services; using FileTime.GuiApp.App.Settings; using FileTime.GuiApp.App.ViewModels;