files-community · yaira2 · Jun 23, 2023 · Jun 23, 2023 · Jun 23, 2023
diff --git a/src/Files.App/Actions/Favorites/PinItemAction.cs b/src/Files.App/Actions/Favorites/PinItemAction.cs
@@ -7,7 +7,7 @@
 using Files.App.Contexts;
 using Files.App.Extensions;
 using Files.App.Filesystem;
-using Files.App.ServicesImplementation;
+using Files.App.Services;
 using Files.App.UserControls.Widgets;
 using System.ComponentModel;
 using System.Linq;

diff --git a/src/Files.App/Actions/Favorites/UnpinItemAction.cs b/src/Files.App/Actions/Favorites/UnpinItemAction.cs
@@ -7,7 +7,7 @@
 using Files.App.Contexts;
 using Files.App.Extensions;
 using Files.App.Filesystem;
-using Files.App.ServicesImplementation;
+using Files.App.Services;
 using Files.App.UserControls.Widgets;
 using System.ComponentModel;
 using System.Linq;

diff --git a/src/Files.App/App.xaml.cs b/src/Files.App/App.xaml.cs
@@ -1,3 +1,6 @@
+// Copyright (c) 2023 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
 using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.WinUI;
 using CommunityToolkit.WinUI.Helpers;
@@ -10,9 +13,9 @@
 using Files.App.Filesystem.Cloud;
 using Files.App.Filesystem.FilesystemHistory;
 using Files.App.Helpers;
-using Files.App.ServicesImplementation;
-using Files.App.ServicesImplementation.DateTimeFormatter;
-using Files.App.ServicesImplementation.Settings;
+using Files.App.Services;
+using Files.App.Services.DateTimeFormatter;
+using Files.App.Services.Settings;
 using Files.App.Shell;
 using Files.App.Storage.FtpStorage;
 using Files.App.Storage.NativeStorage;

diff --git a/src/Files.App/Data/Models/SidebarPinnedModel.cs b/src/Files.App/Data/Models/SidebarPinnedModel.cs
@@ -3,7 +3,7 @@
 
 using CommunityToolkit.WinUI;
 using Files.App.Data.Items;
-using Files.App.ServicesImplementation;
+using Files.App.Services;
 using Files.App.UserControls.Widgets;
 using System.Collections.Specialized;
 using System.IO;

diff --git a/src/Files.App/Filesystem/QuickAccessManager.cs b/src/Files.App/Filesystem/QuickAccessManager.cs
@@ -5,7 +5,7 @@
 using CommunityToolkit.WinUI.Helpers;
 using Files.App.Data.Models;
 using Files.App.Helpers;
-using Files.App.ServicesImplementation;
+using Files.App.Services;
 using Files.App.UserControls.Widgets;
 using System;
 using System.IO;

diff --git a/src/Files.App/Helpers/ContextFlyoutItemHelper.cs b/src/Files.App/Helpers/ContextFlyoutItemHelper.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.Commands;
-using Files.App.ServicesImplementation.Settings;
+using Files.App.Services.Settings;
 using Files.Backend.Helpers;
 using Files.Backend.Services;
 using Microsoft.UI.Xaml.Media.Imaging;

diff --git a/src/Files.App/MainWindow.xaml.cs b/src/Files.App/MainWindow.xaml.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.ServicesImplementation.Settings;
+using Files.App.Services.Settings;
 using Files.App.UserControls.MultitaskingControl;
 using Microsoft.UI;
 using Microsoft.UI.Composition.SystemBackdrops;

