Feature: Added Git columns to the details layout

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

@@ -19,7 +19,7 @@ public bool IsHidden
 		[LiteDB.BsonIgnore]
 		public double MaxLength
 		{
-			get => UserCollapsed ? 0 : NormalMaxLength;
+			get => UserCollapsed || IsHidden ? 0 : NormalMaxLength;
 		}
 
 		private double normalMaxLength = 800;
@@ -44,10 +44,12 @@ public double NormalMinLength
 		}
 
 		[LiteDB.BsonIgnore]
-		public double MinLength => UserCollapsed ? 0 : NormalMinLength;
+		public double MinLength
+			=> UserCollapsed || IsHidden ? 0 : NormalMinLength;
 
 		[LiteDB.BsonIgnore]
-		public Visibility Visibility => UserCollapsed ? Visibility.Collapsed : Visibility.Visible;
+		public Visibility Visibility
+			=> UserCollapsed || IsHidden ? Visibility.Collapsed : Visibility.Visible;
 
 		private bool userCollapsed;
 
@@ -64,15 +66,15 @@ public bool UserCollapsed
 		[LiteDB.BsonIgnore]
 		public GridLength Length
 		{
-			get => UserCollapsed ? new GridLength(0) : UserLength;
+			get => UserCollapsed || IsHidden ? new GridLength(0) : UserLength;
 		}
 
 		private const int gridSplitterWidth = 12;
 
 		[LiteDB.BsonIgnore]
 		public GridLength LengthIncludingGridSplitter
 		{
-			get => UserCollapsed
+			get => UserCollapsed || IsHidden
 				? new(0)
 				: new(UserLength.Value + (IsResizeable ? gridSplitterWidth : 0));
 		}
@@ -104,17 +106,13 @@ public double UserLengthPixels
 
 		public void Hide()
 		{
-			UserCollapsed = true;
 			IsHidden = true;
-
 			UpdateVisibility();
 		}
 
 		public void Show()
 		{
-			UserCollapsed = false;
 			IsHidden = false;
-
 			UpdateVisibility();
 		}
 

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

@@ -12,14 +12,48 @@ public class ColumnsViewModel : ObservableObject
 			UserLength = new GridLength(24, GridUnitType.Pixel),
 			IsResizeable = false,
 		};
-
 		[LiteDB.BsonIgnore]
 		public ColumnViewModel IconColumn
 		{
 			get => iconColumn;
 			set => SetProperty(ref iconColumn, value);
 		}
 
