refactor: move namespace

Poker-sang · Poker-sang · commit 8425d4632685 · 2023-03-07T15:24:24.000+08:00
diff --git a/src/Files.App/Converters/BoolToSelectionMode.cs b/src/Files.App/Converters/BoolToSelectionMode.cs
@@ -8,12 +8,12 @@ internal class BoolToSelectionMode : IValueConverter
 	{
 		public object Convert(object value, Type targetType, object parameter, string language)
 		{
-			return (value as bool?) ?? false ? ListViewSelectionMode.Multiple : ListViewSelectionMode.Extended;
+			return value as bool? ?? false ? ListViewSelectionMode.Multiple : ListViewSelectionMode.Extended;
 		}
 
 		public object ConvertBack(object value, Type targetType, object parameter, string language)
 		{
-			return ((value as ListViewSelectionMode?) ?? ListViewSelectionMode.Extended) == ListViewSelectionMode.Multiple;
+			return (value as ListViewSelectionMode? ?? ListViewSelectionMode.Extended) == ListViewSelectionMode.Multiple;
 		}
 	}
 }
diff --git a/src/Files.App/Converters/ConflictResolveOptionToIndexConverter.cs b/src/Files.App/Converters/ConflictResolveOptionToIndexConverter.cs
@@ -1,8 +1,8 @@
+using System;
 using Files.Shared.Enums;
 using Microsoft.UI.Xaml.Data;
-using System;
 
