Code Quality: Cleaned up Files.Backend

src/Files.App/Actions/FileSystem/CreateFolderAction.cs

@@ -6,7 +6,6 @@
 using Files.App.Contexts;
 using Files.App.Extensions;
 using Files.App.Helpers;
-using Files.Backend.Enums;
 using System.ComponentModel;
 using System.Threading.Tasks;
 

src/Files.App/App.xaml.cs

@@ -20,9 +20,6 @@
 using Files.App.ViewModels;
 using Files.App.ViewModels.Settings;
 using Files.App.Views;
-using Files.Backend.Enums;
-using Files.Backend.Services;
-using Files.Backend.Services.Settings;
 using Files.Backend.Services.SizeProvider;
 using Files.Sdk.Storage;
 using Files.Shared;

src/Files.App/Data/Items/DriveItem.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using ByteSizeLib;
-using CommunityToolkit.WinUI;
 using Files.App.Storage.WindowsStorage;
 using Files.Sdk.Storage;
 using Files.Sdk.Storage.Enums;
@@ -11,6 +10,7 @@
 using Microsoft.UI.Xaml.Media.Imaging;
 using Windows.Storage;
 using Windows.Storage.Streams;
+using ByteSize = ByteSizeLib.ByteSize;
 
 namespace Files.App.Data.Items
 {

src/Files.App/Data/Items/NavigationViewItemButtonStyleItem.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Backend.Enums;
 using Microsoft.UI.Xaml;
 
 namespace Files.App.Data.Items

src/Files.App/Data/Models/BitmapImageModel.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Backend.Models;
 using Microsoft.UI.Xaml.Media.Imaging;
 
 namespace Files.App.Data.Models

src/Files.App/Data/Models/DrivesViewModel.cs

@@ -1,8 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Backend.Models;
-using Files.Backend.Services;
 using Files.Backend.Services.SizeProvider;
 using Files.Sdk.Storage.LocatableStorage;
 using Microsoft.Extensions.Logging;

src/Files.App/Dialogs/CreateArchiveDialog.xaml.cs

@@ -1,19 +1,9 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using CommunityToolkit.Mvvm.ComponentModel;
-using Files.App.Extensions;
-using Files.App.Filesystem;
-using Files.App.Filesystem.Archive;
-using Files.Backend.Models;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.ComponentModel;
-using System.Linq;
-using System.Threading.Tasks;
 using Windows.Foundation.Metadata;
 
 namespace Files.App.Dialogs

src/Files.App/Dialogs/CredentialDialog.xaml.cs

@@ -1,15 +1,8 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Backend.SecureStore;
-using Files.Backend.ViewModels.Dialogs;
-using Files.Shared.Enums;
 using Microsoft.UI.Xaml.Controls;
-using System;
 using System.Text;
-using System.Threading.Tasks;
-
-// The Content Dialog item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
 
 namespace Files.App.Dialogs
 {

src/Files.App/Dialogs/DecompressArchiveDialog.xaml.cs

@@ -2,12 +2,9 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.ViewModels.Dialogs;
-using Files.Backend.SecureStore;
 using Microsoft.UI.Xaml.Controls;
 using System.Text;
 
-// The Content Dialog item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
-
 namespace Files.App.Dialogs
 {
 	public sealed partial class DecompressArchiveDialog : ContentDialog

src/Files.App/Extensions/StringExtensions.cs

@@ -2,12 +2,10 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using ByteSizeLib;
-using Files.Shared.Extensions;
 using Microsoft.Windows.ApplicationModel.Resources;
-using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.IO;
+using ByteSize = ByteSizeLib.ByteSize;
 
 namespace Files.App.Extensions
 {

src/Files.App/Filesystem/StorageFileHelpers/IStorageItemWithPath.cs

@@ -8,9 +8,11 @@ namespace Files.App.Filesystem
 	public interface IStorageItemWithPath
 	{
 		public string Name { get; }
+
 		public string Path { get; }
 
 		public IStorageItem Item { get; }
+
 		public FilesystemItemType ItemType { get; }
 	}
 }

src/Files.App/Filesystem/WindowsStorageDeviceWatcher.cs

@@ -4,7 +4,6 @@
 using Files.App.Data.Items;
 using Files.App.Helpers;
 using Files.App.Helpers.MMI;
-using Files.Backend.Models;
 using Files.Sdk.Storage.LocatableStorage;
 using Microsoft.Extensions.Logging;
 using System;

src/Files.App/GlobalUsings.cs

@@ -35,9 +35,25 @@
 global using global::Files.App.Views;
 global using global::Files.App.Views.LayoutModes;
 global using global::Files.App.Views.Shells;
-global using global::Files.Backend.Enums;
+
+// Files.Backend
 global using global::Files.Backend.CommandLine;
+global using global::Files.Backend.Data.Enums;
+global using global::Files.Backend.Data.Messages;
+global using global::Files.Backend.Data.Models;
+global using global::Files.Backend.Extensions;
+global using global::Files.Backend.Helpers;
+global using global::Files.Backend.Services;
 global using global::Files.Backend.Services.Settings;
+//global using global::Files.Backend.Services.SizeProvider;
+global using global::Files.Backend.ViewModels;
+global using global::Files.Backend.ViewModels.Dialogs;
+global using global::Files.Backend.ViewModels.Dialogs.AddItemDialog;
+global using global::Files.Backend.ViewModels.Dialogs.FileSystemDialog;
+global using global::Files.Backend.ViewModels.FileTags;
+global using global::Files.Backend.ViewModels.Widgets;
+
+// Files.Shared
 global using global::Files.Shared;
 global using global::Files.Shared.Enums;
 global using global::Files.Shared.Extensions;

src/Files.App/Helpers/EnvHelpers.cs

@@ -1,11 +1,5 @@
-using Files.Backend.Enums;
-using Microsoft.Extensions.Hosting;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.ApplicationModel;
+// Copyright (c) 2023 Files Community
+// Licensed under the MIT License. See the LICENSE.
 
 namespace Files.App.Helpers
 {

src/Files.App/Helpers/UIFilesystemHelpers.cs

@@ -4,9 +4,6 @@
 using Files.App.Dialogs;
 using Files.App.Filesystem.StorageItems;
 using Files.App.ViewModels.Dialogs;
-using Files.Backend.Enums;
-using Files.Backend.Extensions;
-using Files.Backend.Services;
 using Microsoft.Extensions.Logging;
 using System.Collections.Concurrent;
 using System.IO;

src/Files.App/Interacts/BaseLayoutCommandImplementationModel.cs

@@ -3,25 +3,10 @@
 
 #nullable disable warnings
 
-using CommunityToolkit.Mvvm.DependencyInjection;
-using CommunityToolkit.WinUI;
-using Files.App.Extensions;
-using Files.App.Filesystem;
 using Files.App.Filesystem.StorageItems;
-using Files.App.Helpers;
-using Files.App.ServicesImplementation;
-using Files.App.ViewModels;
-using Files.App.Views;
-using Files.Backend.Enums;
-using Files.Shared;
-using Files.Shared.Enums;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Input;
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.ApplicationModel.DataTransfer.DragDrop;
 using Windows.Storage;

src/Files.App/ServicesImplementation/FileTagsService.cs

@@ -1,20 +1,10 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using CommunityToolkit.Mvvm.DependencyInjection;
-using Files.App.Filesystem;
-using Files.Backend.AppModels;
-using Files.Backend.Services;
-using Files.Backend.Services.Settings;
-using Files.Backend.ViewModels.FileTags;
 using Files.Sdk.Storage;
 using Files.Sdk.Storage.Extensions;
 using Files.Sdk.Storage.LocatableStorage;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Files.App.ServicesImplementation
 {

src/Files.App/ServicesImplementation/ImagingService.cs

@@ -1,8 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Backend.Models;
-using Files.Backend.Services;
 using Files.Sdk.Storage;
 using Files.Sdk.Storage.LocatableStorage;
 using Windows.Storage.FileProperties;

src/Files.App/ServicesImplementation/RemovableDrivesService.cs

@@ -7,8 +7,6 @@
 using Files.App.Filesystem;
 using Files.App.Helpers;
 using Files.App.Storage.WindowsStorage;
-using Files.Backend.Models;
-using Files.Backend.Services;
 using Files.Sdk.Storage.LocatableStorage;
 using Files.Shared.Enums;
 using Microsoft.Extensions.Logging;

src/Files.App/ServicesImplementation/VolumeInfoFactory.cs

@@ -2,8 +2,6 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using Files.App.Helpers;
-using Files.Backend.Models;
-using Files.Backend.Services;
 
 namespace Files.App.ServicesImplementation
 {

src/Files.App/UserControls/Settings/SettingsDisplayControl.xaml.cs

@@ -79,4 +79,4 @@ private void MainPanel_SizeChanged(object sender, SizeChangedEventArgs e)
 			VisualStateManager.GoToState(this, stateToGoName, false);
 		}
 	}
-}
+}

src/Files.App/ViewModels/Dialogs/DecompressArchiveDialogViewModel.cs

@@ -1,7 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Backend.SecureStore;
 using System.IO;
 using System.Windows.Input;
 using Windows.Storage;

src/Files.App/ViewModels/Properties/HashesViewModel.cs

@@ -1,11 +1,12 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+// Copyright (c) 2023 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.WinUI;
 using Files.App.Extensions;
 using Files.App.Filesystem;
-using Files.Backend.Models;
-using Files.Backend.Services.Settings;
 using Files.Shared.Extensions;
 using Files.Shared.Helpers;
 using System;

src/Files.App/ViewModels/Properties/Items/FolderProperties.cs

@@ -1,17 +1,13 @@
+// Copyright (c) 2023 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
 using ByteSizeLib;
-using CommunityToolkit.Mvvm.Input;
-using CommunityToolkit.WinUI;
-using Files.App.Extensions;
-using Files.App.Filesystem;
 using Files.App.Filesystem.StorageItems;
-using Files.App.Helpers;
 using Files.App.Shell;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Dispatching;
-using System;
 using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
+using ByteSize = ByteSizeLib.ByteSize;
 
 namespace Files.App.ViewModels.Properties
 {

src/Files.App/ViewModels/Properties/MainPropertiesViewModel.cs

@@ -1,16 +1,10 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.DependencyInjection;
-using CommunityToolkit.Mvvm.Input;
+// Copyright (c) 2023 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
 using Files.App.Views.Properties;
-using Files.Backend.Enums;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using System;
-using System.Collections.ObjectModel;
-using System.Threading.Tasks;
-using System.Linq;
-using System.Threading;
 using Microsoft.UI.Xaml.Media.Animation;
 
 namespace Files.App.ViewModels.Properties

src/Files.App/ViewModels/Widgets/FileTagsItemViewModel.cs

@@ -1,19 +1,19 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.Backend.Models;
 using Files.Sdk.Storage.Extensions;
 using Files.Sdk.Storage.LocatableStorage;
-using Files.Backend.Helpers;
 using Files.App.UserControls.Widgets;
 
 namespace Files.App.ViewModels.Widgets
 {
 	public sealed partial class FileTagsItemViewModel : WidgetCardItem
 	{
 		private readonly ILocatableStorable _associatedStorable;
-		private readonly Func<string, Task> _openAction;	// A workaround for lack of MVVM-compliant navigation support.
-															// This workaround must be kept until further refactor of navigation code is completed
+
+		// A workaround for lack of MVVM-compliant navigation support.
+		// This workaround must be kept until further refactor of navigation code is completed.
+		private readonly Func<string, Task> _openAction;
 
 		[ObservableProperty]
 		private IImageModel? _Icon;

src/Files.App/Views/Properties/HashesPage.xaml

@@ -4,9 +4,9 @@
 	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"
+	xmlns:datamodels="using:Files.Backend.Data.Models"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:models="using:Files.Backend.Models"
 	xmlns:toolkitconverters="using:CommunityToolkit.WinUI.UI.Converters"
 	xmlns:vm="using:Files.App.ViewModels.Properties"
 	DataContext="{x:Bind HashesViewModel, Mode=OneWay}"
@@ -129,7 +129,7 @@
 
 				<!--  Template  -->
 				<ListView.ItemTemplate>
-					<DataTemplate x:DataType="models:HashInfoItem">
+					<DataTemplate x:DataType="datamodels:HashInfoItem">
 						<ListViewItem IsSelected="{x:Bind IsSelected, Mode=TwoWay}" Visibility="{x:Bind IsEnabled, Mode=OneWay}">
 							<Grid ColumnSpacing="12">
 								<Grid.ColumnDefinitions>

src/Files.App/Views/Properties/HashesPage.xaml.cs

@@ -34,7 +34,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
 
 		private void CopyHashButton_Click(object sender, RoutedEventArgs e)
 		{
-			var item = (Backend.Models.HashInfoItem)(((Button)sender).DataContext);
+			var item = (HashInfoItem)(((Button)sender).DataContext);
 
 			var dp = new Windows.ApplicationModel.DataTransfer.DataPackage();
 			dp.SetText(item.HashValue);