Code Quality: Added empty view models of Widgets (#14922)

0x5bfa · web-flow · commit 929dc5f15442 · 2024-03-09T16:50:21.000-08:00
diff --git a/src/Files.App/GlobalUsings.cs b/src/Files.App/GlobalUsings.cs
@@ -50,9 +50,10 @@
 global using global::Files.App.Services;
 global using global::Files.App.UserControls;
 global using global::Files.App.UserControls.TabBar;
-global using global::Files.App.UserControls.ViewModels.Widgets;
+global using global::Files.App.UserControls.Widgets;
 global using global::Files.App.ViewModels;
 global using global::Files.App.ViewModels.UserControls;
+global using global::Files.App.ViewModels.UserControls.Widgets;
 global using global::Files.App.Views;
 global using global::Files.App.Views.Layouts;
 global using global::Files.App.Views.Shells;
diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml
@@ -8,6 +8,7 @@
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:local="using:Files.App.UserControls.Widgets"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	DataContext="{x:Bind ViewModel, Mode=OneWay}"
 	mc:Ignorable="d">
 
 	<Grid>
diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
@@ -18,6 +18,8 @@ namespace Files.App.UserControls.Widgets
 	/// </summary>
 	public sealed partial class DrivesWidget : BaseWidgetViewModel, IWidgetViewModel, INotifyPropertyChanged
 	{
+		private DrivesWidgetViewModel ViewModel { get; set; }
+
 		public IUserSettingsService userSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 		private IHomePageContext HomePageContext { get; } = Ioc.Default.GetRequiredService<IHomePageContext>();
 		private DrivesViewModel drivesViewModel = Ioc.Default.GetRequiredService<DrivesViewModel>();
diff --git a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml
@@ -10,6 +10,7 @@
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:local="using:Files.App.UserControls.Widgets"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	DataContext="{x:Bind ViewModel, Mode=OneWay}"
 	mc:Ignorable="d">
 
 	<UserControl.Resources>
diff --git a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml.cs
@@ -18,15 +18,11 @@ namespace Files.App.UserControls.Widgets
 	/// </summary>
 	public sealed partial class FileTagsWidget : BaseWidgetViewModel, IWidgetViewModel
 	{
+		public FileTagsWidgetViewModel ViewModel { get; set; }
+
 		private readonly IUserSettingsService userSettingsService;
 		private IHomePageContext HomePageContext { get; } = Ioc.Default.GetRequiredService<IHomePageContext>();
 
-		public FileTagsWidgetViewModel ViewModel
-		{
-			get => (FileTagsWidgetViewModel)DataContext;
-			set => DataContext = value;
-		}
-
 		public IShellPage AppInstance;
 
 		public Func<string, Task>? OpenAction { get; set; }
diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml
@@ -7,6 +7,7 @@
 	xmlns:dataitems="using:Files.App.Data.Items"
 	xmlns:local="using:Files.App.UserControls.Widgets"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	DataContext="{x:Bind ViewModel, Mode=OneWay}"
 	mc:Ignorable="d">
 
 	<Grid>
diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
@@ -18,6 +18,8 @@ namespace Files.App.UserControls.Widgets
 	/// </summary>
 	public sealed partial class QuickAccessWidget : BaseWidgetViewModel, IWidgetViewModel, INotifyPropertyChanged
 	{
+		private QuickAccessWidgetViewModel ViewModel { get; set; }
+
 		public IUserSettingsService userSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 		private IHomePageContext HomePageContext { get; } = Ioc.Default.GetRequiredService<IHomePageContext>();
 
diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml
@@ -9,6 +9,7 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
 	xmlns:recent="using:Files.App.Utils.RecentItem"
+	DataContext="{x:Bind ViewModel, Mode=OneWay}"
 	mc:Ignorable="d">
 
 	<StackPanel x:Name="RecentsListGrid" Orientation="Vertical">
diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
@@ -20,6 +20,8 @@ namespace Files.App.UserControls.Widgets
 	/// </summary>
 	public sealed partial class RecentFilesWidget : BaseWidgetViewModel, IWidgetViewModel, INotifyPropertyChanged
 	{
+		private RecentFilesWidgetViewModel ViewModel { get; set; }
+
 		private IHomePageContext HomePageContext { get; } = Ioc.Default.GetRequiredService<IHomePageContext>();
 
 		public delegate void RecentFilesOpenLocationInvokedEventHandler(object sender, PathNavigationEventArgs e);
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/BaseWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/BaseWidgetViewModel.cs
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/DrivesWidgetViewModel.cs
@@ -0,0 +1,13 @@
+﻿// Copyright (c) 2023 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+namespace Files.App.ViewModels.UserControls.Widgets
+{
+	/// <summary>
+	/// Represents view model of <see cref="DrivesWidget"/>.
+	/// </summary>
+	public class DrivesWidgetViewModel
+	{
+		public ObservableCollection<WidgetDriveCardItem> Items { get; } = [];
+	}
+}
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/FileTagsWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/FileTagsWidgetViewModel.cs
@@ -3,8 +3,11 @@
 
 using Files.Shared.Utils;
 
-namespace Files.App.UserControls.ViewModels.Widgets
+namespace Files.App.ViewModels.UserControls.Widgets
 {
+	/// <summary>
+	/// Represents view model of <see cref="FileTagsWidget"/>.
+	/// </summary>
 	public sealed partial class FileTagsWidgetViewModel : ObservableObject, IAsyncInitialize
 	{
 		// Dependency injections
@@ -17,14 +20,13 @@ public sealed partial class FileTagsWidgetViewModel : ObservableObject, IAsyncIn
 
 		// Properties
 
-		public ObservableCollection<WidgetFileTagsContainerItem> Containers { get; }
+		public ObservableCollection<WidgetFileTagsContainerItem> Containers { get; } = [];
 
 		// Constructor
 
 		public FileTagsWidgetViewModel(Func<string, Task> openAction)
 		{
 			_openAction = openAction;
-			Containers = new();
 		}
 
 		// Methods
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/QuickAccessWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/QuickAccessWidgetViewModel.cs
@@ -0,0 +1,13 @@
+﻿// Copyright (c) 2023 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+namespace Files.App.ViewModels.UserControls.Widgets
+{
+	/// <summary>
+	/// Represents view model of <see cref="QuickAccessWidget"/>.
+	/// </summary>
+	public class QuickAccessWidgetViewModel
+	{
+		public ObservableCollection<WidgetFolderCardItem> Items { get; } = [];
+	}
+}
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/RecentFilesWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/RecentFilesWidgetViewModel.cs
@@ -0,0 +1,13 @@
+﻿// Copyright (c) 2023 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+namespace Files.App.ViewModels.UserControls.Widgets
+{
+	/// <summary>
+	/// Represents view model of <see cref="RecentFilesWidget"/>.
+	/// </summary>
+	public class RecentFilesWidgetViewModel
+	{
+		public ObservableCollection<RecentItem> Items { get; } = [];
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ namespace Files.App.UserControls.Widgets`
`18`	`18`	`/// </summary>`
`19`	`19`	`public sealed partial class DrivesWidget : BaseWidgetViewModel, IWidgetViewModel, INotifyPropertyChanged`
`20`	`20`	`{`
	`21`	`+ private DrivesWidgetViewModel ViewModel { get; set; }`
	`22`	`+`
`21`	`23`	`public IUserSettingsService userSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();`
`22`	`24`	`private IHomePageContext HomePageContext { get; } = Ioc.Default.GetRequiredService<IHomePageContext>();`
`23`	`25`	`private DrivesViewModel drivesViewModel = Ioc.Default.GetRequiredService<DrivesViewModel>();`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,8 @@ namespace Files.App.UserControls.Widgets`
`20`	`20`	`/// </summary>`
`21`	`21`	`public sealed partial class RecentFilesWidget : BaseWidgetViewModel, IWidgetViewModel, INotifyPropertyChanged`
`22`	`22`	`{`
	`23`	`+ private RecentFilesWidgetViewModel ViewModel { get; set; }`
	`24`	`+`
`23`	`25`	`private IHomePageContext HomePageContext { get; } = Ioc.Default.GetRequiredService<IHomePageContext>();`
`24`	`26`
`25`	`27`	`public delegate void RecentFilesOpenLocationInvokedEventHandler(object sender, PathNavigationEventArgs e);`