+		private ColumnViewModel _GitStatusColumn = new();
+		public ColumnViewModel GitStatusColumn
+		{
+			get => _GitStatusColumn;
+			set => SetProperty(ref _GitStatusColumn, value);
+		}
+
+		private ColumnViewModel _GitLastCommitDateColumn = new();
+		public ColumnViewModel GitLastCommitDateColumn
+		{
+			get => _GitLastCommitDateColumn;
+			set => SetProperty(ref _GitLastCommitDateColumn, value);
+		}
+
+		private ColumnViewModel _GitLastCommitMessageColumn = new();
+		public ColumnViewModel GitLastCommitMessageColumn
+		{
+			get => _GitLastCommitMessageColumn;
+			set => SetProperty(ref _GitLastCommitMessageColumn, value);
+		}
+
+		private ColumnViewModel _GitCommitAuthorColumn = new();
+		public ColumnViewModel GitCommitAuthorColumn
+		{
+			get => _GitCommitAuthorColumn;
+			set => SetProperty(ref _GitCommitAuthorColumn, value);
+		}
+
+		private ColumnViewModel _GitLastCommitShaColumn = new();
+		public ColumnViewModel GitLastCommitShaColumn
+		{
+			get => _GitLastCommitShaColumn;
+			set => SetProperty(ref _GitLastCommitShaColumn, value);
+		}
+
 		private ColumnViewModel tagColumn = new();
 		public ColumnViewModel TagColumn
 		{
@@ -31,7 +65,6 @@ public ColumnViewModel TagColumn
 		{
 			NormalMaxLength = 1000d
 		};
-
 		public ColumnViewModel NameColumn
 		{
 			get => nameColumn;
@@ -43,7 +76,6 @@ public ColumnViewModel NameColumn
 			UserLength = new GridLength(50),
 			NormalMaxLength = 80,
 		};
-
 		public ColumnViewModel StatusColumn
 		{
 			get => statusColumn;
@@ -61,7 +93,6 @@ public ColumnViewModel DateModifiedColumn
 		{
 			NormalMaxLength = 500,
 		};
-
 		public ColumnViewModel OriginalPathColumn
 		{
 			get => originalPathColumn;
@@ -86,7 +117,6 @@ public ColumnViewModel DateDeletedColumn
 		{
 			UserCollapsed = true
 		};
-
 		public ColumnViewModel DateCreatedColumn
 		{
 			get => dateCreatedColumn;
@@ -105,11 +135,13 @@ public ColumnViewModel SizeColumn
 			IconColumn.Length.Value +
 			TagColumn.Length.Value +
 			NameColumn.Length.Value +
-			DateModifiedColumn.Length.Value + OriginalPathColumn.Length.Value +
+			DateModifiedColumn.Length.Value +
+			OriginalPathColumn.Length.Value +
 			ItemTypeColumn.Length.Value +
 			DateDeletedColumn.Length.Value +
 			DateCreatedColumn.Length.Value +
-			SizeColumn.Length.Value + StatusColumn.Length.Value;
+			SizeColumn.Length.Value +
+			StatusColumn.Length.Value;
 
 		public void SetDesiredSize(double width)
 		{

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

@@ -360,6 +360,11 @@ public static void SetLayoutPreferencesForPath(string folderPath, LayoutPreferen
 				userSettingsService.FoldersSettingsService.ShowTypeColumn = !prefs.ColumnsViewModel.ItemTypeColumn.UserCollapsed;
 				userSettingsService.FoldersSettingsService.ShowSizeColumn = !prefs.ColumnsViewModel.SizeColumn.UserCollapsed;
 				userSettingsService.FoldersSettingsService.ShowFileTagColumn = !prefs.ColumnsViewModel.TagColumn.UserCollapsed;
+				userSettingsService.FoldersSettingsService.ShowGitStatusColumn = !prefs.ColumnsViewModel.GitStatusColumn.UserCollapsed;
+				userSettingsService.FoldersSettingsService.ShowGitLastCommitDateColumn = !prefs.ColumnsViewModel.GitLastCommitDateColumn.UserCollapsed;
+				userSettingsService.FoldersSettingsService.ShowGitLastCommitMessageColumn = !prefs.ColumnsViewModel.GitLastCommitMessageColumn.UserCollapsed;
+				userSettingsService.FoldersSettingsService.ShowGitCommitAuthorColumn = !prefs.ColumnsViewModel.GitCommitAuthorColumn.UserCollapsed;
+				userSettingsService.FoldersSettingsService.ShowGitLastCommitShaColumn = !prefs.ColumnsViewModel.GitLastCommitShaColumn.UserCollapsed;
 				userSettingsService.FoldersSettingsService.ShowDateDeletedColumn = !prefs.ColumnsViewModel.DateDeletedColumn.UserCollapsed;
 				userSettingsService.FoldersSettingsService.ShowOriginalPathColumn = !prefs.ColumnsViewModel.OriginalPathColumn.UserCollapsed;
 				userSettingsService.FoldersSettingsService.ShowSyncStatusColumn = !prefs.ColumnsViewModel.StatusColumn.UserCollapsed;
@@ -370,6 +375,11 @@ public static void SetLayoutPreferencesForPath(string folderPath, LayoutPreferen
 				userSettingsService.FoldersSettingsService.TypeColumnWidth = prefs.ColumnsViewModel.ItemTypeColumn.UserLengthPixels;
 				userSettingsService.FoldersSettingsService.SizeColumnWidth = prefs.ColumnsViewModel.SizeColumn.UserLengthPixels;
 				userSettingsService.FoldersSettingsService.TagColumnWidth = prefs.ColumnsViewModel.TagColumn.UserLengthPixels;
+				userSettingsService.FoldersSettingsService.GitStatusColumnWidth = prefs.ColumnsViewModel.GitStatusColumn.UserLengthPixels;
+				userSettingsService.FoldersSettingsService.GitLastCommitDateColumnWidth = prefs.ColumnsViewModel.GitLastCommitDateColumn.UserLengthPixels;
+				userSettingsService.FoldersSettingsService.GitLastCommitMessageColumnWidth = prefs.ColumnsViewModel.GitLastCommitMessageColumn.UserLengthPixels;
+				userSettingsService.FoldersSettingsService.GitCommitAuthorColumnWidth = prefs.ColumnsViewModel.GitCommitAuthorColumn.UserLengthPixels;
+				userSettingsService.FoldersSettingsService.GitLastCommitShaColumnWidth = prefs.ColumnsViewModel.GitLastCommitShaColumn.UserLengthPixels;
 				userSettingsService.FoldersSettingsService.DateDeletedColumnWidth = prefs.ColumnsViewModel.DateDeletedColumn.UserLengthPixels;
 				userSettingsService.FoldersSettingsService.OriginalPathColumnWidth = prefs.ColumnsViewModel.OriginalPathColumn.UserLengthPixels;
 				userSettingsService.FoldersSettingsService.SyncStatusColumnWidth = prefs.ColumnsViewModel.StatusColumn.UserLengthPixels;
@@ -573,6 +583,11 @@ public void SetDefaultLayoutPreferences(ColumnsViewModel columns)
 			userSettingsService.FoldersSettingsService.ShowTypeColumn = !columns.ItemTypeColumn.UserCollapsed;
 			userSettingsService.FoldersSettingsService.ShowSizeColumn = !columns.SizeColumn.UserCollapsed;
 			userSettingsService.FoldersSettingsService.ShowFileTagColumn = !columns.TagColumn.UserCollapsed;
+			userSettingsService.FoldersSettingsService.ShowGitStatusColumn = !columns.GitStatusColumn.UserCollapsed;
+			userSettingsService.FoldersSettingsService.ShowGitLastCommitDateColumn = !columns.GitLastCommitDateColumn.UserCollapsed;
+			userSettingsService.FoldersSettingsService.ShowGitLastCommitMessageColumn = !columns.GitLastCommitMessageColumn.UserCollapsed;
+			userSettingsService.FoldersSettingsService.ShowGitCommitAuthorColumn = !columns.GitCommitAuthorColumn.UserCollapsed;
+			userSettingsService.FoldersSettingsService.ShowGitLastCommitShaColumn = !columns.GitLastCommitShaColumn.UserCollapsed;
 			userSettingsService.FoldersSettingsService.ShowDateDeletedColumn = !columns.DateDeletedColumn.UserCollapsed;
 			userSettingsService.FoldersSettingsService.ShowOriginalPathColumn = !columns.OriginalPathColumn.UserCollapsed;
 			userSettingsService.FoldersSettingsService.ShowSyncStatusColumn = !columns.StatusColumn.UserCollapsed;
@@ -583,6 +598,11 @@ public void SetDefaultLayoutPreferences(ColumnsViewModel columns)
 			userSettingsService.FoldersSettingsService.TypeColumnWidth = columns.ItemTypeColumn.UserLengthPixels;
 			userSettingsService.FoldersSettingsService.SizeColumnWidth = columns.SizeColumn.UserLengthPixels;
 			userSettingsService.FoldersSettingsService.TagColumnWidth = columns.TagColumn.UserLengthPixels;
+			userSettingsService.FoldersSettingsService.GitStatusColumnWidth = columns.GitStatusColumn.UserLengthPixels;
+			userSettingsService.FoldersSettingsService.GitLastCommitDateColumnWidth = columns.GitLastCommitDateColumn.UserLengthPixels;
+			userSettingsService.FoldersSettingsService.GitLastCommitMessageColumnWidth = columns.GitLastCommitMessageColumn.UserLengthPixels;
+			userSettingsService.FoldersSettingsService.GitCommitAuthorColumnWidth = columns.GitCommitAuthorColumn.UserLengthPixels;
+			userSettingsService.FoldersSettingsService.GitLastCommitShaColumnWidth = columns.GitLastCommitShaColumn.UserLengthPixels;
 			userSettingsService.FoldersSettingsService.DateDeletedColumnWidth = columns.DateDeletedColumn.UserLengthPixels;
 			userSettingsService.FoldersSettingsService.OriginalPathColumnWidth = columns.OriginalPathColumn.UserLengthPixels;
 			userSettingsService.FoldersSettingsService.SyncStatusColumnWidth = columns.StatusColumn.UserLengthPixels;

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

@@ -0,0 +1,36 @@
+using LibGit2Sharp;
+
+namespace Files.App.Data.Models
+{
+	/// <summary>
+	/// Represents a model for Git items
+	/// </summary>
+	internal class GitItemModel
+	{
+		/// <summary>
+		/// Gets or initializes file change kind
+		/// </summary>
+		/// <remarks>
+		/// This is often showed as A(Add), D(Delete), M(Modified), U(Untracked) in VS Code.
+		/// </remarks>
+		public ChangeKind Status { get; init; }
+
+		/// <summary>
+		/// Gets or initializes file change kind humanized string
+		/// </summary>
+		/// <remarks>
+		/// This is often showed as A(Add), D(Delete), M(Modified), U(Untracked) in VS Code.
+		/// </remarks>
+		public string? StatusHumanized { get; init; }
+
+		/// <summary>
+		/// Gets or initializes file last commit information including author, committed date, and SHA.
+		/// </summary>
+		public Commit? LastCommit { get; init; }
+
+		/// <summary>
+		/// Gets or initializes file path
+		/// </summary>
+		public string? Path { get; init; }
+	}
+}

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

@@ -852,7 +852,7 @@ public void UpdateGroupOptions()
 			FilesAndFolders.GetExtendedGroupHeaderInfo = groupInfoSelector.Item2;
 		}
 
-		public Dictionary<string, BitmapImage> DefaultIcons = new ();
+		public Dictionary<string, BitmapImage> DefaultIcons = new();
 
 		private uint currentDefaultIconSize = 0;
 
@@ -1193,6 +1193,31 @@ await SafetyExtensions.IgnoreExceptions(() =>
 									gp.InitializeExtendedGroupHeaderInfoAsync();
 								}));
 						}
+
+						if (item.IsGitItem &&
+							GitHelpers.IsRepositoryEx(item.ItemPath, out var repoPath) &&
+							!string.IsNullOrEmpty(repoPath))
+						{
+							cts.Token.ThrowIfCancellationRequested();
+							await SafetyExtensions.IgnoreExceptions(() =>
+							{
+								var repo = new LibGit2Sharp.Repository(repoPath);
+								GitItemModel gitItemModel = GitHelpers.GetGitInformationForItem(repo, item.ItemPath);
+
+								return dispatcherQueue.EnqueueOrInvokeAsync(() =>
+								{
+									var gitItem = item.AsGitItem;
+									gitItem.UnmergedGitStatusLabel = gitItemModel.StatusHumanized;
+									gitItem.GitLastCommitDate = gitItemModel.LastCommit?.Author.When;
+									gitItem.GitLastCommitMessage = gitItemModel.LastCommit?.MessageShort;
+									gitItem.GitLastCommitAuthor = gitItemModel.LastCommit?.Author.Name;
+									gitItem.GitLastCommitSha = gitItemModel.LastCommit?.Sha.Substring(0, 7);
+
+									repo.Dispose();
+								},
+								Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
+							});
+						}
 					}
 				}, cts.Token);
 			}
