From 43e276b2d31b212e4e66bd8a1a98a07aa821de3a Mon Sep 17 00:00:00 2001
From: Chris Pulman <chris.pulman@yahoo.com>
Date: Sat, 21 Sep 2024 08:23:00 +0100
Subject: [PATCH] Housekeeping clean up Android X project

---
 src/Directory.build.props                     |  4 +-
 .../Extensions/ViewForExtensions.cs           | 87 ++-----------------
 2 files changed, 8 insertions(+), 83 deletions(-)

diff --git a/src/Directory.build.props b/src/Directory.build.props
index 759d0e86..a20bb13d 100644
--- a/src/Directory.build.props
+++ b/src/Directory.build.props
@@ -27,7 +27,7 @@
     <LangVersion>preview</LangVersion>
     <EnableNETAnalyzers>True</EnableNETAnalyzers>
     <AnalysisLevel>latest</AnalysisLevel>
-		<NoWarn>$(NoWarn);IDE1006</NoWarn>
+		<NoWarn>$(NoWarn);IDE1006;IDE0130</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -48,4 +48,4 @@
 		<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
 	</ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/ReactiveUI.Validation.AndroidX/Extensions/ViewForExtensions.cs b/src/ReactiveUI.Validation.AndroidX/Extensions/ViewForExtensions.cs
index e4212671..de9c5536 100644
--- a/src/ReactiveUI.Validation.AndroidX/Extensions/ViewForExtensions.cs
+++ b/src/ReactiveUI.Validation.AndroidX/Extensions/ViewForExtensions.cs
@@ -15,7 +15,6 @@
 using ReactiveUI.Validation.ValidationBindings;
 using Splat;
 
-// ReSharper disable once CheckNamespace
 namespace ReactiveUI.Validation.Extensions;
 
 /// <summary>
@@ -40,7 +39,6 @@ public static class ViewForExtensions
     /// IValidationTextFormatter&lt;string&gt; into Splat.Locator.
     /// </param>
     /// <returns>Returns a <see cref="IDisposable"/> object.</returns>
-    [SuppressMessage("Design", "CA1801: Parameter unused", Justification = "Used for generic resolution.")]
     public static IDisposable BindValidation<TView, TViewModel, TViewModelProperty>(
         this TView view,
         TViewModel? viewModel,
@@ -50,74 +48,11 @@ public static IDisposable BindValidation<TView, TViewModel, TViewModelProperty>(
         where TView : IViewFor<TViewModel>
         where TViewModel : class, IReactiveObject, IValidatableViewModel
     {
-        if (view is null)
-        {
-            throw new ArgumentNullException(nameof(view));
-        }
+        ArgumentNullException.ThrowIfNull(view);
 
-        if (viewModelProperty is null)
-        {
-            throw new ArgumentNullException(nameof(viewModelProperty));
-        }
+        ArgumentNullException.ThrowIfNull(viewModelProperty);
 
-        if (viewProperty is null)
-        {
-            throw new ArgumentNullException(nameof(viewProperty));
-        }
-
-        formatter ??= Locator.Current.GetService<IValidationTextFormatter<string>>() ??
-                      SingleLineFormatter.Default;
-
-        return ValidationBinding.ForProperty(
-            view,
-            viewModelProperty,
-            (_, errors) => viewProperty.Error = errors.FirstOrDefault(msg => !string.IsNullOrEmpty(msg)),
-            formatter);
-    }
-
-    /// <summary>
-    /// Platform binding to the TextInputLayout.
-    /// </summary>
-    /// <remarks>Supports multiple validations for the same property.</remarks>
-    /// <typeparam name="TView">IViewFor of TViewModel.</typeparam>
-    /// <typeparam name="TViewModel">ViewModel type.</typeparam>
-    /// <typeparam name="TViewModelProperty">ViewModel property type.</typeparam>
-    /// <param name="view">IViewFor instance.</param>
-    /// <param name="viewModel">ViewModel instance. Can be null, used for generic type resolution.</param>
-    /// <param name="viewModelProperty">ViewModel property.</param>
-    /// <param name="viewProperty">View property to bind the validation message.</param>
-    /// <param name="formatter">
-    /// Validation formatter. Defaults to <see cref="SingleLineFormatter"/>. In order to override the global
-    /// default value, implement <see cref="IValidationTextFormatter{TOut}"/> and register an instance of
-    /// IValidationTextFormatter&lt;string&gt; into Splat.Locator.
-    /// </param>
-    /// <returns>Returns a <see cref="IDisposable"/> object.</returns>
-    [ExcludeFromCodeCoverage]
-    [Obsolete("This method is no longer required, BindValidation now supports multiple validations.")]
-    [SuppressMessage("Design", "CA1801: Parameter unused", Justification = "Used for generic resolution.")]
-    public static IDisposable BindValidationEx<TView, TViewModel, TViewModelProperty>(
-        this TView view,
-        TViewModel? viewModel,
-        Expression<Func<TViewModel, TViewModelProperty?>> viewModelProperty,
-        TextInputLayout viewProperty,
-        IValidationTextFormatter<string>? formatter = null)
-        where TView : IViewFor<TViewModel>
-        where TViewModel : class, IReactiveObject, IValidatableViewModel
-    {
-        if (view is null)
-        {
-            throw new ArgumentNullException(nameof(view));
-        }
-
-        if (viewModelProperty is null)
-        {
-            throw new ArgumentNullException(nameof(viewModelProperty));
-        }
-
-        if (viewProperty is null)
-        {
-            throw new ArgumentNullException(nameof(viewProperty));
-        }
+        ArgumentNullException.ThrowIfNull(viewProperty);
 
         formatter ??= Locator.Current.GetService<IValidationTextFormatter<string>>() ??
                       SingleLineFormatter.Default;
@@ -144,7 +79,6 @@ public static IDisposable BindValidationEx<TView, TViewModel, TViewModelProperty
     /// IValidationTextFormatter&lt;string&gt; into Splat.Locator.
     /// </param>
     /// <returns>Returns a <see cref="IDisposable"/> object.</returns>
-    [SuppressMessage("Design", "CA1801: Parameter unused", Justification = "Used for generic resolution.")]
     public static IDisposable BindValidation<TView, TViewModel>(
         this TView view,
         TViewModel? viewModel,
@@ -154,20 +88,11 @@ public static IDisposable BindValidation<TView, TViewModel>(
         where TView : IViewFor<TViewModel>
         where TViewModel : class, IReactiveObject, IValidatableViewModel
     {
-        if (view is null)
-        {
-            throw new ArgumentNullException(nameof(view));
-        }
+        ArgumentNullException.ThrowIfNull(view);
 
-        if (viewModelHelperProperty is null)
-        {
-            throw new ArgumentNullException(nameof(viewModelHelperProperty));
-        }
+        ArgumentNullException.ThrowIfNull(viewModelHelperProperty);
 
-        if (viewProperty is null)
-        {
-            throw new ArgumentNullException(nameof(viewProperty));
-        }
+        ArgumentNullException.ThrowIfNull(viewProperty);
 
         formatter ??= Locator.Current.GetService<IValidationTextFormatter<string>>() ??
                       SingleLineFormatter.Default;