files-community · yaira2 · May 28, 2024 · May 26, 2024 · May 26, 2024 · May 28, 2024
diff --git a/src/Files.App.Storage/GlobalUsings.cs b/src/Files.App.Storage/GlobalUsings.cs
@@ -19,13 +19,13 @@
 
 global using global::Files.Core.Storage;
 global using global::Files.Core.Storage.Contracts;
-global using global::Files.Core.Storage.DirectStorage;
+global using global::Files.Core.Storage.Storables;
 global using global::Files.Core.Storage.Enums;
 global using global::Files.Core.Storage.EventArguments;
-global using global::Files.Core.Storage.ExtendableStorage;
 global using global::Files.Core.Storage.Extensions;
-global using global::Files.Core.Storage.LocatableStorage;
-global using global::Files.Core.Storage.ModifiableStorage;
-global using global::Files.Core.Storage.MutableStorage;
-global using global::Files.Core.Storage.NestedStorage;
 global using global::Files.Core.Storage.StorageEnumeration;
+
+// Files.App.Storage
+
+global using global::Files.App.Storage;
+global using global::Files.App.Storage.Storables;
diff --git a/src/Files.App.Storage/Storables/FtpStorage/FtpHelpers.cs b/src/Files.App.Storage/Storables/FtpStorage/FtpHelpers.cs
@@ -4,7 +4,7 @@
 using Files.Shared.Extensions;
 using FluentFTP;
 
