Requested Changes

Author: ferrariofilippo

src/Files.App/Helpers/ColorHelpers.cs

@@ -1,3 +1,4 @@
+using CommunityToolkit.WinUI.Helpers;
 using System;
 using Windows.UI;
 
@@ -36,5 +37,20 @@ public static uint ToUint(this Color c)
 		{
 			return (uint)(((c.A << 24) | (c.R << 16) | (c.G << 8) | c.B) & 0xffffffffL);
 		}
+
+		/// <summary>
+		/// Generates a random color and returns its Hex
+		/// </summary>
+		/// <returns></returns>
+		public static string RandomColor()
+		{
+			var color = Color.FromArgb(
+				255,
+				(byte)Random.Shared.Next(0, 256),
+				(byte)Random.Shared.Next(0, 256),
+				(byte)Random.Shared.Next(0, 256));
+
+			return color.ToHex();
+		}
 	}
 }

src/Files.App/ServicesImplementation/Settings/FileTagsSettingsService.cs

@@ -1,4 +1,5 @@
 using Files.App.Extensions;
+using Files.App.Helpers;
 using Files.App.Serialization;
 using Files.App.Serialization.Implementation;
 using Files.Backend.Services.Settings;
@@ -78,7 +79,7 @@ public void CreateNewTag()
 		{
 			var newTag = new TagViewModel(
 				"NewTag",
-				"#9EA3A1",
+				ColorHelpers.RandomColor(),
 				Guid.NewGuid().ToString());
 
 			var oldTags = FileTagList.ToList();

src/Files.App/ViewModels/SettingsViewModels/AdvancedViewModel.cs

@@ -43,10 +43,10 @@ public class AdvancedViewModel : ObservableObject
 
 		public ICommand AddTagCommand { get; }
 
-		public ICommand EditTagCommand { get; }
-
 		public ICommand DeleteTagCommand { get; }
 
+		public ICommand EditTagCommand { get; set; }
+
 		public ObservableCollection<TagViewModel> Tags { get; set; }
 
 		private int selectedTagIndex = -1;

src/Files.App/Views/SettingsPages/Advanced.xaml

@@ -160,6 +160,11 @@
 									Command="{x:Bind ViewModel.AddTagCommand, Mode=OneWay}"
 									Icon="Add"
 									Label="{helpers:ResourceString Name=Add}" />
+								<AppBarButton
+									Command="{x:Bind ViewModel.EditTagCommand}"
+									Icon="Edit"
+									IsEnabled="{x:Bind ViewModel.AreTagsCommandEnabled, Mode=OneWay}"
+									Label="{helpers:ResourceString Name=Edit}" />
 								<AppBarButton
 									Command="{x:Bind ViewModel.DeleteTagCommand}"
 									Icon="Delete"
@@ -204,22 +209,31 @@
 													<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="{ThemeResource SolidBackgroundFillColorSecondary}" />
 												</TextBox.Resources>
 											</TextBox>
-											<Ellipse
+											<Button
 												Grid.Column="2"
-												Width="24"
-												Height="24"
-												Margin="0,8"
-												Fill="{x:Bind Color}">
-												<Ellipse.ContextFlyout>
+												Padding="0"
+												AutomationProperties.Name="{helpers:ResourceString Name=TagColor}">
+												<StackPanel Orientation="Horizontal">
+													<Border
+														Width="24"
+														Height="24"
+														Margin="4"
+														Background="{x:Bind Color}"
+														CornerRadius="4" />
+													<FontIcon
+														Margin="8,4,10,4"
+														FontSize="12"
+														Glyph="&#xE019;" />
+												</StackPanel>
+												<Button.Flyout>
 													<Flyout>
 														<controls:ColorPicker
-															Grid.Column="2"
 															ColorChanged="ColorPicker_ColorChanged"
 															IsAlphaEnabled="True"
 															IsColorSpectrumVisible="False" />
 													</Flyout>
-												</Ellipse.ContextFlyout>
-											</Ellipse>
+												</Button.Flyout>
+											</Button>
 										</Grid>
 									</DataTemplate>
 								</ListView.ItemTemplate>

src/Files.App/Views/SettingsPages/Advanced.xaml.cs

@@ -1,3 +1,4 @@
+using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.WinUI.UI;
 using Files.Backend.ViewModels.FileTags;
 using Microsoft.UI.Xaml;
@@ -26,6 +27,8 @@ public Advanced()
 		{
 			InitializeComponent();
 
+			ViewModel.EditTagCommand = new RelayCommand(StartRenameTag);
+
 			tapDebounceTimer = DispatcherQueue.CreateTimer();
 		}