From 44bb7f0adb0e5d4706ce5488b362e16173015e62 Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Wed, 9 Feb 2022 20:14:39 -0800
Subject: [PATCH 1/6] Rename `IsStringNullOrEmptyConverter` and
 `IsStringNotNullOrEmptyConverter`

---
 .../Converters/ConvertersGalleryViewModel.cs           |  4 ++--
 .../Converters/IsNotNullOrEmptyConverter_Tests.cs      |  4 ++--
 .../Converters/IsNullOrEmptyConverter_Tests.cs         |  4 ++--
 ...ed.cs => IsStringNotNullOrEmptyConverter.shared.cs} |  8 ++++----
 ...erter.shared.cs => IsStringNullOrEmptyConverter.cs} | 10 ++++------
 5 files changed, 14 insertions(+), 16 deletions(-)
 rename src/CommunityToolkit.Maui/Converters/{IsNotNullOrEmptyConverter.shared.cs => IsStringNotNullOrEmptyConverter.shared.cs} (75%)
 rename src/CommunityToolkit.Maui/Converters/{IsNullOrEmptyConverter.shared.cs => IsStringNullOrEmptyConverter.cs} (72%)

diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ConvertersGalleryViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ConvertersGalleryViewModel.cs
index de95d1df7c..7853ab0699 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ConvertersGalleryViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ConvertersGalleryViewModel.cs
@@ -11,10 +11,10 @@ public ConvertersGalleryViewModel()
 			SectionModel.Create<BoolToObjectConverterViewModel>(nameof(BoolToObjectConverter),
 				"A converter that allows users to convert a bool value binding to a specific object."),
 
