Code Quality: Introduce a new data storage namespace (#12233)

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

@@ -4,7 +4,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Files.App.Contexts;
-using Files.App.DataModels.NavigationControlItems;
+using Files.App.Data.Items;
 using Files.App.Extensions;
 using Files.App.Shell;
 using Files.App.ViewModels;

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

@@ -5,7 +5,7 @@
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Files.App.Commands;
 using Files.App.Contexts;
-using Files.App.DataModels;
+using Files.App.Data.Models;
 using Files.App.Extensions;
 using Files.App.Helpers;
 using System.ComponentModel;

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

@@ -4,7 +4,7 @@
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Files.App.Commands;
 using Files.App.Contexts;
-using Files.App.DataModels;
+using Files.App.Data.Models;
 using Files.App.Extensions;
 using Files.App.Filesystem;
 using Files.App.Helpers;

src/Files.App/App.xaml.cs

@@ -4,7 +4,7 @@
 using CommunityToolkit.WinUI.Notifications;
 using Files.App.Commands;
 using Files.App.Contexts;
-using Files.App.DataModels;
+using Files.App.Data.Models;
 using Files.App.Extensions;
 using Files.App.Filesystem;
 using Files.App.Filesystem.Cloud;

src/Files.App/BaseLayout.cs

@@ -28,6 +28,8 @@
 using VA = Vanara.Windows.Shell;
 using DispatcherQueueTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer;
 using SortDirection = Files.Shared.Enums.SortDirection;
+using Files.App.Data.EventArguments;
+using Files.App.Data.Models;
 
 namespace Files.App
 {

src/Files.App/EventArguments/Bundles/BundlesOpenPathEventArgs.cs → src/Files.App/Data/EventArguments/Bundles/BundlesOpenPathEventArgs.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.EventArguments.Bundles
+namespace Files.App.Data.EventArguments.Bundles
 {
 	public class BundlesOpenPathEventArgs
 	{

src/Files.App/EventArguments/LayoutModeEventArgs.cs → src/Files.App/Data/EventArguments/LayoutModeEventArgs.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.EventArguments
+namespace Files.App.Data.EventArguments
 {
 	public class LayoutModeEventArgs
 	{

src/Files.App/EventArguments/LayoutPreferenceEventArgs.cs → src/Files.App/Data/EventArguments/LayoutPreferenceEventArgs.cs

@@ -3,7 +3,7 @@
 
 using Files.App.Helpers.LayoutPreferences;
 
-namespace Files.App.EventArguments
+namespace Files.App.Data.EventArguments
 {
 	public class LayoutPreferenceEventArgs
 	{

src/Files.App/DataModels/SecurityAdvancedAccessControlItemFactory.cs → src/Files.App/Data/Factories/SecurityAdvancedAccessControlItemFactory.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
-namespace Files.App.DataModels
+namespace Files.App.Data.Factories
 {
 	public static class SecurityAdvancedAccessControlItemFactory
 	{

src/Files.App/DataModels/NavigationControlItems/DriveItem.cs → src/Files.App/Data/Items/DriveItem.cs

@@ -12,7 +12,7 @@
 using Windows.Storage;
 using Windows.Storage.Streams;
 
-namespace Files.App.DataModels.NavigationControlItems
+namespace Files.App.Data.Items
 {
 	public class DriveItem : ObservableObject, INavigationControlItem, ILocatableFolder
 	{
@@ -212,7 +212,7 @@ public async Task UpdatePropertiesAsync()
 					SpaceText = GetSizeString();
 
 					if (MaxSpace.Bytes > 0 && FreeSpace.Bytes > 0) // Make sure we don't divide by 0
-						PercentageUsed = 100.0f - ((float)(FreeSpace.Bytes / MaxSpace.Bytes) * 100.0f);
+						PercentageUsed = 100.0f - (float)(FreeSpace.Bytes / MaxSpace.Bytes) * 100.0f;
 				}
 				else
 				{

src/Files.App/DataModels/NavigationControlItems/FileTagItem.cs → src/Files.App/Data/Items/FileTagItem.cs

@@ -3,7 +3,7 @@
 
 using Files.Backend.ViewModels.FileTags;
 
-namespace Files.App.DataModels.NavigationControlItems
+namespace Files.App.Data.Items
 {
 	public class FileTagItem : INavigationControlItem
 	{

src/Files.App/DataModels/NavigationControlItems/INavigationControlItem.cs → src/Files.App/Data/Items/INavigationControlItem.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Filesystem
+namespace Files.App.Data.Items
 {
 	public interface INavigationControlItem : IComparable<INavigationControlItem>
 	{

src/Files.App/DataModels/NavigationControlItems/LocationItem.cs → src/Files.App/Data/Items/LocationItem.cs

@@ -6,7 +6,7 @@
 using Microsoft.UI.Xaml.Media.Imaging;
 using System.IO;
 
-namespace Files.App.DataModels.NavigationControlItems
+namespace Files.App.Data.Items
 {
 	public class LocationItem : ObservableObject, INavigationControlItem
 	{

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

@@ -1,11 +1,10 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using CommunityToolkit.Mvvm.ComponentModel;
 using Files.Backend.Enums;
 using Microsoft.UI.Xaml;
 
-namespace Files.App.DataModels
+namespace Files.App.Data.Items
 {
 	public class NavigationViewItemButtonStyleItem : ObservableObject
 	{

src/Files.App/DataModels/PropertiesNavigationViewItemFactory.cs → src/Files.App/Data/Items/PropertiesNavigationViewItemFactory.cs

@@ -1,17 +1,11 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using System.Collections.ObjectModel;
-using Files.App.DataModels.NavigationControlItems;
-using Files.App.Extensions;
-using Files.App.Filesystem;
 using Files.Backend.Enums;
 using Files.Backend.Helpers;
 using Microsoft.UI.Xaml;
-using System.Collections.Generic;
-using System.Linq;
 
-namespace Files.App.DataModels
+namespace Files.App.Data.Items
 {
 	public static class PropertiesNavigationViewItemFactory
 	{
@@ -102,7 +96,7 @@ public static ObservableCollection<NavigationViewItemButtonStyleItem> Initialize
 				var securityItemEnabled = !isLibrary && !listedItem.IsRecycleBinItem;
 				var hashItemEnabled = !(isFolder && !listedItem.IsArchive) && !isLibrary && !listedItem.IsRecycleBinItem;
 				var detailsItemEnabled = fileExt is not null && !isShortcut && !isLibrary;
-				var customizationItemEnabled = !isLibrary && ((isFolder && !listedItem.IsArchive) || (isShortcut && !listedItem.IsLinkItem));
+				var customizationItemEnabled = !isLibrary && (isFolder && !listedItem.IsArchive || isShortcut && !listedItem.IsLinkItem);
 				var compatibilityItemEnabled = FileExtensionHelpers.IsExecutableFile(listedItem is ShortcutItem sht ? sht.TargetPath : fileExt, true);
 
 				if (!securityItemEnabled)

src/Files.App/DataModels/NavigationControlItems/WslDistroItem.cs → src/Files.App/Data/Items/WslDistroItem.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.DataModels.NavigationControlItems
+namespace Files.App.Data.Items
 {
 	public class WslDistroItem : INavigationControlItem
 	{

src/Files.App/DataModels/AppModel.cs → src/Files.App/Data/Models/AppModel.cs

@@ -5,7 +5,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Windows.ApplicationModel.DataTransfer;
 
-namespace Files.App.DataModels
+namespace Files.App.Data.Models
 {
 	public class AppModel : ObservableObject
 	{

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

@@ -4,7 +4,7 @@
 using Files.Backend.Models;
 using Microsoft.UI.Xaml.Media.Imaging;
 
-namespace Files.App.AppModels
+namespace Files.App.Data.Models
 {
 	/// <inheritdoc cref="IImageModel"/>
 	internal sealed class BitmapImageModel : IImageModel

src/Files.App/DataModels/SidebarPinnedModel.cs → src/Files.App/Data/Models/SidebarPinnedModel.cs

@@ -2,15 +2,15 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using CommunityToolkit.WinUI;
-using Files.App.DataModels.NavigationControlItems;
+using Files.App.Data.Items;
 using Files.App.ServicesImplementation;
 using Files.App.UserControls.Widgets;
 using System.Collections.Specialized;
 using System.IO;
 using System.Text.Json.Serialization;
 using Windows.Storage.FileProperties;
 
-namespace Files.App.DataModels
+namespace Files.App.Data.Models
 {
 	public class SidebarPinnedModel
 	{

src/Files.App/DataModels/SuggestionModel.cs → src/Files.App/Data/Models/SuggestionModel.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.UI.Xaml.Media.Imaging;
 
-namespace Files.App.DataModels
+namespace Files.App.Data.Models
 {
 	public class SuggestionModel : ObservableObject
 	{

src/Files.App/DataModels/PropertiesPageNavigationParameter.cs → src/Files.App/Data/Parameters/PropertiesPageNavigationParameter.cs

@@ -5,7 +5,7 @@
 using Microsoft.UI.Xaml;
 using System.Threading;
 
-namespace Files.App.DataModels
+namespace Files.App.Data.Parameters
 {
 	public class PropertiesPageNavigationParameter
 	{

src/Files.App/Dialogs/ReorderSidebarItemsDialog.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:dataitems="using:Files.App.Data.Items"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:navigationcontrolitems="using:Files.App.DataModels.NavigationControlItems"
 	Title="{helpers:ResourceString Name=ReorderSidebarItemsDialogText}"
 	DefaultButton="Primary"
 	IsPrimaryButtonEnabled="True"
@@ -34,7 +34,7 @@
 			Grid.Row="1"
 			ItemsSource="{x:Bind ViewModel.SidebarFavoriteItems, Mode=OneWay}">
 			<ListView.ItemTemplate>
-				<DataTemplate x:DataType="navigationcontrolitems:LocationItem">
+				<DataTemplate x:DataType="dataitems:LocationItem">
 					<Grid
 						AllowDrop="True"
 						AutomationProperties.AutomationId="{x:Bind Text}"

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

@@ -2,7 +2,7 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using CommunityToolkit.WinUI.UI;
-using Files.App.DataModels.NavigationControlItems;
+using Files.App.Data.Items;
 using Files.App.Extensions;
 using Files.App.ViewModels.Dialogs;
 using Files.Backend.ViewModels.Dialogs;

src/Files.App/Filesystem/Cloud/CloudDrivesManager.cs

@@ -3,7 +3,7 @@
 
 using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.WinUI;
-using Files.App.DataModels.NavigationControlItems;
+using Files.App.Data.Items;
 using Files.App.Extensions;
 using Files.App.Helpers;
 using Files.Shared;

src/Files.App/Filesystem/FileTagsManager.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Files.App.DataModels.NavigationControlItems;
+using Files.App.Data.Items;
 using Files.Backend.Services.Settings;
 using Microsoft.Extensions.Logging;
 using System;

src/Files.App/Filesystem/LibraryLocationItem.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.DataModels.NavigationControlItems;
+using Files.App.Data.Items;
 using Files.App.Helpers;
 using Files.Shared;
 using System.Collections.ObjectModel;

src/Files.App/Filesystem/LibraryManager.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+using Files.App.Data.Items;
 using Files.App.Dialogs;
 using Files.App.Extensions;
 using Files.App.Shell;

src/Files.App/Filesystem/QuickAccessManager.cs

@@ -3,7 +3,7 @@
 
 using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.WinUI.Helpers;
-using Files.App.DataModels;
+using Files.App.Data.Models;
 using Files.App.Helpers;
 using Files.App.ServicesImplementation;
 using Files.App.UserControls.Widgets;

src/Files.App/Filesystem/Search/FolderSearch.cs

@@ -3,7 +3,7 @@
 
 using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.WinUI;
-using Files.App.DataModels.NavigationControlItems;
+using Files.App.Data.Items;
 using Files.App.Extensions;
 using Files.App.Filesystem.StorageItems;
 using Files.App.Helpers;

src/Files.App/Filesystem/Security/AccessControlEntry.cs

@@ -3,7 +3,7 @@
 
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using Files.App.DataModels;
+using Files.App.Data.Factories;
 using Files.App.Extensions;
 using System;
 using System.Collections.Generic;

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

@@ -3,7 +3,7 @@
 
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Files.App.Contexts;
-using Files.App.DataModels.NavigationControlItems;
+using Files.App.Data.Items;
 using Files.App.Extensions;
 using Files.App.Filesystem.StorageItems;
 using Files.App.Helpers;

src/Files.App/Filesystem/WSLDistroManager.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.DataModels.NavigationControlItems;
+using Files.App.Data.Items;
 using Files.App.Helpers;
 using System;
 using System.Collections.Generic;

src/Files.App/Filesystem/WindowsStorageDeviceWatcher.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.DataModels.NavigationControlItems;
+using Files.App.Data.Items;
 using Files.App.Helpers;
 using Files.App.Helpers.MMI;
 using Files.Backend.Models;
@@ -96,7 +96,7 @@ private async void Watcher_Added(DeviceWatcher sender, DeviceInformation args)
 				return;
 			}
 
-            DataModels.NavigationControlItems.DriveType type;
+            Data.Items.DriveType type;
 			try
 			{
 				// Check if this drive is associated with a drive letter
@@ -105,7 +105,7 @@ private async void Watcher_Added(DeviceWatcher sender, DeviceInformation args)
 			}
 			catch (ArgumentException)
 			{
-				type = DataModels.NavigationControlItems.DriveType.Removable;
+				type = Data.Items.DriveType.Removable;
 			}
 
 			var driveItem = await DriveItem.CreateFromPropertiesAsync(root, deviceId, type);

src/Files.App/GlobalUsings.cs

@@ -11,6 +11,7 @@
 global using global::System.Threading.Tasks;
 global using global::System.ComponentModel;
 global using global::System.Diagnostics;
+global using SystemIO = global::System.IO;
 
 // Windows Community Toolkit
 global using global::CommunityToolkit.Mvvm.ComponentModel;
@@ -22,8 +23,11 @@
 global using global::Files.App.Helpers;
 global using global::Files.App.Extensions;
 global using global::Files.App.Filesystem;
-global using global::Files.App.DataModels;
-global using global::Files.App.EventArguments;
+global using global::Files.App.Data.EventArguments;
+global using global::Files.App.Data.Factories;
+global using global::Files.App.Data.Items;
+global using global::Files.App.Data.Models;
+global using global::Files.App.Data.Parameters;
 global using global::Files.App.Interacts;
 global using global::Files.App.ViewModels;
 global using global::Files.Backend.Services.Settings;