IsCustomized to IsDefault

Author: 0x5bfa

src/Files.App/Data/Items/ModifiableCommandHotKeyItem.cs

@@ -35,7 +35,7 @@ public bool IsEditMode
 		}
 
 		private bool _IsCustomized;
-		public bool IsCustomized
+		public bool IsDefaultKey
 		{
 			get => _IsCustomized;
 			set => SetProperty(ref _IsCustomized, value);

src/Files.App/ViewModels/Settings/ActionsViewModel.cs

@@ -103,7 +103,7 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 							HotKey = hotkey,
 							DefaultHotKeyCollection = defaultKeys,
 							PreviousHotKey = hotkey,
-							IsCustomized = !defaultKeys.Contains(hotkey),
+							IsDefaultKey = defaultKeys.Contains(hotkey),
 						});
 					}
 				}

src/Files.App/Views/Settings/ActionsPage.xaml

@@ -35,7 +35,7 @@
 			</ResourceDictionary.ThemeDictionaries>
 
 			<ResourceDictionary.MergedDictionaries>
-				<ResourceDictionary Source="/ResourceDictionaries/RightAlignedToggleSwitchStyle.xaml" />
+				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/RightAlignedToggleSwitchStyle.xaml" />
 				<ResourceDictionary Source="ms-appx:///UserControls/KeyboardShortcut/KeyboardShortcut.xaml" />
 			</ResourceDictionary.MergedDictionaries>
 
@@ -244,7 +244,7 @@
 											x:Name="CustomizedIndicatorCircleBorder"
 											Width="8"
 											Height="8"
-											x:Load="{x:Bind IsCustomized, Mode=OneWay}"
+											x:Load="{x:Bind IsDefaultKey, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
 											Background="{ThemeResource SystemAccentColor}"
 											CornerRadius="{StaticResource ControlCornerRadius}"
 											ToolTipService.ToolTip="{helpers:ResourceString Name=Customized}" />

src/Files.App/Views/Settings/ActionsPage.xaml.cs

@@ -29,6 +29,7 @@ private void RootGrid_PointerEntered(object sender, PointerRoutedEventArgs e)
 		{
 			VisualStateManager.GoToState((UserControl)sender, PointerOverState, true);
 
+			// Make edit button visible on pointer in
 			if (sender is UserControl userControl &&
 				userControl.FindChild(PART_EditButton) is Button editButton &&
 				userControl.DataContext is ModifiableCommandHotKeyItem item &&
@@ -40,6 +41,7 @@ private void RootGrid_PointerExited(object sender, PointerRoutedEventArgs e)
 		{
 			VisualStateManager.GoToState((UserControl)sender, NormalState, true);
 
+			// Make edit button invisible on pointer out
 			if (sender is UserControl userControl &&
 				userControl.FindChild(PART_EditButton) is Button editButton &&
 				userControl.DataContext is ModifiableCommandHotKeyItem item &&
@@ -51,7 +53,7 @@ private void EditButton_Click(object sender, RoutedEventArgs e)
 		{
 			if (sender is Button button && button.DataContext is ModifiableCommandHotKeyItem item)
 			{
-				// Hide the add-new section grid
+				// Hide the add command grid
 				ViewModel.ShowAddNewShortcutGrid = false;
 
 				// Reset the selected item's info
@@ -61,14 +63,14 @@ private void EditButton_Click(object sender, RoutedEventArgs e)
 					ViewModel.SelectedNewShortcutItem = null;
 				}
 
-				// Reset edit mode for each item
+				// Reset edit mode of every item
 				foreach (var hotkey in ViewModel.ValidKeyboardShortcuts)
 				{
 					hotkey.IsEditMode = false;
 					hotkey.HotKeyText = hotkey.HotKey.LocalizedLabel;
 				}
 
-				// Enter edit mode
+				// Enter edit mode for the item
 				item.IsEditMode = true;
 			}
 		}
@@ -107,9 +109,9 @@ GeneralSettingsService.Actions is not null
 			var newHotKey = HotKey.Parse(item.HotKeyText);
 			var modifiedCollection = HotKeyCollection.Empty;
 
-			if (!item.IsCustomized)
+			if (item.IsDefaultKey)
 			{
-				// The first time to customize
+				// The first time to customize in the user setting
 				if (string.IsNullOrEmpty(storedKeys))
 				{
 					// Replace with new one
@@ -140,7 +142,7 @@ GeneralSettingsService.Actions is not null
 				foreach (var action in ViewModel.ValidKeyboardShortcuts)
 				{
 					if (action.CommandCode == item.CommandCode)
-						action.IsCustomized = !item.DefaultHotKeyCollection.Contains(action.HotKey);
+						action.IsDefaultKey = item.DefaultHotKeyCollection.Contains(action.HotKey);
 				}
 
 				// Exit edit mode
@@ -175,7 +177,7 @@ GeneralSettingsService.Actions is not null
 				foreach (var action in ViewModel.ValidKeyboardShortcuts)
 				{
 					if (action.CommandCode == item.CommandCode)
-						action.IsCustomized = !item.DefaultHotKeyCollection.Contains(action.HotKey);
+						action.IsDefaultKey = item.DefaultHotKeyCollection.Contains(action.HotKey);
 				}
 
 				// Exit edit mode
@@ -209,10 +211,9 @@ GeneralSettingsService.Actions is not null
 			// Initialize
 			var modifiedCollection = HotKeyCollection.Empty;
 
-			// The first time to customize
-			if (!item.IsCustomized)
+			if (item.IsDefaultKey)
 			{
-				// The first time to customize
+				// The first time to customize in the user setting
 				if (string.IsNullOrEmpty(storedKeys))
 				{
 					// Replace with new one