Skip to content

Commit d8d10c2

Browse files
0x5bfa0x5bfa
authored
Code Quality: Introduce a new data storage namespace (#12233)
1 parent 638e3b7 commit d8d10c2

File tree

78 files changed

+126
-127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+126
-127
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using CommunityToolkit.Mvvm.ComponentModel;
55
using CommunityToolkit.Mvvm.DependencyInjection;
66
using Files.App.Contexts;
7-
using Files.App.DataModels.NavigationControlItems;
7+
using Files.App.Data.Items;
88
using Files.App.Extensions;
99
using Files.App.Shell;
1010
using Files.App.ViewModels;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using CommunityToolkit.Mvvm.DependencyInjection;
66
using Files.App.Commands;
77
using Files.App.Contexts;
8-
using Files.App.DataModels;
8+
using Files.App.Data.Models;
99
using Files.App.Extensions;
1010
using Files.App.Helpers;
1111
using System.ComponentModel;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using CommunityToolkit.Mvvm.DependencyInjection;
55
using Files.App.Commands;
66
using Files.App.Contexts;
7-
using Files.App.DataModels;
7+
using Files.App.Data.Models;
88
using Files.App.Extensions;
99
using Files.App.Filesystem;
1010
using Files.App.Helpers;

‎src/Files.App/App.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using CommunityToolkit.WinUI.Notifications;
55
using Files.App.Commands;
66
using Files.App.Contexts;
7-
using Files.App.DataModels;
7+
using Files.App.Data.Models;
88
using Files.App.Extensions;
99
using Files.App.Filesystem;
1010
using Files.App.Filesystem.Cloud;

‎src/Files.App/BaseLayout.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
using VA = Vanara.Windows.Shell;
2929
using DispatcherQueueTimer = Microsoft.UI.Dispatching.DispatcherQueueTimer;
3030
using SortDirection = Files.Shared.Enums.SortDirection;
31+
using Files.App.Data.EventArguments;
32+
using Files.App.Data.Models;
3133

3234
namespace Files.App
3335
{

‎src/Files.App/EventArguments/Bundles/BundlesOpenPathEventArgs.cs renamed to ‎src/Files.App/Data/EventArguments/Bundles/BundlesOpenPathEventArgs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) 2023 Files Community
22
// Licensed under the MIT License. See the LICENSE.
33

4-
namespace Files.App.EventArguments.Bundles
4+
namespace Files.App.Data.EventArguments.Bundles
55
{
66
public class BundlesOpenPathEventArgs
77
{

‎src/Files.App/EventArguments/LayoutModeEventArgs.cs renamed to ‎src/Files.App/Data/EventArguments/LayoutModeEventArgs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) 2023 Files Community
22
// Licensed under the MIT License. See the LICENSE.
33

4-
namespace Files.App.EventArguments
4+
namespace Files.App.Data.EventArguments
55
{
66
public class LayoutModeEventArgs
77
{

‎src/Files.App/EventArguments/LayoutPreferenceEventArgs.cs renamed to ‎src/Files.App/Data/EventArguments/LayoutPreferenceEventArgs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using Files.App.Helpers.LayoutPreferences;
55

6-
namespace Files.App.EventArguments
6+
namespace Files.App.Data.EventArguments
77
{
88
public class LayoutPreferenceEventArgs
99
{

‎src/Files.App/DataModels/SecurityAdvancedAccessControlItemFactory.cs renamed to ‎src/Files.App/Data/Factories/SecurityAdvancedAccessControlItemFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Collections.Generic;
77
using System.Collections.ObjectModel;
88

9-
namespace Files.App.DataModels
9+
namespace Files.App.Data.Factories
1010
{
1111
public static class SecurityAdvancedAccessControlItemFactory
1212
{

‎src/Files.App/DataModels/NavigationControlItems/DriveItem.cs renamed to ‎src/Files.App/Data/Items/DriveItem.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using Windows.Storage;
1313
using Windows.Storage.Streams;
1414

15-
namespace Files.App.DataModels.NavigationControlItems
15+
namespace Files.App.Data.Items
1616
{
1717
public class DriveItem : ObservableObject, INavigationControlItem, ILocatableFolder
1818
{
@@ -212,7 +212,7 @@ public async Task UpdatePropertiesAsync()
212212
SpaceText = GetSizeString();
213213

214214
if (MaxSpace.Bytes > 0 && FreeSpace.Bytes > 0) // Make sure we don't divide by 0
215-
PercentageUsed = 100.0f - ((float)(FreeSpace.Bytes / MaxSpace.Bytes) * 100.0f);
215+
PercentageUsed = 100.0f - (float)(FreeSpace.Bytes / MaxSpace.Bytes) * 100.0f;
216216
}
217217
else
218218
{

‎src/Files.App/DataModels/NavigationControlItems/FileTagItem.cs renamed to ‎src/Files.App/Data/Items/FileTagItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using Files.Backend.ViewModels.FileTags;
55

6-
namespace Files.App.DataModels.NavigationControlItems
6+
namespace Files.App.Data.Items
77
{
88
public class FileTagItem : INavigationControlItem
99
{

‎src/Files.App/DataModels/NavigationControlItems/INavigationControlItem.cs renamed to ‎src/Files.App/Data/Items/INavigationControlItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) 2023 Files Community
22
// Licensed under the MIT License. See the LICENSE.
33

4-
namespace Files.App.Filesystem
4+
namespace Files.App.Data.Items
55
{
66
public interface INavigationControlItem : IComparable<INavigationControlItem>
77
{

‎src/Files.App/DataModels/NavigationControlItems/LocationItem.cs renamed to ‎src/Files.App/Data/Items/LocationItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using Microsoft.UI.Xaml.Media.Imaging;
77
using System.IO;
88

9-
namespace Files.App.DataModels.NavigationControlItems
9+
namespace Files.App.Data.Items
1010
{
1111
public class LocationItem : ObservableObject, INavigationControlItem
1212
{

‎src/Files.App/DataModels/NavigationViewItemButtonStyleItem.cs renamed to ‎src/Files.App/Data/Items/NavigationViewItemButtonStyleItem.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
// Copyright (c) 2023 Files Community
22
// Licensed under the MIT License. See the LICENSE.
33

4-
using CommunityToolkit.Mvvm.ComponentModel;
54
using Files.Backend.Enums;
65
using Microsoft.UI.Xaml;
76

8-
namespace Files.App.DataModels
7+
namespace Files.App.Data.Items
98
{
109
public class NavigationViewItemButtonStyleItem : ObservableObject
1110
{

‎src/Files.App/DataModels/PropertiesNavigationViewItemFactory.cs renamed to ‎src/Files.App/Data/Items/PropertiesNavigationViewItemFactory.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
// Copyright (c) 2023 Files Community
22
// Licensed under the MIT License. See the LICENSE.
33

4-
using System.Collections.ObjectModel;
5-
using Files.App.DataModels.NavigationControlItems;
6-
using Files.App.Extensions;
7-
using Files.App.Filesystem;
84
using Files.Backend.Enums;
95
using Files.Backend.Helpers;
106
using Microsoft.UI.Xaml;
11-
using System.Collections.Generic;
12-
using System.Linq;
137

14-
namespace Files.App.DataModels
8+
namespace Files.App.Data.Items
159
{
1610
public static class PropertiesNavigationViewItemFactory
1711
{
@@ -102,7 +96,7 @@ public static ObservableCollection<NavigationViewItemButtonStyleItem> Initialize
10296
var securityItemEnabled = !isLibrary && !listedItem.IsRecycleBinItem;
10397
var hashItemEnabled = !(isFolder && !listedItem.IsArchive) && !isLibrary && !listedItem.IsRecycleBinItem;
10498
var detailsItemEnabled = fileExt is not null && !isShortcut && !isLibrary;
105-
var customizationItemEnabled = !isLibrary && ((isFolder && !listedItem.IsArchive) || (isShortcut && !listedItem.IsLinkItem));
99+
var customizationItemEnabled = !isLibrary && (isFolder && !listedItem.IsArchive || isShortcut && !listedItem.IsLinkItem);
106100
var compatibilityItemEnabled = FileExtensionHelpers.IsExecutableFile(listedItem is ShortcutItem sht ? sht.TargetPath : fileExt, true);
107101

108102
if (!securityItemEnabled)

‎src/Files.App/DataModels/NavigationControlItems/WslDistroItem.cs renamed to ‎src/Files.App/Data/Items/WslDistroItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) 2023 Files Community
22
// Licensed under the MIT License. See the LICENSE.
33

4-
namespace Files.App.DataModels.NavigationControlItems
4+
namespace Files.App.Data.Items
55
{
66
public class WslDistroItem : INavigationControlItem
77
{

‎src/Files.App/DataModels/AppModel.cs renamed to ‎src/Files.App/Data/Models/AppModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.UI.Xaml.Controls;
66
using Windows.ApplicationModel.DataTransfer;
77

8-
namespace Files.App.DataModels
8+
namespace Files.App.Data.Models
99
{
1010
public class AppModel : ObservableObject
1111
{

‎src/Files.App/AppModels/BitmapImageModel.cs renamed to ‎src/Files.App/Data/Models/BitmapImageModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using Files.Backend.Models;
55
using Microsoft.UI.Xaml.Media.Imaging;
66

7-
namespace Files.App.AppModels
7+
namespace Files.App.Data.Models
88
{
99
/// <inheritdoc cref="IImageModel"/>
1010
internal sealed class BitmapImageModel : IImageModel

‎src/Files.App/DataModels/SidebarPinnedModel.cs renamed to ‎src/Files.App/Data/Models/SidebarPinnedModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
// Licensed under the MIT License. See the LICENSE.
33

44
using CommunityToolkit.WinUI;
5-
using Files.App.DataModels.NavigationControlItems;
5+
using Files.App.Data.Items;
66
using Files.App.ServicesImplementation;
77
using Files.App.UserControls.Widgets;
88
using System.Collections.Specialized;
99
using System.IO;
1010
using System.Text.Json.Serialization;
1111
using Windows.Storage.FileProperties;
1212

13-
namespace Files.App.DataModels
13+
namespace Files.App.Data.Models
1414
{
1515
public class SidebarPinnedModel
1616
{

‎src/Files.App/DataModels/SuggestionModel.cs renamed to ‎src/Files.App/Data/Models/SuggestionModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using Microsoft.UI.Xaml.Media.Imaging;
55

6-
namespace Files.App.DataModels
6+
namespace Files.App.Data.Models
77
{
88
public class SuggestionModel : ObservableObject
99
{

‎src/Files.App/DataModels/PropertiesPageNavigationParameter.cs renamed to ‎src/Files.App/Data/Parameters/PropertiesPageNavigationParameter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.UI.Xaml;
66
using System.Threading;
77

8-
namespace Files.App.DataModels
8+
namespace Files.App.Data.Parameters
99
{
1010
public class PropertiesPageNavigationParameter
1111
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7+
xmlns:dataitems="using:Files.App.Data.Items"
78
xmlns:helpers="using:Files.App.Helpers"
89
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9-
xmlns:navigationcontrolitems="using:Files.App.DataModels.NavigationControlItems"
1010
Title="{helpers:ResourceString Name=ReorderSidebarItemsDialogText}"
1111
DefaultButton="Primary"
1212
IsPrimaryButtonEnabled="True"
@@ -34,7 +34,7 @@
3434
Grid.Row="1"
3535
ItemsSource="{x:Bind ViewModel.SidebarFavoriteItems, Mode=OneWay}">
3636
<ListView.ItemTemplate>
37-
<DataTemplate x:DataType="navigationcontrolitems:LocationItem">
37+
<DataTemplate x:DataType="dataitems:LocationItem">
3838
<Grid
3939
AllowDrop="True"
4040
AutomationProperties.AutomationId="{x:Bind Text}"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the MIT License. See the LICENSE.
33

44
using CommunityToolkit.WinUI.UI;
5-
using Files.App.DataModels.NavigationControlItems;
5+
using Files.App.Data.Items;
66
using Files.App.Extensions;
77
using Files.App.ViewModels.Dialogs;
88
using Files.Backend.ViewModels.Dialogs;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using CommunityToolkit.Mvvm.DependencyInjection;
55
using CommunityToolkit.WinUI;
6-
using Files.App.DataModels.NavigationControlItems;
6+
using Files.App.Data.Items;
77
using Files.App.Extensions;
88
using Files.App.Helpers;
99
using Files.Shared;

‎src/Files.App/Filesystem/FileTagsManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the MIT License. See the LICENSE.
33

44
using CommunityToolkit.Mvvm.DependencyInjection;
5-
using Files.App.DataModels.NavigationControlItems;
5+
using Files.App.Data.Items;
66
using Files.Backend.Services.Settings;
77
using Microsoft.Extensions.Logging;
88
using System;

‎src/Files.App/Filesystem/LibraryLocationItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) 2023 Files Community
22
// Licensed under the MIT License. See the LICENSE.
33

4-
using Files.App.DataModels.NavigationControlItems;
4+
using Files.App.Data.Items;
55
using Files.App.Helpers;
66
using Files.Shared;
77
using System.Collections.ObjectModel;

‎src/Files.App/Filesystem/LibraryManager.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Copyright (c) 2023 Files Community
22
// Licensed under the MIT License. See the LICENSE.
33

4+
using Files.App.Data.Items;
45
using Files.App.Dialogs;
56
using Files.App.Extensions;
67
using Files.App.Shell;

‎src/Files.App/Filesystem/QuickAccessManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using CommunityToolkit.Mvvm.DependencyInjection;
55
using CommunityToolkit.WinUI.Helpers;
6-
using Files.App.DataModels;
6+
using Files.App.Data.Models;
77
using Files.App.Helpers;
88
using Files.App.ServicesImplementation;
99
using Files.App.UserControls.Widgets;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using CommunityToolkit.Mvvm.DependencyInjection;
55
using CommunityToolkit.WinUI;
6-
using Files.App.DataModels.NavigationControlItems;
6+
using Files.App.Data.Items;
77
using Files.App.Extensions;
88
using Files.App.Filesystem.StorageItems;
99
using Files.App.Helpers;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using CommunityToolkit.Mvvm.ComponentModel;
55
using CommunityToolkit.Mvvm.Input;
6-
using Files.App.DataModels;
6+
using Files.App.Data.Factories;
77
using Files.App.Extensions;
88
using System;
99
using System.Collections.Generic;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using CommunityToolkit.Mvvm.DependencyInjection;
55
using Files.App.Contexts;
6-
using Files.App.DataModels.NavigationControlItems;
6+
using Files.App.Data.Items;
77
using Files.App.Extensions;
88
using Files.App.Filesystem.StorageItems;
99
using Files.App.Helpers;

‎src/Files.App/Filesystem/WSLDistroManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) 2023 Files Community
22
// Licensed under the MIT License. See the LICENSE.
33

4-
using Files.App.DataModels.NavigationControlItems;
4+
using Files.App.Data.Items;
55
using Files.App.Helpers;
66
using System;
77
using System.Collections.Generic;

‎src/Files.App/Filesystem/WindowsStorageDeviceWatcher.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) 2023 Files Community
22
// Licensed under the MIT License. See the LICENSE.
33

4-
using Files.App.DataModels.NavigationControlItems;
4+
using Files.App.Data.Items;
55
using Files.App.Helpers;
66
using Files.App.Helpers.MMI;
77
using Files.Backend.Models;
@@ -96,7 +96,7 @@ private async void Watcher_Added(DeviceWatcher sender, DeviceInformation args)
9696
return;
9797
}
9898

99-
DataModels.NavigationControlItems.DriveType type;
99+
Data.Items.DriveType type;
100100
try
101101
{
102102
// Check if this drive is associated with a drive letter
@@ -105,7 +105,7 @@ private async void Watcher_Added(DeviceWatcher sender, DeviceInformation args)
105105
}
106106
catch (ArgumentException)
107107
{
108-
type = DataModels.NavigationControlItems.DriveType.Removable;
108+
type = Data.Items.DriveType.Removable;
109109
}
110110

111111
var driveItem = await DriveItem.CreateFromPropertiesAsync(root, deviceId, type);

‎src/Files.App/GlobalUsings.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
global using global::System.Threading.Tasks;
1212
global using global::System.ComponentModel;
1313
global using global::System.Diagnostics;
14+
global using SystemIO = global::System.IO;
1415

1516
// Windows Community Toolkit
1617
global using global::CommunityToolkit.Mvvm.ComponentModel;
@@ -22,8 +23,11 @@
2223
global using global::Files.App.Helpers;
2324
global using global::Files.App.Extensions;
2425
global using global::Files.App.Filesystem;
25-
global using global::Files.App.DataModels;
26-
global using global::Files.App.EventArguments;
26+
global using global::Files.App.Data.EventArguments;
27+
global using global::Files.App.Data.Factories;
28+
global using global::Files.App.Data.Items;
29+
global using global::Files.App.Data.Models;
30+
global using global::Files.App.Data.Parameters;
2731
global using global::Files.App.Interacts;
2832
global using global::Files.App.ViewModels;
2933
global using global::Files.Backend.Services.Settings;

0 commit comments

Comments
 (0)