Code Quality: Moved App.Commands & App.Contexts to App.Data (#12887)

0x5bfa · web-flow · commit 794e7e489aa3 · 2023-07-14T09:48:36.000-04:00
diff --git a/src/Files.App/Actions/FileSystem/PasteItemAction.cs b/src/Files.App/Actions/FileSystem/PasteItemAction.cs
@@ -3,8 +3,6 @@
 
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Files.App.Commands;
-using Files.App.Contexts;
 using Files.App.Data.Models;
 using Files.App.Extensions;
 using Files.App.Helpers;
diff --git a/src/Files.App/Actions/Git/GitInitAction.cs b/src/Files.App/Actions/Git/GitInitAction.cs
@@ -1,8 +1,6 @@
 ﻿// Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Contexts;
-
 namespace Files.App.Actions
 {
     sealed class GitInitAction : ObservableObject, IAction
diff --git a/src/Files.App/Actions/Git/GitPushAction.cs b/src/Files.App/Actions/Git/GitPushAction.cs
@@ -1,9 +1,6 @@
 ﻿// Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Commands;
-using Files.App.Contexts;
-
 namespace Files.App.Actions
 {
 	internal class GitPushAction : ObservableObject, IAction
diff --git a/src/Files.App/Actions/Git/GitSyncAction.cs b/src/Files.App/Actions/Git/GitSyncAction.cs
@@ -1,9 +1,6 @@
 ﻿// Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Commands;
-using Files.App.Contexts;
-
 namespace Files.App.Actions
 {
 	internal class GitSyncAction : ObservableObject, IAction
diff --git a/src/Files.App/Actions/Open/OpenInVSAction.cs b/src/Files.App/Actions/Open/OpenInVSAction.cs
@@ -1,7 +1,6 @@
 ﻿// Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Contexts;
 using Files.App.Utils.Shell;
 
 namespace Files.App.Actions
diff --git a/src/Files.App/Actions/Open/OpenInVSCodeAction.cs b/src/Files.App/Actions/Open/OpenInVSCodeAction.cs
@@ -1,7 +1,6 @@
 ﻿// Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Contexts;
 using Files.App.Utils.Shell;
 
 namespace Files.App.Actions
diff --git a/src/Files.App/Actions/Open/OpenPropertiesAction.cs b/src/Files.App/Actions/Open/OpenPropertiesAction.cs
@@ -1,9 +1,6 @@
 ﻿// Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Commands;
-using Files.App.Contexts;
-
 namespace Files.App.Actions
 {
 	internal class OpenPropertiesAction : ObservableObject, IAction
diff --git a/src/Files.App/Actions/Show/ToggleSidebarAction.cs b/src/Files.App/Actions/Show/ToggleSidebarAction.cs
@@ -3,7 +3,7 @@
 
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Files.App.Commands;
+using Files.App.Data.Commands;
 using Files.App.Extensions;
 using Files.App.ViewModels;
 using System.ComponentModel;
diff --git a/src/Files.App/App.xaml.cs b/src/Files.App/App.xaml.cs
@@ -3,8 +3,6 @@
 
 using CommunityToolkit.WinUI.Helpers;
 using CommunityToolkit.WinUI.Notifications;
-using Files.App.Commands;
-using Files.App.Contexts;
 using Files.App.Data.Models;
 using Files.App.Extensions;
 using Files.App.Utils;
diff --git a/src/Files.App/Data/Attributes/DependencyPropertyAttribute.cs b/src/Files.App/Data/Attributes/DependencyPropertyAttribute.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.UI.Xaml;
 
-namespace Files.App.Attributes
+namespace Files.App.Data.Attributes
 {
 	/// <summary>
 	/// Provides an attribute for generation of <see cref="DependencyProperty"/> and its Property.
@@ -21,9 +21,9 @@ namespace Files.App.Attributes
 	/// <br/>
 	/// <see langword="public"/> <typeparamref name="T"/> Field
 	/// {
-	///		<see langword="get"/> => (<typeparamref name="T"/>)GetValue(Property);
-	///		<see langword="set"/> => SetValue(Property, <see langword="value"/>);
-	///	}
+	/// 	<see langword="get"/> => (<typeparamref name="T"/>)GetValue(Property);
+	/// 	<see langword="set"/> => SetValue(Property, <see langword="value"/>);
+	/// }
 	/// </code>
 	/// <typeparam name="T">property type (nullable value type are not allowed)</typeparam>
 	/// </remarks>
diff --git a/src/Files.App/Data/Commands/CommandCodes.cs b/src/Files.App/Data/Commands/CommandCodes.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Commands
+namespace Files.App.Data.Commands
 {
 	public enum CommandCodes
 	{
diff --git a/src/Files.App/Data/Commands/HotKey/HotKey.cs b/src/Files.App/Data/Commands/HotKey/HotKey.cs
@@ -6,7 +6,7 @@
 using System.Text;
 using Forms = System.Windows.Forms;
 
-namespace Files.App.Commands
+namespace Files.App.Data.Commands
 {
 	[DebuggerDisplay("{Code}")]
 	public readonly struct HotKey : IEquatable<HotKey>
diff --git a/src/Files.App/Data/Commands/HotKey/HotKeyCollection.cs b/src/Files.App/Data/Commands/HotKey/HotKeyCollection.cs
@@ -6,7 +6,7 @@
 using System.Diagnostics;
 using System.Linq;
 
-namespace Files.App.Commands
+namespace Files.App.Data.Commands
 {
 	[DebuggerDisplay("{Code}")]
 	public readonly struct HotKeyCollection : IEnumerable<HotKey>, IEquatable<HotKeyCollection>
diff --git a/src/Files.App/Data/Commands/HotKey/HotKeyHelpers.cs b/src/Files.App/Data/Commands/HotKey/HotKeyHelpers.cs
@@ -7,7 +7,7 @@
 using Windows.System;
 using Windows.UI.Core;
 
-namespace Files.App.Commands
+namespace Files.App.Data.Commands
 {
 	internal static class HotKeyHelpers
 	{
diff --git a/src/Files.App/Data/Commands/HotKey/KeyModifiers.cs b/src/Files.App/Data/Commands/HotKey/KeyModifiers.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Files.App.Commands
+namespace Files.App.Data.Commands
 {
 	[Flags]
 	public enum KeyModifiers : ushort
diff --git a/src/Files.App/Data/Commands/HotKey/Keys.cs b/src/Files.App/Data/Commands/HotKey/Keys.cs
@@ -3,7 +3,7 @@
 
 using Windows.System;
 
-namespace Files.App.Commands
+namespace Files.App.Data.Commands
 {
 	public enum Keys : ushort
 	{
diff --git a/src/Files.App/Data/Commands/IRichCommand.cs b/src/Files.App/Data/Commands/IRichCommand.cs
@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace Files.App.Commands
+namespace Files.App.Data.Commands
 {
 	public interface IRichCommand : ICommand, INotifyPropertyChanging, INotifyPropertyChanged
 	{
diff --git a/src/Files.App/Data/Commands/Manager/CommandManager.cs b/src/Files.App/Data/Commands/Manager/CommandManager.cs
@@ -8,7 +8,7 @@
 using Microsoft.UI.Xaml.Input;
 using System.Collections.Immutable;
 
-namespace Files.App.Commands
+namespace Files.App.Data.Commands
 {
 	internal class CommandManager : ICommandManager
 	{
diff --git a/src/Files.App/Data/Commands/Manager/ICommandManager.cs b/src/Files.App/Data/Commands/Manager/ICommandManager.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Commands
+namespace Files.App.Data.Commands
 {
 	public interface ICommandManager : IEnumerable<IRichCommand>
 	{
diff --git a/src/Files.App/Data/Commands/Manager/IModifiableCommandManager.cs b/src/Files.App/Data/Commands/Manager/IModifiableCommandManager.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Commands
+namespace Files.App.Data.Commands
 {
 	public interface IModifiableCommandManager : IEnumerable<IRichCommand>
 	{
diff --git a/src/Files.App/Data/Commands/Manager/ModifiableCommandManager.cs b/src/Files.App/Data/Commands/Manager/ModifiableCommandManager.cs
@@ -3,7 +3,7 @@
 
 using System.Collections.Immutable;
 
-namespace Files.App.Commands
+namespace Files.App.Data.Commands
 {
 	internal class ModifiableCommandManager : IModifiableCommandManager
 	{
diff --git a/src/Files.App/Data/Commands/ModifiableCommand.cs b/src/Files.App/Data/Commands/ModifiableCommand.cs
@@ -6,9 +6,9 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using System.Collections.Immutable;
-using static Files.App.Commands.CommandManager;
+using static Files.App.Data.Commands.CommandManager;
 
-namespace Files.App.Commands
+namespace Files.App.Data.Commands
 {
 	[DebuggerDisplay("Command {Code} (Modifiable)")]
 	internal class ModifiableCommand : ObservableObject, IRichCommand
diff --git a/src/Files.App/Data/Commands/NoneCommand.cs b/src/Files.App/Data/Commands/NoneCommand.cs
@@ -5,7 +5,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 
-namespace Files.App.Commands
+namespace Files.App.Data.Commands
 {
 	[DebuggerDisplay("Command None")]
 	internal class NoneCommand : IRichCommand
diff --git a/src/Files.App/Data/Commands/RichGlyph.cs b/src/Files.App/Data/Commands/RichGlyph.cs
@@ -7,7 +7,7 @@
 using Microsoft.UI.Xaml.Media;
 using static Microsoft.UI.Xaml.Application;
 
-namespace Files.App.Commands
+namespace Files.App.Data.Commands
 {
 	public readonly struct RichGlyph
 	{
diff --git a/src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs b/src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs
@@ -4,7 +4,7 @@
 using Files.App.UserControls.MultitaskingControl;
 using System.Collections.Immutable;
 
-namespace Files.App.Contexts
+namespace Files.App.Data.Contexts
 {
 	internal class ContentPageContext : ObservableObject, IContentPageContext
 	{
diff --git a/src/Files.App/Data/Contexts/ContentPage/ContentPageTypes.cs b/src/Files.App/Data/Contexts/ContentPage/ContentPageTypes.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Contexts
+namespace Files.App.Data.Contexts
 {
 	public enum ContentPageTypes : ushort
 	{
diff --git a/src/Files.App/Data/Contexts/ContentPage/IContentPageContext.cs b/src/Files.App/Data/Contexts/ContentPage/IContentPageContext.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Contexts
+namespace Files.App.Data.Contexts
 {
 	public interface IContentPageContext : INotifyPropertyChanged
 	{
diff --git a/src/Files.App/Data/Contexts/DisplayPage/DisplayPageContext.cs b/src/Files.App/Data/Contexts/DisplayPage/DisplayPageContext.cs
@@ -3,7 +3,7 @@
 
 using static Files.App.Constants.Browser.GridViewBrowser;
 
-namespace Files.App.Contexts
+namespace Files.App.Data.Contexts
 {
 	internal class DisplayPageContext : ObservableObject, IDisplayPageContext
 	{
diff --git a/src/Files.App/Data/Contexts/DisplayPage/IDisplayPageContext.cs b/src/Files.App/Data/Contexts/DisplayPage/IDisplayPageContext.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Contexts
+namespace Files.App.Data.Contexts
 {
 	public interface IDisplayPageContext : INotifyPropertyChanging, INotifyPropertyChanged
 	{
diff --git a/src/Files.App/Data/Contexts/DisplayPage/LayoutTypes.cs b/src/Files.App/Data/Contexts/DisplayPage/LayoutTypes.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-namespace Files.App.Contexts
+namespace Files.App.Data.Contexts
 {
 	public enum LayoutTypes : ushort
 	{
diff --git a/src/Files.App/Data/Contexts/Multitasking/IMultitaskingContext.cs b/src/Files.App/Data/Contexts/Multitasking/IMultitaskingContext.cs
@@ -4,7 +4,7 @@
 using Files.App.UserControls.MultitaskingControl;
 using System.ComponentModel;
 
-namespace Files.App.Contexts
+namespace Files.App.Data.Contexts
 {
 	public interface IMultitaskingContext : INotifyPropertyChanged
 	{
diff --git a/src/Files.App/Data/Contexts/Multitasking/MultitaskingContext.cs b/src/Files.App/Data/Contexts/Multitasking/MultitaskingContext.cs
@@ -9,7 +9,7 @@
 using System.Collections.Specialized;
 using System.ComponentModel;
 
-namespace Files.App.Contexts
+namespace Files.App.Data.Contexts
 {
 	internal class MultitaskingContext : ObservableObject, IMultitaskingContext
 	{
diff --git a/src/Files.App/Data/Contexts/Page/IPageContext.cs b/src/Files.App/Data/Contexts/Page/IPageContext.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Files.App.Contexts
+namespace Files.App.Data.Contexts
 {
 	public interface IPageContext
 	{
diff --git a/src/Files.App/Data/Contexts/Page/PageContext.cs b/src/Files.App/Data/Contexts/Page/PageContext.cs
@@ -6,7 +6,7 @@
 using System;
 using System.ComponentModel;
 
-namespace Files.App.Contexts
+namespace Files.App.Data.Contexts
 {
 	internal class PageContext : IPageContext
 	{
diff --git a/src/Files.App/Data/Contexts/Window/IWindowContext.cs b/src/Files.App/Data/Contexts/Window/IWindowContext.cs
@@ -3,7 +3,7 @@
 
 using System.ComponentModel;
 
-namespace Files.App.Contexts
+namespace Files.App.Data.Contexts
 {
 	public interface IWindowContext : INotifyPropertyChanged
 	{
diff --git a/src/Files.App/Data/Contexts/Window/WindowContext.cs b/src/Files.App/Data/Contexts/Window/WindowContext.cs
@@ -4,7 +4,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Microsoft.UI.Windowing;
 
-namespace Files.App.Contexts
+namespace Files.App.Data.Contexts
 {
 	internal class WindowContext : ObservableObject, IWindowContext
 	{
diff --git a/src/Files.App/Data/Models/ContextMenuFlyoutItemViewModelBuilder.cs b/src/Files.App/Data/Models/ContextMenuFlyoutItemViewModelBuilder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Commands;
+using Files.App.Data.Commands;
 
 namespace Files.App.Data.Models
 {
diff --git a/src/Files.App/GlobalUsings.cs b/src/Files.App/GlobalUsings.cs
@@ -19,9 +19,7 @@
 global using global::CommunityToolkit.Mvvm.Input;
 global using global::CommunityToolkit.Mvvm.Messaging;
 
-// Files.App
-global using global::Files.App.Commands;
-global using global::Files.App.Contexts;
+// Files Front-end
 global using global::Files.App.Helpers;
 global using global::Files.App.Extensions;
 global using global::Files.App.Utils;
@@ -39,11 +37,17 @@
 global using global::Files.App.Utils.Shell;
 global using global::Files.App.Utils.StorageEnumerators;
 global using global::Files.App.Utils.StorageItems;
+global using global::Files.App.Data.Attributes;
+global using global::Files.App.Data.Behaviors;
+global using global::Files.App.Data.Commands;
+global using global::Files.App.Data.Contexts;
 global using global::Files.App.Data.EventArguments;
+global using global::Files.App.Data.Exceptions;
 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.Data.TemplateSelectors;
 global using global::Files.App.UserControls;
 global using global::Files.App.ViewModels;
 global using global::Files.App.ViewModels.UserControls;
diff --git a/src/Files.App/Helpers/MenuFlyout/ContextFlyoutItemHelper.cs b/src/Files.App/Helpers/MenuFlyout/ContextFlyoutItemHelper.cs
@@ -1,7 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Files.App.Commands;
+using Files.App.Data.Commands;
 using Files.App.ViewModels.LayoutModes;
 using Microsoft.UI.Xaml.Media.Imaging;
 using System.IO;
diff --git a/src/Files.App/UserControls/AddressToolbar.xaml.cs b/src/Files.App/UserControls/AddressToolbar.xaml.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License. See the LICENSE.
 
 using CommunityToolkit.Mvvm.DependencyInjection;
-using Files.App.Commands;
+using Files.App.Data.Commands;
 using Files.App.ViewModels;
 using Files.Core.Services.Settings;
 using Microsoft.UI.Input;
diff --git a/src/Files.App/UserControls/InnerNavigationToolbar.xaml.cs b/src/Files.App/UserControls/InnerNavigationToolbar.xaml.cs
diff --git a/src/Files.App/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs b/src/Files.App/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs
diff --git a/src/Files.App/UserControls/PathBreadcrumb.xaml.cs b/src/Files.App/UserControls/PathBreadcrumb.xaml.cs
diff --git a/src/Files.App/UserControls/SidebarControl.xaml.cs b/src/Files.App/UserControls/SidebarControl.xaml.cs
diff --git a/src/Files.App/UserControls/StatusBarControl.xaml.cs b/src/Files.App/UserControls/StatusBarControl.xaml.cs
diff --git a/src/Files.App/Utils/StorageFileHelpers/StorageFileExtensions.cs b/src/Files.App/Utils/StorageFileHelpers/StorageFileExtensions.cs
diff --git a/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs b/src/Files.App/ViewModels/UserControls/PreviewPaneViewModel.cs
diff --git a/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs b/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs
diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs
diff --git a/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs b/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs
diff --git a/src/Files.App/Views/LayoutModes/StandardLayoutMode.cs b/src/Files.App/Views/LayoutModes/StandardLayoutMode.cs
diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs
diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs
diff --git a/src/Files.Core.SourceGenerator/Utilities/SourceGeneratorHelper.cs b/src/Files.Core.SourceGenerator/Utilities/SourceGeneratorHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`// Copyright (c) 2023 Files Community`
`2`	`2`	`// Licensed under the MIT License. See the LICENSE.`
`3`	`3`
`4`		`-using Files.App.Contexts;`
`5`		`-`
`6`	`4`	`namespace Files.App.Actions`
`7`	`5`	`{`
`8`	`6`	`sealed class GitInitAction : ObservableObject, IAction`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,6 @@`
`1`	`1`	`// Copyright (c) 2023 Files Community`
`2`	`2`	`// Licensed under the MIT License. See the LICENSE.`
`3`	`3`
`4`		`-using Files.App.Commands;`
`5`		`-using Files.App.Contexts;`
`6`		`-`
`7`	`4`	`namespace Files.App.Actions`
`8`	`5`	`{`
`9`	`6`	`internal class GitPushAction : ObservableObject, IAction`