Code cleanup

Author: jonashertzman

FileDiff/AppSettings.cs

@@ -219,27 +219,27 @@ public static Brush FolderFullMatchBackground
 		}
 	}
 
-	public static Brush FolderPartialMatchForeground
+	public static Brush FolderNewForeground
 	{
 		get;
 		set
 		{
 			field = value;
 			field.Freeze();
-			CurrentTheme.FolderPartialMatchForeground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(FolderPartialMatchForeground));
+			CurrentTheme.FolderNewForeground = ((SolidColorBrush)value).Color.ToString();
+			NotifyStaticPropertyChanged(nameof(FolderNewForeground));
 		}
 	}
 
-	public static Brush FolderPartialMatchBackground
+	public static Brush FolderNewBackground
 	{
 		get;
 		set
 		{
 			field = value;
 			field.Freeze();
-			CurrentTheme.FolderPartialMatchBackground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(FolderPartialMatchBackground));
+			CurrentTheme.FolderNewBackground = ((SolidColorBrush)value).Color.ToString();
+			NotifyStaticPropertyChanged(nameof(FolderNewBackground));
 		}
 	}
 
@@ -267,27 +267,27 @@ public static Brush FolderDeletedBackground
 		}
 	}
 
-	public static Brush FolderNewForeground
+	public static Brush FolderPartialMatchForeground
 	{
 		get;
 		set
 		{
 			field = value;
 			field.Freeze();
-			CurrentTheme.FolderNewForeground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(FolderNewForeground));
+			CurrentTheme.FolderPartialMatchForeground = ((SolidColorBrush)value).Color.ToString();
+			NotifyStaticPropertyChanged(nameof(FolderPartialMatchForeground));
 		}
 	}
 
-	public static Brush FolderNewBackground
+	public static Brush FolderPartialMatchBackground
 	{
 		get;
 		set
 		{
 			field = value;
 			field.Freeze();
-			CurrentTheme.FolderNewBackground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(FolderNewBackground));
+			CurrentTheme.FolderPartialMatchBackground = ((SolidColorBrush)value).Color.ToString();
+			NotifyStaticPropertyChanged(nameof(FolderPartialMatchBackground));
 		}
 	}
 
@@ -341,27 +341,39 @@ public static Brush FullMatchBackground
 		}
 	}
 
-	public static Brush PartialMatchForeground
+	public static Brush NewForeground
 	{
 		get;
 		set
 		{
 			field = value;
 			field.Freeze();
-			CurrentTheme.PartialMatchForeground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(PartialMatchForeground));
+			CurrentTheme.NewForeground = ((SolidColorBrush)value).Color.ToString();
+			NotifyStaticPropertyChanged(nameof(NewForeground));
 		}
 	}
 
-	public static Brush PartialMatchBackground
+	public static Brush NewBackground
 	{
 		get;
 		set
 		{
 			field = value;
 			field.Freeze();
-			CurrentTheme.PartialMatchBackground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(PartialMatchBackground));
+			CurrentTheme.NewBackground = ((SolidColorBrush)value).Color.ToString();
+			NotifyStaticPropertyChanged(nameof(NewBackground));
+		}
+	}
+
+	public static Brush MovedToBackground
+	{
+		get;
+		set
+		{
+			field = value;
+			field.Freeze();
+			CurrentTheme.MovedToBackground = ((SolidColorBrush)value).Color.ToString();
+			NotifyStaticPropertyChanged(nameof(MovedToBackground));
 		}
 	}
 
@@ -389,92 +401,92 @@ public static Brush DeletedBackground
 		}
 	}
 
-	public static Brush NewForeground
+	public static Brush MovedFromBackground
 	{
 		get;
 		set
 		{
 			field = value;
 			field.Freeze();
-			CurrentTheme.NewForeground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(NewForeground));
+			CurrentTheme.MovedFromBackground = ((SolidColorBrush)value).Color.ToString();
+			NotifyStaticPropertyChanged(nameof(MovedFromBackground));
 		}
 	}
 
-	public static Brush NewBackground
+	public static Brush PartialMatchForeground
 	{
 		get;
 		set
 		{
 			field = value;
 			field.Freeze();
-			CurrentTheme.NewBackground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(NewBackground));
+			CurrentTheme.PartialMatchForeground = ((SolidColorBrush)value).Color.ToString();
+			NotifyStaticPropertyChanged(nameof(PartialMatchForeground));
 		}
 	}
 
-	public static Brush IgnoredForeground
+	public static Brush PartialMatchBackground
 	{
 		get;
 		set
 		{
 			field = value;
 			field.Freeze();
-			CurrentTheme.IgnoredForeground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(IgnoredForeground));
+			CurrentTheme.PartialMatchBackground = ((SolidColorBrush)value).Color.ToString();
+			NotifyStaticPropertyChanged(nameof(PartialMatchBackground));
 		}
 	}
 
