Merge pull request #314 from enisn/4.1-validation-type-toleration

4.1 validation type toleration
enisn · Sep 17, 2022 · f8b73a3 · f8b73a3
2 parents a20e28f + 71315de
commit f8b73a3
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 25 deletions.
diff --git a/src/InputKit.Maui/InputKit.Maui.csproj b/src/InputKit.Maui/InputKit.Maui.csproj
@@ -8,7 +8,7 @@
 		<SingleProject>true</SingleProject>
 		<MauiVersion>6.0.486</MauiVersion>
 		<PackageId>InputKit.Maui</PackageId>
-		<Version>4.1.3</Version>
+		<Version>4.1.4</Version>
     <DefineConstants Condition="$(TargetFramework.Contains('-windows'))">$(DefineConstants);UWP</DefineConstants>
 
     <!-- NuGet Package Info -->

diff --git a/src/InputKit.Maui/Shared/Validations/ComparableTypeConverter.cs b/src/InputKit.Maui/Shared/Validations/ComparableTypeConverter.cs
@@ -52,14 +52,14 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 return number;
             }
 
-            if (DateTime.TryParse(text, out var dateTime))
+            if (TimeSpan.TryParse(text, out var timeSpan))
             {
-                return dateTime;
+                return timeSpan;
             }
 
-            if (TimeSpan.TryParse(text, out var timeSpan))
+            if (DateTime.TryParse(text, out var dateTime))
             {
-                return timeSpan;
+                return dateTime;
             }
 
             if (string.IsNullOrEmpty(text))

diff --git a/src/InputKit.Maui/Shared/Validations/MaxValueValidation.cs b/src/InputKit.Maui/Shared/Validations/MaxValueValidation.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System;
+using System.ComponentModel;
 
 namespace InputKit.Shared.Validations;
 public class MaxValueValidation : IValidation
@@ -11,15 +12,21 @@ public class MaxValueValidation : IValidation
 
     public bool Validate(object value)
     {
-        if (value is null)
+        if (value is null || (value is string text && string.IsNullOrEmpty(text)))
         {
             return true;
         }
 
-        var converted = ComparableTypeConverter.Instance.ConvertFrom(value);
-        if (converted is IComparable comparable && converted.GetType() == comparable.GetType())
+        var type = MaxValue.GetType();
+
+        if (value.GetType() != type)
+        {
+            value = Convert.ChangeType(value, type);
+        }
+
+        if (value is IComparable comparableValue)
         {
-            return comparable.CompareTo(MaxValue) <= 0;
+            return comparableValue.CompareTo(MaxValue) <= 0;
         }
 
         return false;

diff --git a/src/InputKit.Maui/Shared/Validations/MinValueValidation.cs b/src/InputKit.Maui/Shared/Validations/MinValueValidation.cs
@@ -12,19 +12,23 @@ public class MinValueValidation : IValidation
 
     public bool Validate(object value)
     {
-        if (value is null)
+        if (value is null || (value is string text && string.IsNullOrEmpty(text)))
         {
             return true;
         }
 
-        var converted = ComparableTypeConverter.Instance.ConvertFrom(value);
+        var type = MinValue.GetType();
 
-        if (converted is IComparable comparable && converted.GetType() == comparable.GetType())
+        if (value.GetType() != type)
         {
-            return comparable.CompareTo(MinValue) >= 0;
+            value = Convert.ChangeType(value, type);
+        }
+
+        if (value is IComparable comparableValue)
+        {
+            return comparableValue.CompareTo(MinValue) >= 0;
         }
 
         return false;
     }
-}
-
+}
diff --git a/src/Xamarin.Forms.InputKit/Shared/Validations/MaxValueValidation.cs b/src/Xamarin.Forms.InputKit/Shared/Validations/MaxValueValidation.cs
@@ -13,15 +13,21 @@ public class MaxValueValidation : IValidation
 
         public bool Validate(object value)
         {
-            if (value is null)
+            if (value is null || (value is string text && string.IsNullOrEmpty(text)))
             {
                 return true;
             }
 
-            var converted = ComparableTypeConverter.Instance.ConvertFrom(value);
-            if (converted is IComparable comparable && converted.GetType() == comparable.GetType())
+            var type = MaxValue.GetType();
+
+            if (value.GetType() != type)
+            {
+                value = Convert.ChangeType(value, type);
+            }
+
+            if (value is IComparable comparableValue)
             {
-                return comparable.CompareTo(MaxValue) <= 0;
+                return comparableValue.CompareTo(MaxValue) <= 0;
             }
 
             return false;

diff --git a/src/Xamarin.Forms.InputKit/Shared/Validations/MinValueValidation.cs b/src/Xamarin.Forms.InputKit/Shared/Validations/MinValueValidation.cs
@@ -14,16 +14,21 @@ public class MinValueValidation : IValidation
 
         public bool Validate(object value)
         {
-            if (value is null)
+            if (value is null || (value is string text && string.IsNullOrEmpty(text)))
             {
                 return true;
             }
 
-            var converted = ComparableTypeConverter.Instance.ConvertFrom(value);
+            var type = MinValue.GetType();
 
-            if (converted is IComparable comparable && converted.GetType() == comparable.GetType())
+            if (value.GetType() != type)
             {
-                return comparable.CompareTo(MinValue) >= 0;
+                value = Convert.ChangeType(value, type);
+            }
+
+            if (value is IComparable comparableValue)
+            {
+                return comparableValue.CompareTo(MinValue) >= 0;
             }
 
             return false;

diff --git a/src/Xamarin.Forms.InputKit/Xamarin.Forms.InputKit.csproj b/src/Xamarin.Forms.InputKit/Xamarin.Forms.InputKit.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>Plugin.InputKit</RootNamespace>
     <PackageId>Xamarin.Forms.InputKit</PackageId>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>4.1.3</Version>
+    <Version>4.1.4</Version>
     <PackOnBuild>false</PackOnBuild>
     <NeutralLanguage>en-US</NeutralLanguage>
     <DefineConstants>$(DefineConstants);</DefineConstants>