@@ -1363,8 +1388,14 @@ private async Task RapidAddItemsToCollection(string? path, LibraryItem? library
 					case 0:
 						currentStorageFolder ??= await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFolderWithPathFromPathAsync(path));
 						var syncStatus = await CheckCloudDriveSyncStatusAsync(currentStorageFolder?.Item);
-						PageTypeUpdated?.Invoke(this, new PageTypeUpdatedEventArgs() { IsTypeCloudDrive = syncStatus != CloudDriveSyncStatus.NotSynced && syncStatus != CloudDriveSyncStatus.Unknown });
+						PageTypeUpdated?.Invoke(this, new PageTypeUpdatedEventArgs()
+						{
+							IsTypeCloudDrive = syncStatus != CloudDriveSyncStatus.NotSynced && syncStatus != CloudDriveSyncStatus.Unknown,
+							IsTypeGitRepository = GitDirectory is not null
+						});
 						WatchForDirectoryChanges(path, syncStatus);
+						if (GitDirectory is not null)
+							WatchForGitChanges();
 						break;
 
 					// Enumerated with StorageFolder
@@ -1936,9 +1967,6 @@ private void WatchForDirectoryChanges(string path, CloudDriveSyncStatus syncStat
 				Debug.WriteLine("aWatcherAction done: {0}", rand);
 			});
 