-	public static Brush IgnoredBackground
+	public static Brush IgnoredForeground
 	{
 		get;
 		set
 		{
 			field = value;
 			field.Freeze();
-			CurrentTheme.IgnoredBackground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(IgnoredBackground));
+			CurrentTheme.IgnoredForeground = ((SolidColorBrush)value).Color.ToString();
+			NotifyStaticPropertyChanged(nameof(IgnoredForeground));
 		}
 	}
 
-	public static Brush MovedFromBackground
+	public static Brush IgnoredBackground
 	{
 		get;
 		set
 		{
 			field = value;
 			field.Freeze();
-			CurrentTheme.MovedFromBackground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(MovedFromBackground));
+			CurrentTheme.IgnoredBackground = ((SolidColorBrush)value).Color.ToString();
+			NotifyStaticPropertyChanged(nameof(IgnoredBackground));
 		}
 	}
 
-	public static Brush MovedToBackground
+
+	// Editor colors
+	public static Brush WhiteSpaceForeground
 	{
 		get;
 		set
 		{
 			field = value;
 			field.Freeze();
-			CurrentTheme.MovedToBackground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(MovedToBackground));
+			CurrentTheme.WhiteSpaceForeground = ((SolidColorBrush)value).Color.ToString();
+			NotifyStaticPropertyChanged(nameof(WhiteSpaceForeground));
 		}
 	}
 
-	public static Brush WhiteSpaceForeground
+	public static Brush SelectionBackground
 	{
 		get;
 		set
 		{
 			field = value;
 			field.Freeze();
-			CurrentTheme.WhiteSpaceForeground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(WhiteSpaceForeground));
+			CurrentTheme.SelectionBackground = ((SolidColorBrush)value).Color.ToString();
+			NotifyStaticPropertyChanged(nameof(SelectionBackground));
 		}
 	}
 
-
-	// Editor colors
 	public static Brush LineNumberColor
 	{
 		get;
@@ -511,18 +523,6 @@ public static Brush SnakeColor
 		}
 	}
 
-	public static Brush SelectionBackground
-	{
-		get;
-		set
-		{
-			field = value;
-			field.Freeze();
-			CurrentTheme.SelectionBackground = ((SolidColorBrush)value).Color.ToString();
-			NotifyStaticPropertyChanged(nameof(SelectionBackground));
-		}
-	}
-
 
 	// UI colors
 	public static Brush WindowForeground

FileDiff/ColorTheme.cs

@@ -11,14 +11,14 @@ public class ColorTheme
 	public required string FolderFullMatchForeground { get; set; }
 	public required string FolderFullMatchBackground { get; set; }
 
-	public required string FolderPartialMatchForeground { get; set; }
-	public required string FolderPartialMatchBackground { get; set; }
+	public required string FolderNewForeground { get; set; }
+	public required string FolderNewBackground { get; set; }
 
 	public required string FolderDeletedForeground { get; set; }
 	public required string FolderDeletedBackground { get; set; }
 
-	public required string FolderNewForeground { get; set; }
-	public required string FolderNewBackground { get; set; }
+	public required string FolderPartialMatchForeground { get; set; }
+	public required string FolderPartialMatchBackground { get; set; }
 
 	public required string FolderIgnoredForeground { get; set; }
 	public required string FolderIgnoredBackground { get; set; }
@@ -27,28 +27,28 @@ public class ColorTheme
 	public required string FullMatchForeground { get; set; }
 	public required string FullMatchBackground { get; set; }
 
-	public required string PartialMatchForeground { get; set; }
-	public required string PartialMatchBackground { get; set; }
+	public required string NewForeground { get; set; }
+	public required string NewBackground { get; set; }
+
+	public required string MovedToBackground { get; set; }
 
 	public required string DeletedForeground { get; set; }
 	public required string DeletedBackground { get; set; }
 
-	public required string NewForeground { get; set; }
-	public required string NewBackground { get; set; }
+	public required string MovedFromBackground { get; set; }
+
+	public required string PartialMatchForeground { get; set; }
+	public required string PartialMatchBackground { get; set; }
 
 	public required string IgnoredForeground { get; set; }
 	public required string IgnoredBackground { get; set; }
 
-	public required string MovedFromBackground { get; set; }
-	public required string MovedToBackground { get; set; }
-
-	public required string WhiteSpaceForeground { get; set; }
-
 	// Editor colors
+	public required string WhiteSpaceForeground { get; set; }
+	public required string SelectionBackground { get; set; }
 	public required string LineNumberColor { get; set; }
 	public required string CurrentDiffColor { get; set; }
 	public required string SnakeColor { get; set; }
-	public required string SelectionBackground { get; set; }
 
 	// UI colors
 	public required string NormalText { get; set; }