-namespace Files.App.ValueConverters.EnumConverters
+namespace Files.App.Converters
 {
 	internal sealed class ConflictResolveOptionToIndexConverter : IValueConverter
 	{
diff --git a/src/Files.App/Converters/DateTimeOffsetToString.cs b/src/Files.App/Converters/DateTimeOffsetToString.cs
@@ -7,20 +7,20 @@ namespace Files.App.Converters
 {
 	internal class DateTimeOffsetToString : IValueConverter
 	{
-		private static readonly IDateTimeFormatter formatter = Ioc.Default.GetService<IDateTimeFormatter>();
+		private static readonly IDateTimeFormatter formatter = Ioc.Default.GetService<IDateTimeFormatter>()!;
 
-		public object Convert(object value, Type targetType, object parameter, string language)
+		public object Convert(object? value, Type targetType, object parameter, string language)
 		{
 			return value is null
 				? string.Empty
 				: formatter.ToLongLabel((DateTimeOffset)value);
 		}
 
-		public object ConvertBack(object value, Type targetType, object parameter, string language)
+		public object? ConvertBack(object value, Type targetType, object parameter, string language)
 		{
 			try
 			{
-				return DateTimeOffset.Parse(value as string);
+				return DateTimeOffset.Parse((string)value);
 			}
 			catch (FormatException)
 			{
diff --git a/src/Files.App/Converters/DoubleArrayToString.cs b/src/Files.App/Converters/DoubleArrayToString.cs
@@ -8,35 +8,31 @@ internal class DoubleArrayToString : IValueConverter
 	{
 		public object Convert(object value, Type targetType, object parameter, string language)
 		{
-			var array = value as double[];
-
-			if (array is null)
+			if (value is not double[] array)
 				return string.Empty;
 
 			var str = new StringBuilder();
 
 			foreach (var i in array)
 			{
-				str.Append(string.Format("{0}; ", i));
+				str.Append($"{i}; ");
 			}
 
 			return str.ToString();
 		}
 
 		public object ConvertBack(object value, Type targetType, object parameter, string language)
 		{
-			var strArray = (value as string).Split("; ");
+			var strArray = ((string)value).Split("; ");
 			var array = new double[strArray.Length];
 
-			for (int i = 0; i < strArray.Length; i++)
+			for (var i = 0; i < strArray.Length; i++)
 			{
 				try
 				{
 					array[i] = double.Parse(strArray[i]);
 				}
-				catch (Exception)
-				{
-				}
+				catch { }
 			}
 			return array;
 		}
diff --git a/src/Files.App/Converters/DoubleToString.cs b/src/Files.App/Converters/DoubleToString.cs
@@ -5,21 +5,16 @@ namespace Files.App.Converters
 {
 	internal class DoubleToString : IValueConverter
 	{
-		public object Convert(object value, Type targetType, object parameter, string language)
+		public object? Convert(object? value, Type targetType, object parameter, string language)
 		{
-			if (value is not null)
-			{
-				return value.ToString();
-			}
-
-			return "";
+			return value is null ? "" : value.ToString();
 		}
 
-		public object ConvertBack(object value, Type targetType, object parameter, string language)
+		public object? ConvertBack(object value, Type targetType, object parameter, string language)
 		{
 			try
 			{
-				return Double.Parse(value as string);
+				return double.Parse((string)value);
 			}
 			catch (FormatException)
 			{
diff --git a/src/Files.App/Converters/GenericEnumConverter.cs b/src/Files.App/Converters/GenericEnumConverter.cs
@@ -1,9 +1,9 @@
-using Microsoft.UI.Xaml.Data;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.UI.Xaml.Data;
 
-namespace Files.App.ValueConverters
+namespace Files.App.Converters
 {
 	internal sealed class GenericEnumConverter : IValueConverter
 	{
@@ -19,7 +19,7 @@ public object ConvertBack(object value, Type targetType, object parameter, strin
 				s => s.Split(',').ToDictionary(k => System.Convert.ToInt64(k.Split('-')[1]), v => System.Convert.ToInt64(v.Split('-')[0])));
 		}
 
-		private object ConvertInternal(object value, Type targetType, object parameter, string language, Func<string, Dictionary<long, long>> enumConversion)
+		private static object ConvertInternal(object value, Type targetType, object parameter, string language, Func<string, Dictionary<long, long>> enumConversion)
 		{
 			var enumValue = System.Convert.ToInt64(value);
 
@@ -37,7 +37,7 @@ private object ConvertInternal(object value, Type targetType, object parameter,
 
 			try
 			{
-				if (Enum.GetName(targetType, enumValue) is string enumName)
+				if (Enum.GetName(targetType, enumValue) is { } enumName)
 				{
 					return Enum.Parse(targetType, enumName);
 				}
diff --git a/src/Files.App/Converters/ImageModelToImageConverter.cs b/src/Files.App/Converters/ImageModelToImageConverter.cs
@@ -1,8 +1,8 @@
+using System;
 using Files.App.AppModels;
 using Microsoft.UI.Xaml.Data;
-using System;
 
-namespace Files.App.ValueConverters
+namespace Files.App.Converters
 {
 	internal sealed class ImageModelToImageConverter : IValueConverter
 	{
diff --git a/src/Files.App/Converters/IntToGroupOption.cs b/src/Files.App/Converters/IntToGroupOption.cs
@@ -6,7 +6,7 @@ namespace Files.App.Converters
 {
 	public class IntToGroupOption : IValueConverter
 	{
-		public object Convert(object value, Type targetType, object parameter, string language)
+		public object Convert(object? value, Type targetType, object parameter, string language)
 		{
 			return System.Convert.ToInt32((byte)(value ?? GroupOption.None));
 		}
diff --git a/src/Files.App/Converters/IntToSortDirection.cs b/src/Files.App/Converters/IntToSortDirection.cs
@@ -6,7 +6,7 @@ namespace Files.App.Converters
 {
 	public class IntToSortDirection : IValueConverter
 	{
-		public object Convert(object value, Type targetType, object parameter, string language)
+		public object Convert(object? value, Type targetType, object parameter, string language)
 		{
 			return System.Convert.ToInt32(value ?? SortDirection.Ascending);
 		}
diff --git a/src/Files.App/Converters/IntToSortOption.cs b/src/Files.App/Converters/IntToSortOption.cs
@@ -6,7 +6,7 @@ namespace Files.App.Converters
 {
 	public class IntToSortOption : IValueConverter
 	{
-		public object Convert(object value, Type targetType, object parameter, string language)
+		public object Convert(object? value, Type targetType, object parameter, string language)
 		{
 			return System.Convert.ToInt32((byte)(value ?? SortOption.Name));
 		}
diff --git a/src/Files.App/Converters/MiddleTextEllipsisConverter.cs b/src/Files.App/Converters/MiddleTextEllipsisConverter.cs
@@ -5,10 +5,10 @@ namespace Files.App.Converters
 {
 	public class MiddleTextEllipsisConverter : IValueConverter
 	{
-		public object Convert(object value, Type targetType, object parameter, string language)
+		public object Convert(object value, Type targetType, object? parameter, string language)
 		{
-			string text = value as string;
-			int maxLength = parameter is null ? 15 : System.Convert.ToInt32(parameter);
+			var text = value as string;
+			var maxLength = parameter is null ? 15 : System.Convert.ToInt32(parameter);
 
 			if (string.IsNullOrWhiteSpace(text))
 			{
@@ -17,13 +17,13 @@ public object Convert(object value, Type targetType, object parameter, string la
 
 			if (text.Length > maxLength)
 			{
-				int amountToCutOff = text.Length - maxLength;
-				int middleIndexInString = text.Length / 2;
+				var amountToCutOff = text.Length - maxLength;
+				var middleIndexInString = text.Length / 2;
 
-				int startIndex = text.Length - (middleIndexInString + (amountToCutOff / 2));
-				int endIndex = middleIndexInString + (amountToCutOff / 2);
+				var startIndex = text.Length - (middleIndexInString + (amountToCutOff / 2));
+				var endIndex = middleIndexInString + (amountToCutOff / 2);
 
-				string newString = string.Format("{0}...{1}", text.Substring(0, startIndex), text.Substring(endIndex));
+				var newString = $"{text[..startIndex]}...{text[endIndex..]}";
 
 				return newString;
 			}
diff --git a/src/Files.App/Converters/MultiBooleanConverter.cs b/src/Files.App/Converters/MultiBooleanConverter.cs
@@ -5,16 +5,16 @@ namespace Files.App.Converters
 {
 	internal class MultiBooleanConverter
 	{
-		public static Boolean OrConvert(bool a, bool b)
+		public static bool OrConvert(bool a, bool b)
 			=> (a || b);
 
-		public static Boolean AndConvert(bool a, bool b)
+		public static bool AndConvert(bool a, bool b)
 			=> (a && b);
 
-		public static Boolean AndNotConvert(bool a, bool b)
+		public static bool AndNotConvert(bool a, bool b)
 			=> (a && !b);
 
-		public static Boolean OrAndConvert(bool a, bool b, bool c)
+		public static bool OrAndConvert(bool a, bool b, bool c)
 			=> (a || b) && c;
 
 		public static Visibility OrConvertToVisibility(bool a, bool b)
diff --git a/src/Files.App/Converters/StorageDeleteOptionToBooleanConverter.cs b/src/Files.App/Converters/StorageDeleteOptionToBooleanConverter.cs
@@ -8,12 +8,12 @@ internal class StorageDeleteOptionToBooleanConverter : IValueConverter
 	{
 		public object Convert(object value, Type targetType, object parameter, string language)
 		{
-			return value is StorageDeleteOption option && option == StorageDeleteOption.PermanentDelete;
+			return value is StorageDeleteOption.PermanentDelete;
 		}
 
 		public object ConvertBack(object value, Type targetType, object parameter, string language)
 		{
-			return (value is bool bl && bl) ? StorageDeleteOption.PermanentDelete : StorageDeleteOption.Default;
+			return value is true ? StorageDeleteOption.PermanentDelete : StorageDeleteOption.Default;
 		}
 	}
 }
diff --git a/src/Files.App/Converters/StringArrayToString.cs b/src/Files.App/Converters/StringArrayToString.cs
@@ -8,23 +8,21 @@ internal class StringArrayToString : IValueConverter
 	{
 		public object Convert(object value, Type targetType, object parameter, string language)
 		{
-			var array = value as string[];
-
-			if (array is null || !(array is string[]))
+			if (value is not string[] array)
 				return string.Empty;
 
 			var str = new StringBuilder();
 			foreach (var i in array)
 			{
-				str.Append(string.Format("{0}; ", i));
+				str.Append($"{i}; ");
 			}
 
 			return str.ToString();
 		}
 
 		public object ConvertBack(object value, Type targetType, object parameter, string language)
 		{
-			return (value as string).Split("; ");
+			return ((string)value).Split("; ");
 		}
 	}
 }
diff --git a/src/Files.App/Converters/StringToBrushConverter.cs b/src/Files.App/Converters/StringToBrushConverter.cs
@@ -1,9 +1,9 @@
-﻿using CommunityToolkit.WinUI.Helpers;
+﻿using System;
+using CommunityToolkit.WinUI.Helpers;
 using Microsoft.UI.Xaml.Data;
 using Microsoft.UI.Xaml.Media;
-using System;
 
-namespace Files.App.ValueConverters
+namespace Files.App.Converters
 {
 	internal sealed class StringToBrushConverter : IValueConverter
 	{
@@ -12,7 +12,7 @@ internal sealed class StringToBrushConverter : IValueConverter
 			if (value is not string strValue)
 				return null;
 
-			return new SolidColorBrush(ColorHelper.ToColor(strValue));
+			return new SolidColorBrush(strValue.ToColor());
 		}
 
 		public object ConvertBack(object value, Type targetType, object parameter, string language)
diff --git a/src/Files.App/Converters/UInt32ToString.cs b/src/Files.App/Converters/UInt32ToString.cs
@@ -5,16 +5,16 @@ namespace Files.App.Converters
 {
 	internal class UInt32ToString : IValueConverter
 	{
-		public object Convert(object value, Type targetType, object parameter, string language)
+		public object? Convert(object? value, Type targetType, object parameter, string language)
 		{
-			return value is not null ? value.ToString() : string.Empty;
+			return value is null ? string.Empty : value.ToString();
 		}
 
-		public object ConvertBack(object value, Type targetType, object parameter, string language)
+		public object? ConvertBack(object value, Type targetType, object parameter, string language)
 		{
 			try
 			{
-				return uint.Parse(value as string);
+				return uint.Parse((string)value );
 			}
 			catch (FormatException)
 			{
diff --git a/src/Files.App/Converters/VisibilityInvertConverter.cs b/src/Files.App/Converters/VisibilityInvertConverter.cs
@@ -13,7 +13,7 @@ public object Convert(object value, Type targetType, object parameter, string la
 				return isVisible ? Visibility.Collapsed : Visibility.Visible;
 			}
 
-			return (Visibility)value == Visibility.Visible ? Visibility.Collapsed : Visibility.Visible;
+			return (Visibility)value is Visibility.Visible ? Visibility.Collapsed : Visibility.Visible;
 		}
 
 		public object ConvertBack(object value, Type targetType, object parameter, string language)
diff --git a/src/Files.App/Dialogs/AddItemDialog.xaml b/src/Files.App/Dialogs/AddItemDialog.xaml
@@ -2,10 +2,10 @@
 	x:Class="Files.App.Dialogs.AddItemDialog"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:converters="using:Files.App.Converters"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:vc="using:Files.App.ValueConverters"
 	xmlns:vm="using:Files.Backend.ViewModels.Dialogs.AddItemDialog"
 	x:Name="AddDialog"
 	Title="{helpers:ResourceString Name=AddDialog/Title}"
@@ -19,7 +19,7 @@
 	mc:Ignorable="d">
 
 	<ContentDialog.Resources>
-		<vc:ImageModelToImageConverter x:Key="ImageModelToImageConverter" />
+		<converters:ImageModelToImageConverter x:Key="ImageModelToImageConverter" />
 	</ContentDialog.Resources>
 
 	<Grid RowSpacing="25">
diff --git a/src/Files.App/Dialogs/FilesystemOperationDialog.xaml b/src/Files.App/Dialogs/FilesystemOperationDialog.xaml
@@ -7,8 +7,6 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:ts="using:Files.App.TemplateSelectors"
 	xmlns:tvc="using:CommunityToolkit.WinUI.UI.Converters"
-	xmlns:vc="using:Files.App.ValueConverters"
-	xmlns:vc2="using:Files.App.ValueConverters.EnumConverters"
 	xmlns:vc3="using:Files.App.Converters"
 	xmlns:vm="using:Files.Backend.ViewModels.Dialogs.FileSystemDialog"
 	x:Name="RootDialog"
@@ -28,9 +26,9 @@
 	<ContentDialog.Resources>
 		<x:Double x:Key="ContentDialogMaxWidth">800</x:Double>
 
-		<vc:ImageModelToImageConverter x:Key="ImageModelToImageConverter" />
-		<vc:GenericEnumConverter x:Key="GenericEnumConverter" />
-		<vc2:ConflictResolveOptionToIndexConverter x:Key="ConflictResolveOptionToIndexConverter" />
+		<vc3:ImageModelToImageConverter x:Key="ImageModelToImageConverter" />
+		<vc3:GenericEnumConverter x:Key="GenericEnumConverter" />
+		<vc3:ConflictResolveOptionToIndexConverter x:Key="ConflictResolveOptionToIndexConverter" />
 		<vc3:VisibilityInvertConverter x:Key="VisibilityInvertConverter" />
 		<tvc:BoolNegationConverter x:Key="BoolNegationConverter" />
 
diff --git a/src/Files.App/UserControls/SidebarControl.xaml b/src/Files.App/UserControls/SidebarControl.xaml
diff --git a/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml b/src/Files.App/UserControls/Widgets/FileTagsWidget.xaml
diff --git a/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml b/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml
diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml
diff --git a/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml b/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml
diff --git a/src/Files.App/Views/Settings/AppearancePage.xaml b/src/Files.App/Views/Settings/AppearancePage.xaml
diff --git a/src/Files.App/Views/Settings/TagsPage.xaml b/src/Files.App/Views/Settings/TagsPage.xaml

Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,12 @@ internal class BoolToSelectionMode : IValueConverter`
`8`	`8`	`{`
`9`	`9`	`public object Convert(object value, Type targetType, object parameter, string language)`
`10`	`10`	`{`
`11`		`- return (value as bool?) ?? false ? ListViewSelectionMode.Multiple : ListViewSelectionMode.Extended;`
	`11`	`+ return value as bool? ?? false ? ListViewSelectionMode.Multiple : ListViewSelectionMode.Extended;`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public object ConvertBack(object value, Type targetType, object parameter, string language)`
`15`	`15`	`{`
`16`		`- return ((value as ListViewSelectionMode?) ?? ListViewSelectionMode.Extended) == ListViewSelectionMode.Multiple;`
	`16`	`+ return (value as ListViewSelectionMode? ?? ListViewSelectionMode.Extended) == ListViewSelectionMode.Multiple;`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
	`1`	`+using System;`
`1`	`2`	`using Files.Shared.Enums;`
`2`	`3`	`using Microsoft.UI.Xaml.Data;`
`3`		`-using System;`
`4`	`4`
`5`		`-namespace Files.App.ValueConverters.EnumConverters`
	`5`	`+namespace Files.App.Converters`
`6`	`6`	`{`
`7`	`7`	`internal sealed class ConflictResolveOptionToIndexConverter : IValueConverter`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,20 +7,20 @@ namespace Files.App.Converters`
`7`	`7`	`{`
`8`	`8`	`internal class DateTimeOffsetToString : IValueConverter`
`9`	`9`	`{`
`10`		`- private static readonly IDateTimeFormatter formatter = Ioc.Default.GetService<IDateTimeFormatter>();`
	`10`	`+ private static readonly IDateTimeFormatter formatter = Ioc.Default.GetService<IDateTimeFormatter>()!;`
`11`	`11`
`12`		`- public object Convert(object value, Type targetType, object parameter, string language)`
	`12`	`+ public object Convert(object? value, Type targetType, object parameter, string language)`
`13`	`13`	`{`
`14`	`14`	`return value is null`
`15`	`15`	`? string.Empty`
`16`	`16`	`: formatter.ToLongLabel((DateTimeOffset)value);`
`17`	`17`	`}`
`18`	`18`
`19`		`- public object ConvertBack(object value, Type targetType, object parameter, string language)`
	`19`	`+ public object? ConvertBack(object value, Type targetType, object parameter, string language)`
`20`	`20`	`{`
`21`	`21`	`try`
`22`	`22`	`{`
`23`		`- return DateTimeOffset.Parse(value as string);`
	`23`	`+ return DateTimeOffset.Parse((string)value);`
`24`	`24`	`}`
`25`	`25`	`catch (FormatException)`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,35 +8,31 @@ internal class DoubleArrayToString : IValueConverter`
`8`	`8`	`{`
`9`	`9`	`public object Convert(object value, Type targetType, object parameter, string language)`
`10`	`10`	`{`
`11`		`- var array = value as double[];`
`12`		`-`
`13`		`- if (array is null)`
	`11`	`+ if (value is not double[] array)`
`14`	`12`	`return string.Empty;`
`15`	`13`
`16`	`14`	`var str = new StringBuilder();`
`17`	`15`
`18`	`16`	`foreach (var i in array)`
`19`	`17`	`{`
`20`		`- str.Append(string.Format("{0}; ", i));`
	`18`	`+ str.Append($"{i}; ");`
`21`	`19`	`}`
`22`	`20`
`23`	`21`	`return str.ToString();`
`24`	`22`	`}`
`25`	`23`
`26`	`24`	`public object ConvertBack(object value, Type targetType, object parameter, string language)`
`27`	`25`	`{`
`28`		`- var strArray = (value as string).Split("; ");`
	`26`	`+ var strArray = ((string)value).Split("; ");`
`29`	`27`	`var array = new double[strArray.Length];`
`30`	`28`
`31`		`- for (int i = 0; i < strArray.Length; i++)`
	`29`	`+ for (var i = 0; i < strArray.Length; i++)`
`32`	`30`	`{`
`33`	`31`	`try`
`34`	`32`	`{`
`35`	`33`	`array[i] = double.Parse(strArray[i]);`
`36`	`34`	`}`
`37`		`- catch (Exception)`
`38`		`- {`
`39`		`- }`
	`35`	`+ catch { }`
`40`	`36`	`}`
`41`	`37`	`return array;`
`42`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,21 +5,16 @@ namespace Files.App.Converters`
`5`	`5`	`{`
`6`	`6`	`internal class DoubleToString : IValueConverter`
`7`	`7`	`{`
`8`		`- public object Convert(object value, Type targetType, object parameter, string language)`
	`8`	`+ public object? Convert(object? value, Type targetType, object parameter, string language)`
`9`	`9`	`{`
`10`		`- if (value is not null)`
`11`		`- {`
`12`		`- return value.ToString();`
`13`		`- }`
`14`		`-`
`15`		`- return "";`
	`10`	`+ return value is null ? "" : value.ToString();`
`16`	`11`	`}`
`17`	`12`
`18`		`- public object ConvertBack(object value, Type targetType, object parameter, string language)`
	`13`	`+ public object? ConvertBack(object value, Type targetType, object parameter, string language)`
`19`	`14`	`{`
`20`	`15`	`try`
`21`	`16`	`{`
`22`		`- return Double.Parse(value as string);`
	`17`	`+ return double.Parse((string)value);`
`23`	`18`	`}`
`24`	`19`	`catch (FormatException)`
`25`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`		`-using Microsoft.UI.Xaml.Data;`
`2`	`1`	`using System;`
`3`	`2`	`using System.Collections.Generic;`
`4`	`3`	`using System.Linq;`
	`4`	`+using Microsoft.UI.Xaml.Data;`
`5`	`5`
`6`		`-namespace Files.App.ValueConverters`
	`6`	`+namespace Files.App.Converters`
`7`	`7`	`{`
`8`	`8`	`internal sealed class GenericEnumConverter : IValueConverter`
`9`	`9`	`{`
`@@ -19,7 +19,7 @@ public object ConvertBack(object value, Type targetType, object parameter, strin`
`19`	`19`	`s => s.Split(',').ToDictionary(k => System.Convert.ToInt64(k.Split('-')[1]), v => System.Convert.ToInt64(v.Split('-')[0])));`
`20`	`20`	`}`
`21`	`21`
`22`		`- private object ConvertInternal(object value, Type targetType, object parameter, string language, Func<string, Dictionary<long, long>> enumConversion)`
	`22`	`+ private static object ConvertInternal(object value, Type targetType, object parameter, string language, Func<string, Dictionary<long, long>> enumConversion)`
`23`	`23`	`{`
`24`	`24`	`var enumValue = System.Convert.ToInt64(value);`
`25`	`25`
`@@ -37,7 +37,7 @@ private object ConvertInternal(object value, Type targetType, object parameter,`
`37`	`37`
`38`	`38`	`try`
`39`	`39`	`{`
`40`		`- if (Enum.GetName(targetType, enumValue) is string enumName)`
	`40`	`+ if (Enum.GetName(targetType, enumValue) is { } enumName)`
`41`	`41`	`{`
`42`	`42`	`return Enum.Parse(targetType, enumName);`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
	`1`	`+using System;`
`1`	`2`	`using Files.App.AppModels;`
`2`	`3`	`using Microsoft.UI.Xaml.Data;`
`3`		`-using System;`
`4`	`4`
`5`		`-namespace Files.App.ValueConverters`
	`5`	`+namespace Files.App.Converters`
`6`	`6`	`{`
`7`	`7`	`internal sealed class ImageModelToImageConverter : IValueConverter`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace Files.App.Converters`
`6`	`6`	`{`
`7`	`7`	`public class IntToGroupOption : IValueConverter`
`8`	`8`	`{`
`9`		`- public object Convert(object value, Type targetType, object parameter, string language)`
	`9`	`+ public object Convert(object? value, Type targetType, object parameter, string language)`
`10`	`10`	`{`
`11`	`11`	`return System.Convert.ToInt32((byte)(value ?? GroupOption.None));`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace Files.App.Converters`
`6`	`6`	`{`
`7`	`7`	`public class IntToSortDirection : IValueConverter`
`8`	`8`	`{`
`9`		`- public object Convert(object value, Type targetType, object parameter, string language)`
	`9`	`+ public object Convert(object? value, Type targetType, object parameter, string language)`
`10`	`10`	`{`
`11`	`11`	`return System.Convert.ToInt32(value ?? SortDirection.Ascending);`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace Files.App.Converters`
`6`	`6`	`{`
`7`	`7`	`public class IntToSortOption : IValueConverter`
`8`	`8`	`{`
`9`		`- public object Convert(object value, Type targetType, object parameter, string language)`
	`9`	`+ public object Convert(object? value, Type targetType, object parameter, string language)`
`10`	`10`	`{`
`11`	`11`	`return System.Convert.ToInt32((byte)(value ?? SortOption.Name));`
`12`	`12`	`}`