-			if (GitDirectory is not null)
-				WatchForGitChanges(hasSyncStatus);
-
 			watcherCTS.Token.Register(() =>
 			{
 				if (aWatcherAction is not null)
@@ -1956,7 +1984,7 @@ private void WatchForDirectoryChanges(string path, CloudDriveSyncStatus syncStat
 			});
 		}
 
-		private void WatchForGitChanges(bool hasSyncStatus)
+		private void WatchForGitChanges()
 		{
 			var hWatchDir = NativeFileOperationsHelper.CreateFileFromApp(
 				GitDirectory!,
@@ -1979,9 +2007,6 @@ private void WatchForGitChanges(bool hasSyncStatus)
 				var rand = Guid.NewGuid();
 				var notifyFilters = FILE_NOTIFY_CHANGE_DIR_NAME | FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_LAST_WRITE | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_CREATION;
 
-				if (hasSyncStatus)
-					notifyFilters |= FILE_NOTIFY_CHANGE_ATTRIBUTES;
-
 				var overlapped = new OVERLAPPED();
 				overlapped.hEvent = CreateEvent(IntPtr.Zero, false, false, null);
 				const uint INFINITE = 0xFFFFFFFF;
@@ -2255,9 +2280,9 @@ private async Task AddFileOrFolderAsync(ListedItem? item)
 
 			// FILE_ATTRIBUTE_DIRECTORY
 			if ((findData.dwFileAttributes & 0x10) > 0)
-				listedItem = await Win32StorageEnumerator.GetFolder(findData, Directory.GetParent(fileOrFolderPath).FullName, addFilesCTS.Token);
+				listedItem = await Win32StorageEnumerator.GetFolder(findData, Directory.GetParent(fileOrFolderPath).FullName, GitDirectory is not null, addFilesCTS.Token);
 			else
-				listedItem = await Win32StorageEnumerator.GetFile(findData, Directory.GetParent(fileOrFolderPath).FullName, addFilesCTS.Token);
+				listedItem = await Win32StorageEnumerator.GetFile(findData, Directory.GetParent(fileOrFolderPath).FullName, GitDirectory is not null, addFilesCTS.Token);
 
 			await AddFileOrFolderAsync(listedItem);
 
@@ -2446,6 +2471,8 @@ public class PageTypeUpdatedEventArgs
 		public bool IsTypeCloudDrive { get; set; }
 
 		public bool IsTypeRecycleBin { get; set; }
+
+		public bool IsTypeGitRepository { get; set; }
 	}
 
 	public class WorkingDirectoryModifiedEventArgs : EventArgs

src/Files.App/Files.App.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net7.0-windows10.0.22621.0</TargetFramework>
         <OutputType>WinExe</OutputType>
@@ -25,8 +25,6 @@
         <Configurations>Debug;Release;Stable;Preview;Store</Configurations>
         <TieredCompilation>true</TieredCompilation>
         <TieredPgo>true</TieredPgo>
-        <!--<ImplicitUsings>disable</ImplicitUsings>
-        <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>-->
     </PropertyGroup>
     <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
         <DefineConstants>TRACE;DEBUG;NETFX_CORE;DISABLE_XAML_GENERATED_MAIN</DefineConstants>