-namespace Files.App.Storage.FtpStorage
+namespace Files.App.Storage.Storables
 {
 	internal static class FtpHelpers
 	{

diff --git a/src/Files.App.Storage/Storables/FtpStorage/FtpManager.cs b/src/Files.App.Storage/Storables/FtpStorage/FtpManager.cs
@@ -3,7 +3,7 @@
 
 using System.Net;
 
-namespace Files.App.Storage.FtpStorage
+namespace Files.App.Storage.Storables
 {
 	public static class FtpManager
 	{

diff --git a/src/Files.App.Storage/Storables/FtpStorage/FtpStorable.cs b/src/Files.App.Storage/Storables/FtpStorage/FtpStorable.cs
@@ -3,7 +3,7 @@
 
 using FluentFTP;
 
-namespace Files.App.Storage.FtpStorage
+namespace Files.App.Storage.Storables
 {
 	public abstract class FtpStorable : ILocatableStorable, INestedStorable
 	{

diff --git a/src/Files.App.Storage/Storables/FtpStorage/FtpStorageFile.cs b/src/Files.App.Storage/Storables/FtpStorage/FtpStorageFile.cs
@@ -3,7 +3,7 @@
 
 using System.IO;
 
-namespace Files.App.Storage.FtpStorage
+namespace Files.App.Storage.Storables
 {
 	public sealed class FtpStorageFile : FtpStorable, IModifiableFile, ILocatableFile, INestedFile
 	{

diff --git a/src/Files.App.Storage/Storables/FtpStorage/FtpStorageFolder.cs b/src/Files.App.Storage/Storables/FtpStorage/FtpStorageFolder.cs
@@ -6,7 +6,7 @@
 using System.IO;
 using System.Runtime.CompilerServices;
 
-namespace Files.App.Storage.FtpStorage
+namespace Files.App.Storage.Storables
 {
 	public sealed class FtpStorageFolder : FtpStorable, ILocatableFolder, IModifiableFolder, IFolderExtended, INestedFolder, IDirectCopy, IDirectMove
 	{

diff --git a/src/Files.App.Storage/Storables/FtpStorage/FtpStorageService.cs b/src/Files.App.Storage/Storables/FtpStorage/FtpStorageService.cs
@@ -4,7 +4,7 @@
 using FluentFTP;
 using System.IO;
 
-namespace Files.App.Storage.FtpStorage
+namespace Files.App.Storage.Storables
 {
 	/// <inheritdoc cref="IFtpStorageService"/>
 	public sealed class FtpStorageService : IFtpStorageService

diff --git a/src/Files.App.Storage/Storables/NativeStorage/NativeFile.cs b/src/Files.App.Storage/Storables/NativeStorage/NativeFile.cs
@@ -3,7 +3,7 @@
 
 using System.IO;
 
-namespace Files.App.Storage.NativeStorage
+namespace Files.App.Storage.Storables
 {
 	/// <inheritdoc cref="IFile"/>
 	public class NativeFile : NativeStorable<FileInfo>, ILocatableFile, IModifiableFile, IFileExtended, INestedFile

diff --git a/src/Files.App.Storage/Storables/NativeStorage/NativeFolder.cs b/src/Files.App.Storage/Storables/NativeStorage/NativeFolder.cs
@@ -4,7 +4,7 @@
 using System.IO;
 using System.Runtime.CompilerServices;
 
-namespace Files.App.Storage.NativeStorage
+namespace Files.App.Storage.Storables
 {
 	/// <inheritdoc cref="IFolder"/>
 	public class NativeFolder : NativeStorable<DirectoryInfo>, ILocatableFolder, IModifiableFolder, IMutableFolder, IFolderExtended, INestedFolder, IDirectCopy, IDirectMove

diff --git a/src/Files.App.Storage/Storables/NativeStorage/NativeStorable.cs b/src/Files.App.Storage/Storables/NativeStorage/NativeStorable.cs
@@ -3,7 +3,7 @@
 
 using System.IO;
 
-namespace Files.App.Storage.NativeStorage
+namespace Files.App.Storage.Storables
 {
 	/// <inheritdoc cref="IStorable"/>
 	public abstract class NativeStorable<TStorage> : ILocatableStorable, INestedStorable

diff --git a/src/Files.App.Storage/Storables/NativeStorage/NativeStorageService.cs b/src/Files.App.Storage/Storables/NativeStorage/NativeStorageService.cs
@@ -5,7 +5,7 @@
 using System.IO;
 using Windows.Storage;
 
-namespace Files.App.Storage.NativeStorage
+namespace Files.App.Storage.Storables
 {
 	/// <inheritdoc cref="IStorageService"/>
 	public sealed class NativeStorageService : IStorageService

diff --git a/src/Files.App.Storage/Storables/WindowsStorage/WindowsStorable.cs b/src/Files.App.Storage/Storables/WindowsStorage/WindowsStorable.cs
@@ -4,7 +4,7 @@
 using Files.Shared.Helpers;
 using Windows.Storage;
 
-namespace Files.App.Storage.WindowsStorage
+namespace Files.App.Storage.Storables
 {
 	/// <inheritdoc cref="IStorable"/>
 	public abstract class WindowsStorable<TStorage> : ILocatableStorable, INestedStorable

diff --git a/src/Files.App.Storage/Storables/WindowsStorage/WindowsStorageFile.cs b/src/Files.App.Storage/Storables/WindowsStorage/WindowsStorageFile.cs
@@ -4,7 +4,7 @@
 using System.IO;
 using Windows.Storage;
 
-namespace Files.App.Storage.WindowsStorage
+namespace Files.App.Storage.Storables
 {
 	/// <inheritdoc cref="IFile"/>
 	public sealed class WindowsStorageFile : WindowsStorable<StorageFile>, ILocatableFile, IModifiableFile, IFileExtended, INestedFile

diff --git a/src/Files.App.Storage/Storables/WindowsStorage/WindowsStorageFolder.cs b/src/Files.App.Storage/Storables/WindowsStorage/WindowsStorageFolder.cs
@@ -4,7 +4,7 @@
 using System.Runtime.CompilerServices;
 using Windows.Storage;
 
-namespace Files.App.Storage.WindowsStorage
+namespace Files.App.Storage.Storables
 {
 	/// <inheritdoc cref="IFolder"/>
 	public sealed class WindowsStorageFolder : WindowsStorable<StorageFolder>, ILocatableFolder, IFolderExtended, INestedFolder, IDirectCopy, IDirectMove

diff --git a/src/Files.App.Storage/Storables/WindowsStorage/WindowsStorageService.cs b/src/Files.App.Storage/Storables/WindowsStorage/WindowsStorageService.cs
@@ -3,7 +3,7 @@
 
 using Windows.Storage;
 
-namespace Files.App.Storage.WindowsStorage
+namespace Files.App.Storage.Storables
 {
 	/// <inheritdoc cref="IStorageService"/>
 	internal sealed class WindowsStorageService : IStorageService

diff --git a/src/Files.App/Data/AppModels/SingleFileDatabaseModel.cs b/src/Files.App/Data/AppModels/SingleFileDatabaseModel.cs
@@ -1,6 +1,6 @@
 using Files.Core.Storage;
 using Files.Core.Storage.Extensions;
-using Files.Core.Storage.ModifiableStorage;
+using Files.Core.Storage.Storables;
 using Files.Shared.Extensions;
 using Files.Shared.Utils;
 using System.IO;

diff --git a/...vices/Settings/IActionsSettingsService.cs → ...Data/Contracts/IActionsSettingsService.cs b/...vices/Settings/IActionsSettingsService.cs → ...Data/Contracts/IActionsSettingsService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services.Settings
+namespace Files.App.Data.Contracts
 {
 	internal interface IActionsSettingsService : IBaseSettingsService, INotifyPropertyChanged
 	{

diff --git a/.../Services/Settings/IAppSettingsService.cs → ...App/Data/Contracts/IAppSettingsService.cs b/.../Services/Settings/IAppSettingsService.cs → ...App/Data/Contracts/IAppSettingsService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services.Settings
+namespace Files.App.Data.Contracts
 {
 	public interface IAppSettingsService : IBaseSettingsService, INotifyPropertyChanged
 	{

diff --git a/...es/Settings/IAppearanceSettingsService.cs → ...a/Contracts/IAppearanceSettingsService.cs b/...es/Settings/IAppearanceSettingsService.cs → ...a/Contracts/IAppearanceSettingsService.cs
@@ -4,7 +4,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 
-namespace Files.App.Services.Settings
+namespace Files.App.Data.Contracts
 {
 	public interface IAppearanceSettingsService : IBaseSettingsService, INotifyPropertyChanged
 	{

diff --git a/...s/Settings/IApplicationSettingsService.cs → .../Contracts/IApplicationSettingsService.cs b/...s/Settings/IApplicationSettingsService.cs → .../Contracts/IApplicationSettingsService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services.Settings
+namespace Files.App.Data.Contracts
 {
 	public interface IApplicationSettingsService : IBaseSettingsService
 	{

diff --git a/...Services/Settings/IBaseSettingsService.cs → ...pp/Data/Contracts/IBaseSettingsService.cs b/...Services/Settings/IBaseSettingsService.cs → ...pp/Data/Contracts/IBaseSettingsService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services.Settings
+namespace Files.App.Data.Contracts
 {
 	public interface IBaseSettingsService
 	{

diff --git a/...ices/Settings/IDevToolsSettingsService.cs → ...ata/Contracts/IDevToolsSettingsService.cs b/...ices/Settings/IDevToolsSettingsService.cs → ...ata/Contracts/IDevToolsSettingsService.cs
@@ -4,7 +4,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
 
-namespace Files.App.Services.Settings
+namespace Files.App.Data.Contracts
 {
 	public interface IDevToolsSettingsService : IBaseSettingsService, INotifyPropertyChanged
 	{

diff --git a/src/Files.App/Data/Contracts/IFileExplorerService.cs b/src/Files.App/Data/Contracts/IFileExplorerService.cs
diff --git a/src/Files.App/Data/Contracts/IFileTagsService.cs b/src/Files.App/Data/Contracts/IFileTagsService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage.LocatableStorage;
+using Files.Core.Storage.Storables;
 
 namespace Files.App.Data.Contracts
 {

diff --git a/...ices/Settings/IFileTagsSettingsService.cs → ...ata/Contracts/IFileTagsSettingsService.cs b/...ices/Settings/IFileTagsSettingsService.cs → ...ata/Contracts/IFileTagsSettingsService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services.Settings
+namespace Files.App.Data.Contracts
 {
 	public interface IFileTagsSettingsService : IBaseSettingsService
 	{

diff --git a/...vices/Settings/IFoldersSettingsService.cs → ...Data/Contracts/IFoldersSettingsService.cs b/...vices/Settings/IFoldersSettingsService.cs → ...Data/Contracts/IFoldersSettingsService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services.Settings
+namespace Files.App.Data.Contracts
 {
 	public interface IFoldersSettingsService : IBaseSettingsService, INotifyPropertyChanged
 	{

diff --git a/...vices/Settings/IGeneralSettingsService.cs → ...Data/Contracts/IGeneralSettingsService.cs b/...vices/Settings/IGeneralSettingsService.cs → ...Data/Contracts/IGeneralSettingsService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services.Settings
+namespace Files.App.Data.Contracts
 {
 	public interface IGeneralSettingsService : IBaseSettingsService, INotifyPropertyChanged
 	{

diff --git a/...ices/Settings/IInfoPaneSettingsService.cs → ...ata/Contracts/IInfoPaneSettingsService.cs b/...ices/Settings/IInfoPaneSettingsService.cs → ...ata/Contracts/IInfoPaneSettingsService.cs
@@ -3,7 +3,7 @@
 
 using System.ComponentModel;
 
-namespace Files.App.Services.Settings
+namespace Files.App.Data.Contracts
 {
 	public interface IInfoPaneSettingsService : IBaseSettingsService, INotifyPropertyChanged
 	{

diff --git a/...rvices/Settings/ILayoutSettingsService.cs → .../Data/Contracts/ILayoutSettingsService.cs b/...rvices/Settings/ILayoutSettingsService.cs → .../Data/Contracts/ILayoutSettingsService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services.Settings
+namespace Files.App.Data.Contracts
 {
 	public interface ILayoutSettingsService : IBaseSettingsService, INotifyPropertyChanged
 	{

diff --git a/src/Files.App/Data/Contracts/IRemovableDrivesService.cs b/src/Files.App/Data/Contracts/IRemovableDrivesService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage.LocatableStorage;
+using Files.Core.Storage.Storables;
 
 namespace Files.App.Data.Contracts
 {

diff --git a/...Services/Settings/IUserSettingsService.cs → ...pp/Data/Contracts/IUserSettingsService.cs b/...Services/Settings/IUserSettingsService.cs → ...pp/Data/Contracts/IUserSettingsService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Services.Settings
+namespace Files.App.Data.Contracts
 {
 	public interface IUserSettingsService : IBaseSettingsService
 	{

diff --git a/src/Files.App/Data/Contracts/IVolumeInfoFactory.cs b/src/Files.App/Data/Contracts/IVolumeInfoFactory.cs
diff --git a/src/Files.App/Data/Contracts/ImagingService.cs b/src/Files.App/Data/Contracts/ImagingService.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.Core.Storage;
-using Files.Core.Storage.LocatableStorage;
+using Files.Core.Storage.Storables;
 using Files.Shared.Utils;
 using Windows.Storage.FileProperties;
 

diff --git a/src/Files.App/Data/Items/DriveItem.cs b/src/Files.App/Data/Items/DriveItem.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Storage.WindowsStorage;
+using Files.App.Storage.Storables;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Imaging;

diff --git a/src/Files.App/Data/Models/DrivesViewModel.cs b/src/Files.App/Data/Models/DrivesViewModel.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.Services.SizeProvider;
-using Files.Core.Storage.LocatableStorage;
+using Files.Core.Storage.Storables;
 using Microsoft.Extensions.Logging;
 using System.IO;
 

diff --git a/src/Files.App/Data/Models/IStorageDeviceWatcher.cs b/src/Files.App/Data/Models/IStorageDeviceWatcher.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Core.Storage.LocatableStorage;
+using Files.Core.Storage.Storables;
 using System;
 
 namespace Files.App.Data.Models

diff --git a/src/Files.App/GlobalUsings.cs b/src/Files.App/GlobalUsings.cs
@@ -61,6 +61,7 @@
 global using global::Files.App.Data.Enums;
 global using global::Files.App.Data.Messages;
 global using global::Files.App.Services.DateTimeFormatter;
+global using global::Files.App.Services.PreviewPopupProviders;
 global using global::Files.App.Services.Settings;
 global using global::Files.App.ViewModels.Dialogs;
 global using global::Files.App.ViewModels.Dialogs.AddItemDialog;
@@ -72,15 +73,10 @@
 
 global using global::Files.Core.Storage;
 global using global::Files.Core.Storage.Contracts;
-global using global::Files.Core.Storage.DirectStorage;
+global using global::Files.Core.Storage.Storables;
 global using global::Files.Core.Storage.Enums;
 global using global::Files.Core.Storage.EventArguments;
-global using global::Files.Core.Storage.ExtendableStorage;
 global using global::Files.Core.Storage.Extensions;
-global using global::Files.Core.Storage.LocatableStorage;
-global using global::Files.Core.Storage.ModifiableStorage;
-global using global::Files.Core.Storage.MutableStorage;
-global using global::Files.Core.Storage.NestedStorage;
 global using global::Files.Core.Storage.StorageEnumeration;
 
 // Files.Shared

diff --git a/src/Files.App/Helpers/Application/AppLifecycleHelper.cs b/src/Files.App/Helpers/Application/AppLifecycleHelper.cs
@@ -4,8 +4,8 @@
 using CommunityToolkit.WinUI.Notifications;
 using Files.App.Services.DateTimeFormatter;
 using Files.App.Services.Settings;
-using Files.App.Storage.FtpStorage;
-using Files.App.Storage.NativeStorage;
+using Files.App.Storage.Storables;
+using Files.App.Storage.Storables;
 using Files.App.ViewModels.Settings;
 using Files.App.Services.SizeProvider;
 using Files.Core.Storage;
@@ -185,7 +185,6 @@ public static IHost ConfigureHost()
 					.AddSingleton<IPreviewPopupService, PreviewPopupService>()
 					.AddSingleton<IDateTimeFormatterFactory, DateTimeFormatterFactory>()
 					.AddSingleton<IDateTimeFormatter, UserDateTimeFormatter>()
-					.AddSingleton<IVolumeInfoFactory, VolumeInfoFactory>()
 					.AddSingleton<ISizeProvider, UserSizeProvider>()
 					.AddSingleton<IQuickAccessService, QuickAccessService>()
 					.AddSingleton<IResourcesService, ResourcesService>()