-			SectionModel.Create<IsNullOrEmptyConverterViewModel>(nameof(IsNullOrEmptyConverter),
+			SectionModel.Create<IsNullOrEmptyConverterViewModel>(nameof(IsStringNullOrEmptyConverter),
 				"A converter that allows users to convert an incoming binding to a bool value. This value represents if the incoming binding value is null or empty."),
 
-			SectionModel.Create<IsNotNullOrEmptyConverterViewModel>(nameof(IsNotNullOrEmptyConverter),
+			SectionModel.Create<IsNotNullOrEmptyConverterViewModel>(nameof(IsStringNotNullOrEmptyConverter),
 				"A converter that allows users to convert an incoming binding to a bool value. This value represents if the incoming binding value is Not null or empty."),
 
 			SectionModel.Create<InvertedBoolConverterViewModel>(nameof(InvertedBoolConverter),
diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/IsNotNullOrEmptyConverter_Tests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/IsNotNullOrEmptyConverter_Tests.cs
index 1111233b1b..de4994b1e9 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Converters/IsNotNullOrEmptyConverter_Tests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Converters/IsNotNullOrEmptyConverter_Tests.cs
@@ -8,12 +8,12 @@ public class IsNotNullOrEmptyConverter_Tests : BaseTest
 {
 	[Theory]
 	[InlineData("Test", true)]
-	[InlineData(typeof(IsNotNullOrEmptyConverter), true)]
+	[InlineData(typeof(IsStringNotNullOrEmptyConverter), true)]
 	[InlineData(null, false)]
 	[InlineData("", false)]
 	public void IsNotNullOrEmptyConverter(object value, bool expectedResult)
 	{
-		var isNotNullOrEmptyConverter = new IsNotNullOrEmptyConverter();
+		var isNotNullOrEmptyConverter = new IsStringNotNullOrEmptyConverter();
 
 		var result = (bool)isNotNullOrEmptyConverter.Convert(value, typeof(IsNotNullOrEmptyConverter_Tests), null, CultureInfo.CurrentCulture);
 
diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/IsNullOrEmptyConverter_Tests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/IsNullOrEmptyConverter_Tests.cs
index bb38d6af9b..ba691e05bd 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Converters/IsNullOrEmptyConverter_Tests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Converters/IsNullOrEmptyConverter_Tests.cs
@@ -10,10 +10,10 @@ public class IsNullOrEmptyConverter_Tests : BaseTest
 	[InlineData(null, true)]
 	[InlineData("", true)]
 	[InlineData("Test", false)]
-	[InlineData(typeof(IsNullOrEmptyConverter), false)]
+	[InlineData(typeof(IsStringNullOrEmptyConverter), false)]
 	public void IsNullOrEmptyConverter(object value, bool expectedResult)
 	{
-		var isNullOrEmptyConverter = new IsNullOrEmptyConverter();
+		var isNullOrEmptyConverter = new IsStringNullOrEmptyConverter();
 
 		var result = (bool)isNullOrEmptyConverter.Convert(value, typeof(IsNotNullOrEmptyConverter_Tests), null, CultureInfo.CurrentCulture);
 
diff --git a/src/CommunityToolkit.Maui/Converters/IsNotNullOrEmptyConverter.shared.cs b/src/CommunityToolkit.Maui/Converters/IsStringNotNullOrEmptyConverter.shared.cs
similarity index 75%
rename from src/CommunityToolkit.Maui/Converters/IsNotNullOrEmptyConverter.shared.cs
rename to src/CommunityToolkit.Maui/Converters/IsStringNotNullOrEmptyConverter.shared.cs
index 41b7596aa4..1aa08b2455 100644
--- a/src/CommunityToolkit.Maui/Converters/IsNotNullOrEmptyConverter.shared.cs
+++ b/src/CommunityToolkit.Maui/Converters/IsStringNotNullOrEmptyConverter.shared.cs
@@ -7,10 +7,10 @@ namespace CommunityToolkit.Maui.Converters;
 /// <summary>
 /// Converts the incoming value to a <see cref="bool"/> indicating whether or not the value is not null and not empty.
 /// </summary>
-public class IsNotNullOrEmptyConverter : ValueConverterExtension, ICommunityToolkitValueConverter
+public class IsStringNotNullOrEmptyConverter : ValueConverterExtension, ICommunityToolkitValueConverter
 {
 	/// <summary>
-	/// Converts the incoming value to a <see cref="bool"/> indicating whether or not the value is not null and not empty.
+	/// Converts the incoming string to a <see cref="bool"/> indicating whether or not the value is not null and not empty using string.IsNullOrEmpty.
 	/// </summary>
 	/// <param name="value">The value to convert.</param>
 	/// <param name="targetType">The type of the binding target property. This is not implemented.</param>
@@ -18,8 +18,8 @@ public class IsNotNullOrEmptyConverter : ValueConverterExtension, ICommunityTool
 	/// <param name="culture">The culture to use in the converter. This is not implemented.</param>
 	/// <returns>A <see cref="bool"/> indicating if the incoming value is not null and not empty.</returns>
 	[return: NotNull]
-	public object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture) =>
-		!IsNullOrEmptyConverter.ConvertInternal(value);
+	public object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
+		=> value is string stringValue ? !string.IsNullOrEmpty(stringValue) : throw new ArgumentException("Binding must be of type string", nameof(value));
 
 	/// <summary>
 	/// This method is not implemented and will throw a <see cref="NotImplementedException"/>.
diff --git a/src/CommunityToolkit.Maui/Converters/IsNullOrEmptyConverter.shared.cs b/src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs
similarity index 72%
rename from src/CommunityToolkit.Maui/Converters/IsNullOrEmptyConverter.shared.cs
rename to src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs
index 07efb7792c..020488217a 100644
--- a/src/CommunityToolkit.Maui/Converters/IsNullOrEmptyConverter.shared.cs
+++ b/src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs
@@ -7,10 +7,10 @@ namespace CommunityToolkit.Maui.Converters;
 /// <summary>
 /// Converts the incoming value to a <see cref="bool"/> indicating whether or not the value is null or empty.
 /// </summary>
-public class IsNullOrEmptyConverter : ValueConverterExtension, ICommunityToolkitValueConverter
+public class IsStringNullOrEmptyConverter : ValueConverterExtension, ICommunityToolkitValueConverter
 {
 	/// <summary>
-	/// Converts the incoming value to a <see cref="bool"/> indicating whether or not the value is null or empty.
+	/// Converts the incoming string to a <see cref="bool"/> indicating whether or not the string is null and not empty using string.IsNullOrEmpty.
 	/// </summary>
 	/// <param name="value">The value to convert.</param>
 	/// <param name="targetType">The type of the binding target property. This is not implemented.</param>
@@ -18,7 +18,8 @@ public class IsNullOrEmptyConverter : ValueConverterExtension, ICommunityToolkit
 	/// <param name="culture">The culture to use in the converter. This is not implemented.</param>
 	/// <returns>A <see cref="bool"/> indicating if the incoming value is null or empty.</returns>
 	[return: NotNull]
-	public object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture) => ConvertInternal(value);
+	public object Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
+		=> value is string stringValue ? string.IsNullOrEmpty(stringValue) : throw new ArgumentException("Binding must be of type string", nameof(value));
 
 	/// <summary>
 	/// This method is not implemented and will throw a <see cref="NotImplementedException"/>.
@@ -30,7 +31,4 @@ public class IsNullOrEmptyConverter : ValueConverterExtension, ICommunityToolkit
 	/// <returns>N/A</returns>
 	public object? ConvertBack(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 		=> throw new NotImplementedException();
-
-	internal static bool ConvertInternal(object? value) =>
-		value == null || (value is string str && string.IsNullOrWhiteSpace(str));
 }
\ No newline at end of file

From e99f0528dc8cb21c2f007a0e7757195b996e94cb Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Wed, 9 Feb 2022 20:42:48 -0800
Subject: [PATCH 2/6] Update Samples

---
 .../AppShell.xaml.cs                          |  4 +--
 .../MauiProgram.cs                            |  4 +--
 .../IsNotNullOrEmptyConverterPage.xaml        | 34 -------------------
 .../IsNotNullOrEmptyConverterPage.xaml.cs     | 12 -------
 .../IsNullOrEmptyConverterPage.xaml           | 34 -------------------
 .../IsNullOrEmptyConverterPage.xaml.cs        | 12 -------
 .../IsStringNotNullOrEmptyConverterPage.xaml  | 34 +++++++++++++++++++
 ...sStringNotNullOrEmptyConverterPage.xaml.cs | 12 +++++++
 .../IsStringNullOrEmptyConverterPage.xaml     | 34 +++++++++++++++++++
 .../IsStringNullOrEmptyConverterPage.xaml.cs  | 12 +++++++
 .../Converters/ConvertersGalleryViewModel.cs  |  4 +--
 .../IsNotNullOrEmptyConverterViewModel.cs     |  8 -----
 .../IsNullOrEmptyConverterViewModel.cs        | 28 ---------------
 ...sStringNotNullOrEmptyConverterViewModel.cs | 14 ++++++++
 .../IsStringNullOrEmptyConverterViewModel.cs  | 14 ++++++++
 .../IsStringNotNullOrEmptyConverter.shared.cs |  6 +++-
 .../IsStringNullOrEmptyConverter.cs           |  6 +++-
 17 files changed, 136 insertions(+), 136 deletions(-)
 delete mode 100644 samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNotNullOrEmptyConverterPage.xaml
 delete mode 100644 samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNotNullOrEmptyConverterPage.xaml.cs
 delete mode 100644 samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNullOrEmptyConverterPage.xaml
 delete mode 100644 samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNullOrEmptyConverterPage.xaml.cs
 create mode 100644 samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNotNullOrEmptyConverterPage.xaml
 create mode 100644 samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNotNullOrEmptyConverterPage.xaml.cs
 create mode 100644 samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNullOrEmptyConverterPage.xaml
 create mode 100644 samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNullOrEmptyConverterPage.xaml.cs
 delete mode 100644 samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsNotNullOrEmptyConverterViewModel.cs
 delete mode 100644 samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsNullOrEmptyConverterViewModel.cs
 create mode 100644 samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsStringNotNullOrEmptyConverterViewModel.cs
 create mode 100644 samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsStringNullOrEmptyConverterViewModel.cs

diff --git a/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs b/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
index f371b93c65..fda4d16a70 100644
--- a/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
+++ b/samples/CommunityToolkit.Maui.Sample/AppShell.xaml.cs
@@ -46,8 +46,8 @@ public partial class AppShell : Shell
 		{ typeof(IndexToArrayItemConverterViewModel), (typeof(ConvertersGalleryPage), typeof(IndexToArrayItemConverterPage)) },
 		{ typeof(IntToBoolConverterViewModel), (typeof(ConvertersGalleryPage), typeof(IntToBoolConverterPage)) },
 		{ typeof(InvertedBoolConverterViewModel), (typeof(ConvertersGalleryPage), typeof(InvertedBoolConverterPage)) },
-		{ typeof(IsNotNullOrEmptyConverterViewModel), (typeof(ConvertersGalleryPage), typeof(IsNotNullOrEmptyConverterPage)) },
-		{ typeof(IsNullOrEmptyConverterViewModel), (typeof(ConvertersGalleryPage), typeof(IsNullOrEmptyConverterPage)) },
+		{ typeof(IsStringNotNullOrEmptyConverterViewModel), (typeof(ConvertersGalleryPage), typeof(IsStringNotNullOrEmptyConverterPage)) },
+		{ typeof(IsStringNullOrEmptyConverterViewModel), (typeof(ConvertersGalleryPage), typeof(IsStringNullOrEmptyConverterPage)) },
 		{ typeof(ItemSelectedEventArgsConverterViewModel), (typeof(ConvertersGalleryPage), typeof(ItemSelectedEventArgsConverterPage)) },
 		{ typeof(ItemTappedEventArgsConverterViewModel), (typeof(ConvertersGalleryPage), typeof(ItemTappedEventArgsConverterPage)) },
 		{ typeof(ListIsNotNullOrEmptyConverterViewModel), (typeof(ConvertersGalleryPage), typeof(ListIsNotNullOrEmptyConverterPage)) },
diff --git a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
index a799627288..d1699e23f8 100644
--- a/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
+++ b/samples/CommunityToolkit.Maui.Sample/MauiProgram.cs
@@ -35,8 +35,8 @@ public static MauiApp CreateMauiApp()
 		builder.Services.AddTransient<EqualConverterViewModel>();
 		builder.Services.AddTransient<IndexToArrayItemConverterViewModel>();
 		builder.Services.AddTransient<IntToBoolConverterViewModel>();
-		builder.Services.AddTransient<IsNotNullOrEmptyConverterViewModel>();
-		builder.Services.AddTransient<IsNullOrEmptyConverterViewModel>();
+		builder.Services.AddTransient<IsStringNotNullOrEmptyConverterViewModel>();
+		builder.Services.AddTransient<IsStringNullOrEmptyConverterViewModel>();
 		builder.Services.AddTransient<ItemSelectedEventArgsConverterViewModel>();
 		builder.Services.AddTransient<ItemTappedEventArgsConverterViewModel>();
 		builder.Services.AddTransient<ListIsNotNullOrEmptyConverterViewModel>();
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNotNullOrEmptyConverterPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNotNullOrEmptyConverterPage.xaml
deleted file mode 100644
index bad89a1010..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNotNullOrEmptyConverterPage.xaml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<pages:BasePage 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-    xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
-    xmlns:vm="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Converters"
-    x:Class="CommunityToolkit.Maui.Sample.Pages.Converters.IsNotNullOrEmptyConverterPage"
-    x:TypeArguments="vm:IsNotNullOrEmptyConverterViewModel">
-    <pages:BasePage.Resources>
-        <ResourceDictionary>
-            <mct:IsNotNullOrEmptyConverter x:Key="IsNotNullOrEmptyConverter" />
-        </ResourceDictionary>
-    </pages:BasePage.Resources>
-    <pages:BasePage.Content>
-        <VerticalStackLayout
-            Padding="10,10"
-            HorizontalOptions="Fill"
-            Spacing="16"
-            VerticalOptions="Fill">
-            <Label Text="The IsNotNullOrEmptyConverter is a converter that allows users to convert an incoming binding to a bool value. This value represents if the incoming binding value is null or empty." TextColor="{StaticResource NormalLabelTextColor}" />
-            <Button VerticalOptions="CenterAndExpand" Text="Clear Selection" Command="{Binding ClearSelectionCommand}"/>
-            <Label VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand" Text="This label should be false if selected item is null" TextColor="{StaticResource NormalLabelTextColor}" />
-            <Label VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand" Text="{Binding Path=SelectedItem, Converter={StaticResource IsNotNullOrEmptyConverter }}" />
-            <CollectionView VerticalOptions="StartAndExpand" HorizontalOptions="Center" SelectionMode="Single" ItemsSource="{Binding DummyItemSource}" SelectedItem="{Binding SelectedItem}">
-                <CollectionView.ItemTemplate>
-                    <DataTemplate>
-                        <Label Text="{Binding .}" Margin="10" TextColor="Black" />
-                    </DataTemplate>
-                </CollectionView.ItemTemplate>
-            </CollectionView>
-        </VerticalStackLayout>
-    </pages:BasePage.Content>
-</pages:BasePage>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNotNullOrEmptyConverterPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNotNullOrEmptyConverterPage.xaml.cs
deleted file mode 100644
index d98ca5cc00..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNotNullOrEmptyConverterPage.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using CommunityToolkit.Maui.Sample.ViewModels.Converters;
-
-namespace CommunityToolkit.Maui.Sample.Pages.Converters;
-
-public partial class IsNotNullOrEmptyConverterPage : BasePage<IsNotNullOrEmptyConverterViewModel>
-{
-	public IsNotNullOrEmptyConverterPage(IsNotNullOrEmptyConverterViewModel isNotNullOrEmptyConverterViewModel)
-		: base(isNotNullOrEmptyConverterViewModel)
-	{
-		InitializeComponent();
-	}
-}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNullOrEmptyConverterPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNullOrEmptyConverterPage.xaml
deleted file mode 100644
index cd2b4e0771..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNullOrEmptyConverterPage.xaml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<pages:BasePage 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
-    xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
-    xmlns:vm="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Converters"
-    x:Class="CommunityToolkit.Maui.Sample.Pages.Converters.IsNullOrEmptyConverterPage"
-    x:TypeArguments="vm:IsNullOrEmptyConverterViewModel">
-    <pages:BasePage.Resources>
-        <ResourceDictionary>
-            <mct:IsNullOrEmptyConverter x:Key="IsNullOrEmptyConverter" />
-        </ResourceDictionary>
-    </pages:BasePage.Resources>
-    <pages:BasePage.Content>
-        <VerticalStackLayout
-            Padding="10,10"
-            HorizontalOptions="Fill"
-            Spacing="16"
-            VerticalOptions="Fill">
-            <Label Text="The IsNullOrEmptyConverter is a converter that allows users to convert an incoming binding to a bool value. This value represents if the incoming binding value is null or empty." TextColor="{StaticResource NormalLabelTextColor}" />
-            <Button VerticalOptions="CenterAndExpand" Text="Clear Selection" Command="{Binding ClearSelectionCommand}"/>
-            <Label VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand" Text="This label should be true if selected item is null" TextColor="{StaticResource NormalLabelTextColor}" />
-            <Label VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand" Text="{Binding Path=SelectedItem, Converter={StaticResource IsNullOrEmptyConverter}}" />
-            <CollectionView VerticalOptions="StartAndExpand" HorizontalOptions="Center" SelectionMode="Single" ItemsSource="{Binding DummyItemSource}" SelectedItem="{Binding SelectedItem}">
-                <CollectionView.ItemTemplate>
-                    <DataTemplate>
-                        <Label Text="{Binding .}" Margin="10" TextColor="Black" />
-                    </DataTemplate>
-                </CollectionView.ItemTemplate>
-            </CollectionView>
-        </VerticalStackLayout>
-    </pages:BasePage.Content>
-</pages:BasePage>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNullOrEmptyConverterPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNullOrEmptyConverterPage.xaml.cs
deleted file mode 100644
index deba165179..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsNullOrEmptyConverterPage.xaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using CommunityToolkit.Maui.Sample.ViewModels.Converters;
-
-namespace CommunityToolkit.Maui.Sample.Pages.Converters;
-
-public partial class IsNullOrEmptyConverterPage : BasePage<IsNullOrEmptyConverterViewModel>
-{
-	public IsNullOrEmptyConverterPage(IsNullOrEmptyConverterViewModel isNullOrEmptyConverterViewModel)
-		: base(isNullOrEmptyConverterViewModel)
-	{
-		InitializeComponent();
-	}
-}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNotNullOrEmptyConverterPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNotNullOrEmptyConverterPage.xaml
new file mode 100644
index 0000000000..9dcb8f3eb7
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNotNullOrEmptyConverterPage.xaml
@@ -0,0 +1,34 @@
+<pages:BasePage 
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+    xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
+    xmlns:vm="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Converters"
+    x:Class="CommunityToolkit.Maui.Sample.Pages.Converters.IsStringNotNullOrEmptyConverterPage"
+    x:TypeArguments="vm:IsStringNotNullOrEmptyConverterViewModel">
+
+    <pages:BasePage.Resources>
+        <ResourceDictionary>
+            <mct:IsStringNotNullOrEmptyConverter x:Key="IsStringNotNullOrEmptyConverter" />
+        </ResourceDictionary>
+    </pages:BasePage.Resources>
+
+    <pages:BasePage.Content>
+        <VerticalStackLayout
+            Padding="10,10"
+            HorizontalOptions="Fill"
+            Spacing="16"
+            VerticalOptions="Fill">
+
+            <Label Text="The IsStringNotNullOrEmptyConverter is a converter that allows users to convert an incoming string binding to a bool value. This value represents if the incoming string binding value is not null or empty using string.IsNullOrEmpty." TextColor="{StaticResource NormalLabelTextColor}" />
+
+            <Label Text="Enter text into the Entry, below. If the text is not null or empty, the value will be true." TextColor="{StaticResource NormalLabelTextColor}" FontAttributes="Bold"/>
+
+            <Entry VerticalOptions="CenterAndExpand" HorizontalOptions="Fill" Text="{Binding Path=LabelText, Mode=OneWayToSource}" TextColor="{StaticResource NormalLabelTextColor}" />
+
+            <Label VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand" Text="{Binding Path=LabelText, Mode=OneWay, Converter={StaticResource IsStringNotNullOrEmptyConverter}}" />
+
+        </VerticalStackLayout>
+    </pages:BasePage.Content>
+
+</pages:BasePage>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNotNullOrEmptyConverterPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNotNullOrEmptyConverterPage.xaml.cs
new file mode 100644
index 0000000000..5d8e4ccc83
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNotNullOrEmptyConverterPage.xaml.cs
@@ -0,0 +1,12 @@
+using CommunityToolkit.Maui.Sample.ViewModels.Converters;
+
+namespace CommunityToolkit.Maui.Sample.Pages.Converters;
+
+public partial class IsStringNotNullOrEmptyConverterPage : BasePage<IsStringNotNullOrEmptyConverterViewModel>
+{
+	public IsStringNotNullOrEmptyConverterPage(IsStringNotNullOrEmptyConverterViewModel isStringNotNullOrEmptyConverterViewModel)
+		: base(isStringNotNullOrEmptyConverterViewModel)
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNullOrEmptyConverterPage.xaml b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNullOrEmptyConverterPage.xaml
new file mode 100644
index 0000000000..ddeb9efce7
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNullOrEmptyConverterPage.xaml
@@ -0,0 +1,34 @@
+<pages:BasePage 
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:mct="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+    xmlns:pages="clr-namespace:CommunityToolkit.Maui.Sample.Pages"
+    xmlns:vm="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Converters"
+    x:Class="CommunityToolkit.Maui.Sample.Pages.Converters.IsStringNullOrEmptyConverterPage"
+    x:TypeArguments="vm:IsStringNullOrEmptyConverterViewModel">
+
+    <pages:BasePage.Resources>
+        <ResourceDictionary>
+            <mct:IsStringNullOrEmptyConverter x:Key="IsStringNullOrEmptyConverter" />
+        </ResourceDictionary>
+    </pages:BasePage.Resources>
+
+    <pages:BasePage.Content>
+        <VerticalStackLayout
+            Padding="10,10"
+            HorizontalOptions="Fill"
+            Spacing="16"
+            VerticalOptions="Fill">
+
+            <Label Text="The IsStringNullOrEmptyConverter is a converter that allows usersc to convert an incoming string binding to a bool value. This value represents if the incoming string binding value is null or empty using string.IsNullOrEmpty." TextColor="{StaticResource NormalLabelTextColor}" />
+
+            <Label Text="Enter text into the Entry, below. If the text is null or empty, the value will be true." TextColor="{StaticResource NormalLabelTextColor}" FontAttributes="Bold" />
+
+            <Entry VerticalOptions="CenterAndExpand" HorizontalOptions="Fill" Text="{Binding Path=LabelText, Mode=OneWayToSource}" TextColor="{StaticResource NormalLabelTextColor}" />
+
+            <Label VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand" Text="{Binding Path=LabelText, Mode=OneWay, Converter={StaticResource IsStringNullOrEmptyConverter}}" />
+
+        </VerticalStackLayout>
+    </pages:BasePage.Content>
+
+</pages:BasePage>
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNullOrEmptyConverterPage.xaml.cs b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNullOrEmptyConverterPage.xaml.cs
new file mode 100644
index 0000000000..c0a68b6ace
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/Pages/Converters/IsStringNullOrEmptyConverterPage.xaml.cs
@@ -0,0 +1,12 @@
+using CommunityToolkit.Maui.Sample.ViewModels.Converters;
+
+namespace CommunityToolkit.Maui.Sample.Pages.Converters;
+
+public partial class IsStringNullOrEmptyConverterPage : BasePage<IsStringNullOrEmptyConverterViewModel>
+{
+	public IsStringNullOrEmptyConverterPage(IsStringNullOrEmptyConverterViewModel isStringNullOrEmptyConverterViewModel)
+		: base(isStringNullOrEmptyConverterViewModel)
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ConvertersGalleryViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ConvertersGalleryViewModel.cs
index 7853ab0699..664ee6a17d 100644
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ConvertersGalleryViewModel.cs
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/ConvertersGalleryViewModel.cs
@@ -11,10 +11,10 @@ public ConvertersGalleryViewModel()
 			SectionModel.Create<BoolToObjectConverterViewModel>(nameof(BoolToObjectConverter),
 				"A converter that allows users to convert a bool value binding to a specific object."),
 
-			SectionModel.Create<IsNullOrEmptyConverterViewModel>(nameof(IsStringNullOrEmptyConverter),
+			SectionModel.Create<IsStringNullOrEmptyConverterViewModel>(nameof(IsStringNullOrEmptyConverter),
 				"A converter that allows users to convert an incoming binding to a bool value. This value represents if the incoming binding value is null or empty."),
 
-			SectionModel.Create<IsNotNullOrEmptyConverterViewModel>(nameof(IsStringNotNullOrEmptyConverter),
+			SectionModel.Create<IsStringNotNullOrEmptyConverterViewModel>(nameof(IsStringNotNullOrEmptyConverter),
 				"A converter that allows users to convert an incoming binding to a bool value. This value represents if the incoming binding value is Not null or empty."),
 
 			SectionModel.Create<InvertedBoolConverterViewModel>(nameof(InvertedBoolConverter),
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsNotNullOrEmptyConverterViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsNotNullOrEmptyConverterViewModel.cs
deleted file mode 100644
index cd0f93f2b5..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsNotNullOrEmptyConverterViewModel.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace CommunityToolkit.Maui.Sample.ViewModels.Converters;
-
-public class IsNotNullOrEmptyConverterViewModel : IsNullOrEmptyConverterViewModel
-{
-	public IsNotNullOrEmptyConverterViewModel()
-	{
-	}
-}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsNullOrEmptyConverterViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsNullOrEmptyConverterViewModel.cs
deleted file mode 100644
index d84fc8547e..0000000000
--- a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsNullOrEmptyConverterViewModel.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Windows.Input;
-
-namespace CommunityToolkit.Maui.Sample.ViewModels.Converters;
-
-public class IsNullOrEmptyConverterViewModel : BaseViewModel
-{
-	string? selectedItem;
-
-	public IsNullOrEmptyConverterViewModel() => ClearSelectionCommand = new Command(() => SelectedItem = null);
-
-	public IReadOnlyList<string> DummyItemSource { get; } = new[]
-	{
-		"Item 0",
-		"Item 1",
-		"Item 2",
-		"Item 3",
-		"Item 4",
-		"Item 5",
-	};
-
-	public ICommand ClearSelectionCommand { get; }
-
-	public string? SelectedItem
-	{
-		get => selectedItem;
-		set => SetProperty(ref selectedItem, value);
-	}
-}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsStringNotNullOrEmptyConverterViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsStringNotNullOrEmptyConverterViewModel.cs
new file mode 100644
index 0000000000..b0b2e2c79d
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsStringNotNullOrEmptyConverterViewModel.cs
@@ -0,0 +1,14 @@
+using System.Windows.Input;
+
+namespace CommunityToolkit.Maui.Sample.ViewModels.Converters;
+
+public class IsStringNotNullOrEmptyConverterViewModel : BaseViewModel
+{
+	string? labelText;
+
+	public string? LabelText
+	{
+		get => labelText;
+		set => SetProperty(ref labelText, value);
+	}
+}
\ No newline at end of file
diff --git a/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsStringNullOrEmptyConverterViewModel.cs b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsStringNullOrEmptyConverterViewModel.cs
new file mode 100644
index 0000000000..b0cebc024c
--- /dev/null
+++ b/samples/CommunityToolkit.Maui.Sample/ViewModels/Converters/IsStringNullOrEmptyConverterViewModel.cs
@@ -0,0 +1,14 @@
+using System.Windows.Input;
+
+namespace CommunityToolkit.Maui.Sample.ViewModels.Converters;
+
+public class IsStringNullOrEmptyConverterViewModel : BaseViewModel
+{
+	string? labelText;
+
+	public string? LabelText
+	{
+		get => labelText;
+		set => SetProperty(ref labelText, value);
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui/Converters/IsStringNotNullOrEmptyConverter.shared.cs b/src/CommunityToolkit.Maui/Converters/IsStringNotNullOrEmptyConverter.shared.cs
index 1aa08b2455..5ae9f978ab 100644
--- a/src/CommunityToolkit.Maui/Converters/IsStringNotNullOrEmptyConverter.shared.cs
+++ b/src/CommunityToolkit.Maui/Converters/IsStringNotNullOrEmptyConverter.shared.cs
@@ -19,7 +19,11 @@ public class IsStringNotNullOrEmptyConverter : ValueConverterExtension, ICommuni
 	/// <returns>A <see cref="bool"/> indicating if the incoming value is not null and not empty.</returns>
 	[return: NotNull]
 	public object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
-		=> value is string stringValue ? !string.IsNullOrEmpty(stringValue) : throw new ArgumentException("Binding must be of type string", nameof(value));
+	{
+		var stringValue = (string?)value;
+
+		return !string.IsNullOrEmpty(stringValue);
+	}
 
 	/// <summary>
 	/// This method is not implemented and will throw a <see cref="NotImplementedException"/>.
diff --git a/src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs b/src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs
index 020488217a..d19a5fa7c4 100644
--- a/src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs
+++ b/src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs
@@ -19,7 +19,11 @@ public class IsStringNullOrEmptyConverter : ValueConverterExtension, ICommunityT
 	/// <returns>A <see cref="bool"/> indicating if the incoming value is null or empty.</returns>
 	[return: NotNull]
 	public object Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
-		=> value is string stringValue ? string.IsNullOrEmpty(stringValue) : throw new ArgumentException("Binding must be of type string", nameof(value));
+	{
+		var stringValue = (string?)value;
+
+		return string.IsNullOrEmpty(stringValue);
+	}
 
 	/// <summary>
 	/// This method is not implemented and will throw a <see cref="NotImplementedException"/>.

From c9acda55fcd86732f5cdde806da6966e5559fcfa Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Wed, 9 Feb 2022 20:56:53 -0800
Subject: [PATCH 3/6] Update Unit Tests

---
 .../IsNotNullOrEmptyConverter_Tests.cs        | 22 -------------
 .../IsNullOrEmptyConverter_Tests.cs           | 22 -------------
 .../IsStringNotNullOrEmptyConverter_Tests.cs  | 33 +++++++++++++++++++
 .../IsStringNullOrEmptyConverter_Tests.cs     | 33 +++++++++++++++++++
 4 files changed, 66 insertions(+), 44 deletions(-)
 delete mode 100644 src/CommunityToolkit.Maui.UnitTests/Converters/IsNotNullOrEmptyConverter_Tests.cs
 delete mode 100644 src/CommunityToolkit.Maui.UnitTests/Converters/IsNullOrEmptyConverter_Tests.cs
 create mode 100644 src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNotNullOrEmptyConverter_Tests.cs
 create mode 100644 src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNullOrEmptyConverter_Tests.cs

diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/IsNotNullOrEmptyConverter_Tests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/IsNotNullOrEmptyConverter_Tests.cs
deleted file mode 100644
index de4994b1e9..0000000000
--- a/src/CommunityToolkit.Maui.UnitTests/Converters/IsNotNullOrEmptyConverter_Tests.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Globalization;
-using CommunityToolkit.Maui.Converters;
-using Xunit;
-
-namespace CommunityToolkit.Maui.UnitTests.Converters;
-
-public class IsNotNullOrEmptyConverter_Tests : BaseTest
-{
-	[Theory]
-	[InlineData("Test", true)]
-	[InlineData(typeof(IsStringNotNullOrEmptyConverter), true)]
-	[InlineData(null, false)]
-	[InlineData("", false)]
-	public void IsNotNullOrEmptyConverter(object value, bool expectedResult)
-	{
-		var isNotNullOrEmptyConverter = new IsStringNotNullOrEmptyConverter();
-
-		var result = (bool)isNotNullOrEmptyConverter.Convert(value, typeof(IsNotNullOrEmptyConverter_Tests), null, CultureInfo.CurrentCulture);
-
-		Assert.Equal(result, expectedResult);
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/IsNullOrEmptyConverter_Tests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/IsNullOrEmptyConverter_Tests.cs
deleted file mode 100644
index ba691e05bd..0000000000
--- a/src/CommunityToolkit.Maui.UnitTests/Converters/IsNullOrEmptyConverter_Tests.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Globalization;
-using CommunityToolkit.Maui.Converters;
-using Xunit;
-
-namespace CommunityToolkit.Maui.UnitTests.Converters;
-
-public class IsNullOrEmptyConverter_Tests : BaseTest
-{
-	[Theory]
-	[InlineData(null, true)]
-	[InlineData("", true)]
-	[InlineData("Test", false)]
-	[InlineData(typeof(IsStringNullOrEmptyConverter), false)]
-	public void IsNullOrEmptyConverter(object value, bool expectedResult)
-	{
-		var isNullOrEmptyConverter = new IsStringNullOrEmptyConverter();
-
-		var result = (bool)isNullOrEmptyConverter.Convert(value, typeof(IsNotNullOrEmptyConverter_Tests), null, CultureInfo.CurrentCulture);
-
-		Assert.Equal(result, expectedResult);
-	}
-}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNotNullOrEmptyConverter_Tests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNotNullOrEmptyConverter_Tests.cs
new file mode 100644
index 0000000000..dbc42dca72
--- /dev/null
+++ b/src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNotNullOrEmptyConverter_Tests.cs
@@ -0,0 +1,33 @@
+using System.Globalization;
+using CommunityToolkit.Maui.Converters;
+using Xunit;
+
+namespace CommunityToolkit.Maui.UnitTests.Converters;
+
+public class IsStringNotNullOrEmptyConverter_Tests : BaseTest
+{
+	[Theory]
+	[InlineData("Test", true)]
+	[InlineData(null, false)]
+	[InlineData("", false)]
+	[InlineData(" ", true)]
+	public void IsNotNullOrEmptyConverter_ValidStringValue(string? value, bool expectedResult)
+	{
+		var isNotNullOrEmptyConverter = new IsStringNotNullOrEmptyConverter();
+
+		var result = (bool)isNotNullOrEmptyConverter.Convert(value, null, null, null);
+
+		Assert.Equal(result, expectedResult);
+	}
+
+	[Theory]
+	[InlineData(17)]
+	[InlineData(true)]
+	[InlineData('c')]
+	public void IsNotNullOrEmptyConverter_InvalidValue(object value)
+	{
+		var isNotNullOrEmptyConverter = new IsStringNotNullOrEmptyConverter();
+
+		Assert.Throws<InvalidCastException>(() => isNotNullOrEmptyConverter.Convert(value, null, null, null));
+	}
+}
\ No newline at end of file
diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNullOrEmptyConverter_Tests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNullOrEmptyConverter_Tests.cs
new file mode 100644
index 0000000000..c995f95f7e
--- /dev/null
+++ b/src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNullOrEmptyConverter_Tests.cs
@@ -0,0 +1,33 @@
+using System.Globalization;
+using CommunityToolkit.Maui.Converters;
+using Xunit;
+
+namespace CommunityToolkit.Maui.UnitTests.Converters;
+
+public class IsStringNullOrEmptyConverter_Tests : BaseTest
+{
+	[Theory]
+	[InlineData(null, true)]
+	[InlineData("", true)]
+	[InlineData("Test", false)]
+	[InlineData(" ", false)]
+	public void IsNullOrEmptyConverter_ValidStringValue(string? value, bool expectedResult)
+	{
+		var isNullOrEmptyConverter = new IsStringNullOrEmptyConverter();
+
+		var result = (bool)isNullOrEmptyConverter.Convert(value, null, null, null);
+
+		Assert.Equal(result, expectedResult);
+	}
+
+	[Theory]
+	[InlineData(17)]
+	[InlineData(true)]
+	[InlineData('c')]
+	public void IsNullOrEmptyConverter_InvalidValue(object value)
+	{
+		var isNotNullOrEmptyConverter = new IsStringNullOrEmptyConverter();
+
+		Assert.Throws<InvalidCastException>(() => isNotNullOrEmptyConverter.Convert(value, null, null, null));
+	}
+}
\ No newline at end of file

From 064da164297cabb4a7c82990e0e3389a892a205d Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Wed, 9 Feb 2022 21:09:18 -0800
Subject: [PATCH 4/6] Reorder `Assert.Equal` passing in the `expectedResult`
 first

---
 .../Converters/IsStringNotNullOrEmptyConverter_Tests.cs         | 2 +-
 .../Converters/IsStringNullOrEmptyConverter_Tests.cs            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNotNullOrEmptyConverter_Tests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNotNullOrEmptyConverter_Tests.cs
index dbc42dca72..34ca860e98 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNotNullOrEmptyConverter_Tests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNotNullOrEmptyConverter_Tests.cs
@@ -17,7 +17,7 @@ public void IsNotNullOrEmptyConverter_ValidStringValue(string? value, bool expec
 
 		var result = (bool)isNotNullOrEmptyConverter.Convert(value, null, null, null);
 
-		Assert.Equal(result, expectedResult);
+		Assert.Equal(expectedResult, result);
 	}
 
 	[Theory]
diff --git a/src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNullOrEmptyConverter_Tests.cs b/src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNullOrEmptyConverter_Tests.cs
index c995f95f7e..d8f1359ba3 100644
--- a/src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNullOrEmptyConverter_Tests.cs
+++ b/src/CommunityToolkit.Maui.UnitTests/Converters/IsStringNullOrEmptyConverter_Tests.cs
@@ -17,7 +17,7 @@ public void IsNullOrEmptyConverter_ValidStringValue(string? value, bool expected
 
 		var result = (bool)isNullOrEmptyConverter.Convert(value, null, null, null);
 
-		Assert.Equal(result, expectedResult);
+		Assert.Equal(expectedResult, result);
 	}
 
 	[Theory]

From e80084aea83856c56a53435f3d4eeb3e22e87aeb Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 10 Feb 2022 09:07:05 -0800
Subject: [PATCH 5/6] Update
 src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs

Co-authored-by: Shaun Lawrence <shaunrlawrence@gmail.com>
---
 .../Converters/IsStringNullOrEmptyConverter.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs b/src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs
index d19a5fa7c4..d512969d4d 100644
--- a/src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs
+++ b/src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs
@@ -10,7 +10,7 @@ namespace CommunityToolkit.Maui.Converters;
 public class IsStringNullOrEmptyConverter : ValueConverterExtension, ICommunityToolkitValueConverter
 {
 	/// <summary>
-	/// Converts the incoming string to a <see cref="bool"/> indicating whether or not the string is null and not empty using string.IsNullOrEmpty.
+	/// Converts the incoming string to a <see cref="bool"/> indicating whether or not the string is null or empty using string.IsNullOrEmpty.
 	/// </summary>
 	/// <param name="value">The value to convert.</param>
 	/// <param name="targetType">The type of the binding target property. This is not implemented.</param>

From 89b184002d9d0526a50ba9e937bb93a6880946bc Mon Sep 17 00:00:00 2001
From: Brandon Minnick <13558917+brminnick@users.noreply.github.com>
Date: Thu, 10 Feb 2022 09:11:18 -0800
Subject: [PATCH 6/6] Update
 src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs

---
 .../Converters/IsStringNullOrEmptyConverter.cs                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs b/src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs
index d512969d4d..6282f040cf 100644
--- a/src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs
+++ b/src/CommunityToolkit.Maui/Converters/IsStringNullOrEmptyConverter.cs
@@ -18,7 +18,7 @@ public class IsStringNullOrEmptyConverter : ValueConverterExtension, ICommunityT
 	/// <param name="culture">The culture to use in the converter. This is not implemented.</param>
 	/// <returns>A <see cref="bool"/> indicating if the incoming value is null or empty.</returns>
 	[return: NotNull]
-	public object Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
+	public object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
 	{
 		var stringValue = (string?)value;