diff --git a/.../ServicesImplementation/AddItemService.cs → src/Files.App/Services/AddItemService.cs b/.../ServicesImplementation/AddItemService.cs → src/Files.App/Services/AddItemService.cs
@@ -1,13 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Extensions;
-using Files.Backend.Services;
-using Files.Shared;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-
-namespace Files.App.ServicesImplementation
+namespace Files.App.Services
 {
 	/// <inheritdoc cref="IAddItemService"/>
 	internal sealed class AddItemService : IAddItemService

diff --git a/...imeFormatter/AbstractDateTimeFormatter.cs → ...imeFormatter/AbstractDateTimeFormatter.cs b/...imeFormatter/AbstractDateTimeFormatter.cs → ...imeFormatter/AbstractDateTimeFormatter.cs
@@ -5,7 +5,7 @@
 using System.Globalization;
 using Windows.Globalization;
 
-namespace Files.App.ServicesImplementation.DateTimeFormatter
+namespace Files.App.Services.DateTimeFormatter
 {
 	internal abstract class AbstractDateTimeFormatter : IDateTimeFormatter
 	{

diff --git a/...Formatter/ApplicationDateTimeFormatter.cs → ...Formatter/ApplicationDateTimeFormatter.cs b/...Formatter/ApplicationDateTimeFormatter.cs → ...Formatter/ApplicationDateTimeFormatter.cs
@@ -4,7 +4,7 @@
 using Files.App.Extensions;
 using System;
 
-namespace Files.App.ServicesImplementation.DateTimeFormatter
+namespace Files.App.Services.DateTimeFormatter
 {
 	internal class ApplicationDateTimeFormatter : AbstractDateTimeFormatter
 	{

diff --git a/...TimeFormatter/DateTimeFormatterFactory.cs → ...TimeFormatter/DateTimeFormatterFactory.cs b/...TimeFormatter/DateTimeFormatterFactory.cs → ...TimeFormatter/DateTimeFormatterFactory.cs
@@ -5,7 +5,7 @@
 using Files.Shared.Services.DateTimeFormatter;
 using System;
 
-namespace Files.App.ServicesImplementation.DateTimeFormatter
+namespace Files.App.Services.DateTimeFormatter
 {
 	public class DateTimeFormatterFactory : IDateTimeFormatterFactory
 	{

diff --git a/...eTimeFormatter/SystemDateTimeFormatter.cs → ...eTimeFormatter/SystemDateTimeFormatter.cs b/...eTimeFormatter/SystemDateTimeFormatter.cs → ...eTimeFormatter/SystemDateTimeFormatter.cs
@@ -4,7 +4,7 @@
 using Files.App.Extensions;
 using System;
 
-namespace Files.App.ServicesImplementation.DateTimeFormatter
+namespace Files.App.Services.DateTimeFormatter
 {
 	internal class SystemDateTimeFormatter : AbstractDateTimeFormatter
 	{

diff --git a/...meFormatter/UniversalDateTimeFormatter.cs → ...meFormatter/UniversalDateTimeFormatter.cs b/...meFormatter/UniversalDateTimeFormatter.cs → ...meFormatter/UniversalDateTimeFormatter.cs
@@ -4,7 +4,7 @@
 using Files.App.Extensions;
 using System;
 
-namespace Files.App.ServicesImplementation.DateTimeFormatter
+namespace Files.App.Services.DateTimeFormatter
 {
 	internal class UniversalDateTimeFormatter : AbstractDateTimeFormatter
 	{

diff --git a/...ateTimeFormatter/UserDateTimeFormatter.cs → ...ateTimeFormatter/UserDateTimeFormatter.cs b/...ateTimeFormatter/UserDateTimeFormatter.cs → ...ateTimeFormatter/UserDateTimeFormatter.cs
@@ -4,7 +4,7 @@
 using Files.Shared.EventArguments;
 using Files.Shared.Services.DateTimeFormatter;
 
-namespace Files.App.ServicesImplementation.DateTimeFormatter
+namespace Files.App.Services.DateTimeFormatter
 {
 	internal class UserDateTimeFormatter : IDateTimeFormatter
 	{

diff --git a/...p/ServicesImplementation/DialogService.cs → src/Files.App/Services/DialogService.cs b/...p/ServicesImplementation/DialogService.cs → src/Files.App/Services/DialogService.cs
@@ -2,23 +2,12 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.Dialogs;
-using Files.App.Helpers;
 using Files.App.ViewModels.Dialogs;
-using Files.Backend.Services;
-using Files.Backend.ViewModels.Dialogs;
-using Files.Backend.ViewModels.Dialogs.AddItemDialog;
-using Files.Backend.ViewModels.Dialogs.FileSystemDialog;
-using Files.Shared.Enums;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml.Controls;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Threading.Tasks;
 using Windows.Foundation.Metadata;
 
-namespace Files.App.ServicesImplementation
+namespace Files.App.Services
 {
 	/// <inheritdoc cref="IDialogService"/>
 	internal sealed class DialogService : IDialogService

diff --git a/...icesImplementation/FileExplorerService.cs → ...Files.App/Services/FileExplorerService.cs b/...icesImplementation/FileExplorerService.cs → ...Files.App/Services/FileExplorerService.cs
@@ -2,18 +2,12 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.Storage.WindowsStorage;
-using Files.Backend.Services;
 using Files.Sdk.Storage.LocatableStorage;
-using Files.Shared.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using Windows.Storage;
 using Windows.Storage.Pickers;
 using Windows.System;
 
-namespace Files.App.ServicesImplementation
+namespace Files.App.Services
 {
 	/// <inheritdoc cref="IFileExplorerService"/>
 	internal sealed class FileExplorerService : IFileExplorerService

diff --git a/...ServicesImplementation/FileTagsService.cs → src/Files.App/Services/FileTagsService.cs b/...ServicesImplementation/FileTagsService.cs → src/Files.App/Services/FileTagsService.cs
@@ -6,7 +6,7 @@
 using Files.Sdk.Storage.LocatableStorage;
 using System.Runtime.CompilerServices;
 
-namespace Files.App.ServicesImplementation
+namespace Files.App.Services
 {
 	/// <inheritdoc cref="IFileTagsService"/>
 	internal sealed class FileTagsService : IFileTagsService

diff --git a/.../ServicesImplementation/ImagingService.cs → src/Files.App/Services/ImagingService.cs b/.../ServicesImplementation/ImagingService.cs → src/Files.App/Services/ImagingService.cs
@@ -5,7 +5,7 @@
 using Files.Sdk.Storage.LocatableStorage;
 using Windows.Storage.FileProperties;
 
-namespace Files.App.ServicesImplementation
+namespace Files.App.Services
 {
 	internal sealed class ImagingService : IImageService
 	{

diff --git a/...ServicesImplementation/JumpListService.cs → src/Files.App/Services/JumpListService.cs b/...ServicesImplementation/JumpListService.cs → src/Files.App/Services/JumpListService.cs
@@ -1,23 +1,12 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Files.App.Data.Items;
-using Files.App.Extensions;
-using Files.App.Filesystem;
-using Files.App.Helpers;
-using Files.App.ViewModels;
-using Files.Shared.Extensions;
 using Files.Shared.Services;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using Windows.Storage;
 using Windows.UI.StartScreen;
 
-namespace Files.App.ServicesImplementation
+namespace Files.App.Services
 {
 	public class JumpListService : IJumpListService
 	{

diff --git a/...icesImplementation/LocalizationService.cs → ...Files.App/Services/LocalizationService.cs b/...icesImplementation/LocalizationService.cs → ...Files.App/Services/LocalizationService.cs
@@ -1,10 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Extensions;
-using Files.Backend.Services;
-
-namespace Files.App.ServicesImplementation
+namespace Files.App.Services
 {
 	internal sealed class LocalizationService : ILocalizationService
 	{

diff --git a/...cesImplementation/NetworkDrivesService.cs → ...iles.App/Services/NetworkDrivesService.cs b/...cesImplementation/NetworkDrivesService.cs → ...iles.App/Services/NetworkDrivesService.cs
@@ -1,14 +1,12 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Data.Items;
 using Files.App.Shell;
-using Files.Backend.Services;
 using Files.Sdk.Storage.LocatableStorage;
 using Vanara.PInvoke;
 using Vanara.Windows.Shell;
 
-namespace Files.App.ServicesImplementation
+namespace Files.App.Services
 {
 	public class NetworkDrivesService : INetworkDrivesService
 	{

diff --git a/...reviewPopupProviders/QuickLookProvider.cs → ...reviewPopupProviders/QuickLookProvider.cs b/...reviewPopupProviders/QuickLookProvider.cs → ...reviewPopupProviders/QuickLookProvider.cs
@@ -7,7 +7,7 @@
 using System.IO.Pipes;
 using System.Security.Principal;
 
-namespace Files.App.ServicesImplementation.PreviewPopupProviders
+namespace Files.App.Services.PreviewPopupProviders
 {
 	public class QuickLookProvider : IPreviewPopupProvider
 	{

diff --git a/.../PreviewPopupProviders/SeerProProvider.cs → .../PreviewPopupProviders/SeerProProvider.cs b/.../PreviewPopupProviders/SeerProProvider.cs → .../PreviewPopupProviders/SeerProProvider.cs
@@ -5,7 +5,7 @@
 using System.Runtime.InteropServices;
 using Vanara.PInvoke;
 
-namespace Files.App.ServicesImplementation.PreviewPopupProviders
+namespace Files.App.Services.PreviewPopupProviders
 {
 	public struct COPYDATASTRUCT
 	{

diff --git a/...icesImplementation/PreviewPopupService.cs → ...Files.App/Services/PreviewPopupService.cs b/...icesImplementation/PreviewPopupService.cs → ...Files.App/Services/PreviewPopupService.cs
@@ -1,10 +1,9 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.ServicesImplementation.PreviewPopupProviders;
-using Files.Backend.Services;
+using Files.App.Services.PreviewPopupProviders;
 
-namespace Files.App.ServicesImplementation
+namespace Files.App.Services
 {
 	/// <inheritdoc cref="IPreviewPopupService"/>
 	internal sealed class PreviewPopupService : ObservableObject, IPreviewPopupService

diff --git a/...vicesImplementation/QuickAccessService.cs → src/Files.App/Services/QuickAccessService.cs b/...vicesImplementation/QuickAccessService.cs → src/Files.App/Services/QuickAccessService.cs
@@ -2,19 +2,10 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.Filesystem.StorageItems;
-using Files.App.Helpers;
 using Files.App.Shell;
 using Files.App.UserControls.Widgets;
-using Files.Shared;
-using Files.Shared.Extensions;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Windows.UI.Input;
-
-namespace Files.App.ServicesImplementation
+
+namespace Files.App.Services
 {
 	internal class QuickAccessService : IQuickAccessService
 	{

diff --git a/...sImplementation/RemovableDrivesService.cs → ...es.App/Services/RemovableDrivesService.cs b/...sImplementation/RemovableDrivesService.cs → ...es.App/Services/RemovableDrivesService.cs
@@ -1,30 +1,19 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using CommunityToolkit.WinUI;
-using Files.App.Data.Items;
-using Files.App.Extensions;
-using Files.App.Filesystem;
-using Files.App.Helpers;
 using Files.App.Storage.WindowsStorage;
 using Files.Sdk.Storage.LocatableStorage;
-using Files.Shared.Enums;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using Windows.Storage;
-using static Files.App.Constants.Widgets;
 
-namespace Files.App.ServicesImplementation
+namespace Files.App.Services
 {
 	public class RemovableDrivesService : IRemovableDrivesService
 	{
 		public IStorageDeviceWatcher CreateWatcher()
 		{
-			return new WindowsStorageDeviceWatcher() as IStorageDeviceWatcher;
+			return new WindowsStorageDeviceWatcher();
 		}
 
 		public async IAsyncEnumerable<ILocatableFolder> GetDrivesAsync()

diff --git a/...ervicesImplementation/ResourcesService.cs → src/Files.App/Services/ResourcesService.cs b/...ervicesImplementation/ResourcesService.cs → src/Files.App/Services/ResourcesService.cs
@@ -1,12 +1,10 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Helpers;
-using Files.Backend.Services;
 using Microsoft.UI.Xaml;
 using System.Drawing;
 
-namespace Files.App.ServicesImplementation
+namespace Files.App.Services
 {
 	/// <inheritdoc cref="IResourcesService"/>
 	public class ResourcesService : IResourcesService

diff --git a/...ementation/Settings/AppSettingsService.cs → ...p/Services/Settings/AppSettingsService.cs b/...ementation/Settings/AppSettingsService.cs → ...p/Services/Settings/AppSettingsService.cs
@@ -6,7 +6,7 @@
 using Files.Shared.EventArguments;
 using Microsoft.AppCenter.Analytics;
 
-namespace Files.App.ServicesImplementation.Settings
+namespace Files.App.Services.Settings
 {
 	internal sealed class AppSettingsService : BaseObservableJsonSettings, IAppSettingsService
 	{

diff --git a/...ion/Settings/AppearanceSettingsService.cs → ...ces/Settings/AppearanceSettingsService.cs b/...ion/Settings/AppearanceSettingsService.cs → ...ces/Settings/AppearanceSettingsService.cs
@@ -8,7 +8,7 @@
 using Microsoft.UI.Composition.SystemBackdrops;
 using System;
 
-namespace Files.App.ServicesImplementation.Settings
+namespace Files.App.Services.Settings
 {
 	internal sealed class AppearanceSettingsService : BaseObservableJsonSettings, IAppearanceSettingsService
 	{

diff --git a/...on/Settings/ApplicationSettingsService.cs → ...es/Settings/ApplicationSettingsService.cs b/...on/Settings/ApplicationSettingsService.cs → ...es/Settings/ApplicationSettingsService.cs
@@ -4,7 +4,7 @@
 using Files.App.Serialization;
 using Files.Backend.Services.Settings;
 
-namespace Files.App.ServicesImplementation.Settings
+namespace Files.App.Services.Settings
 {
 	internal sealed class ApplicationSettingsService : BaseObservableJsonSettings, IApplicationSettingsService
 	{

diff --git a/...ation/Settings/FileTagsSettingsService.cs → ...vices/Settings/FileTagsSettingsService.cs b/...ation/Settings/FileTagsSettingsService.cs → ...vices/Settings/FileTagsSettingsService.cs
@@ -15,7 +15,7 @@
 using System.Linq;
 using Windows.Storage;
 
-namespace Files.App.ServicesImplementation.Settings
+namespace Files.App.Services.Settings
 {
 	internal sealed class FileTagsSettingsService : BaseJsonSettings, IFileTagsSettingsService
 	{