ExtensionMethods -> Extensions

MvvmCross.Android.Support/Fragment/MvxFragmentExtensions.cs

@@ -6,6 +6,7 @@ using Android.Support.V4.App;
 using Android.Views;
 using MvvmCross.Droid.Support.V4.EventSource;
 using MvvmCross.Exceptions;
+using MvvmCross.Logging;
 using MvvmCross.Platform.Android.Binding.BindingContext;
 using MvvmCross.Platform.Android.Core;
 using MvvmCross.Platform.Android.Views;
@@ -104,5 +105,52 @@ namespace MvvmCross.Droid.Support.V4
             var setupSingleton = MvxAndroidSetupSingleton.EnsureSingletonAvailable(fragment.Activity.ApplicationContext);
             setupSingleton.EnsureInitialized();
         }
+
+        public static TFragment FindFragmentById<TFragment>(this MvxFragmentActivity activity, int resourceId)
+            where TFragment : Fragment
+        {
+            var fragment = activity.SupportFragmentManager.FindFragmentById(resourceId);
+            if (fragment == null) {
+                MvxAndroidLog.Instance.Warn("Failed to find fragment id {0} in {1}", resourceId, activity.GetType().Name);
+                return default(TFragment);
+            }
+
+            return SafeCast<TFragment>(fragment);
+        }
+
+        public static TFragment FindFragmentByTag<TFragment>(this MvxFragmentActivity activity, string tag)
+            where TFragment : Fragment
+        {
+            var fragment = activity.SupportFragmentManager.FindFragmentByTag(tag);
+            if (fragment == null) {
+                MvxAndroidLog.Instance.Warn("Failed to find fragment tag {0} in {1}", tag, activity.GetType().Name);
+                return default(TFragment);
+            }
+
+            return SafeCast<TFragment>(fragment);
+        }
+
+        private static TFragment SafeCast<TFragment>(Fragment fragment) where TFragment : Fragment
+        {
+            if (!(fragment is TFragment)) {
+                MvxAndroidLog.Instance.Warn("Fragment type mismatch got {0} but expected {1}", fragment.GetType().FullName,
+                            typeof(TFragment).FullName);
+                return default(TFragment);
+            }
+
+            return (TFragment)fragment;
+        }
+
+        public static void LoadViewModelFrom(this IMvxFragmentView view, MvxViewModelRequest request, IMvxBundle savedState = null)
+        {
+            var loader = Mvx.Resolve<IMvxViewModelLoader>();
+            var viewModel = loader.LoadViewModel(request, savedState);
+            if (viewModel == null) {
+                MvxAndroidLog.Instance.Warn("ViewModel not loaded for {0}", request.ViewModelType.FullName);
+                return;
+            }
+
+            view.ViewModel = viewModel;
+        }
     }
 }

MvvmCross.Android.Support/Fragment/MvxFragmentViewExtensionMethods.cs

@@ -1,65 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MS-PL license.
-// See the LICENSE file in the project root for more information.
-
-using Android.Support.V4.App;
-using MvvmCross.Logging;
-using MvvmCross.Platform.Android.Views;
-using MvvmCross.ViewModels;
-
-namespace MvvmCross.Droid.Support.V4
-{
-    public static class MvxFragmentExtensionMethods
-    {
-        public static TFragment FindFragmentById<TFragment>(this MvxFragmentActivity activity, int resourceId)
-            where TFragment : Fragment
-        {
-            var fragment = activity.SupportFragmentManager.FindFragmentById(resourceId);
-            if (fragment == null)
-            {
-                MvxAndroidLog.Instance.Warn("Failed to find fragment id {0} in {1}", resourceId, activity.GetType().Name);
-                return default(TFragment);
-            }
-
-            return SafeCast<TFragment>(fragment);
-        }
-
-        public static TFragment FindFragmentByTag<TFragment>(this MvxFragmentActivity activity, string tag)
-            where TFragment : Fragment
-        {
-            var fragment = activity.SupportFragmentManager.FindFragmentByTag(tag);
-            if (fragment == null)
-            {
-                MvxAndroidLog.Instance.Warn("Failed to find fragment tag {0} in {1}", tag, activity.GetType().Name);
-                return default(TFragment);
-            }
-
-            return SafeCast<TFragment>(fragment);
-        }
-
-        private static TFragment SafeCast<TFragment>(Fragment fragment) where TFragment : Fragment
-        {
-            if (!(fragment is TFragment))
-            {
-                MvxAndroidLog.Instance.Warn("Fragment type mismatch got {0} but expected {1}", fragment.GetType().FullName,
-                            typeof(TFragment).FullName);
-                return default(TFragment);
-            }
-
-            return (TFragment)fragment;
-        }
-
-        public static void LoadViewModelFrom(this IMvxFragmentView view, MvxViewModelRequest request, IMvxBundle savedState = null)
-        {
-            var loader = Mvx.Resolve<IMvxViewModelLoader>();
-            var viewModel = loader.LoadViewModel(request, savedState);
-            if (viewModel == null)
-            {
-                MvxAndroidLog.Instance.Warn("ViewModel not loaded for {0}", request.ViewModelType.FullName);
-                return;
-            }
-
-            view.ViewModel = viewModel;
-        }
-    }
-}

MvvmCross.Android.Support/V7.RecyclerView/MvxRecyclerAdapter.cs

@@ -11,7 +11,7 @@ using Android.Runtime;
 using Android.Views;
 using MvvmCross.Binding;
 using MvvmCross.Binding.Attributes;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.Droid.Support.V7.RecyclerView.ItemTemplates;
 using MvvmCross.Droid.Support.V7.RecyclerView.Model;
 using MvvmCross.Exceptions;

MvvmCross.Forms/Bindings/MvxBindablePropertyExtensions.cs

@@ -9,7 +9,7 @@ using Xamarin.Forms;
 
 namespace MvvmCross.Forms.Bindings
 {
-    public static class MvxBindablePropertyExtensionMethods
+    public static class MvxBindablePropertyExtensions
     {
         public static TypeConverter TypeConverter(this Type type)
         {
@@ -77,4 +77,4 @@ namespace MvvmCross.Forms.Bindings
             return true;
         }
     }
-}
+}

MvvmCross.Forms/Bindings/Target/MvxBindablePropertyTargetBinding.cs

@@ -6,7 +6,7 @@ using System;
 using System.ComponentModel;
 using MvvmCross.Binding;
 using MvvmCross.Binding.Bindings.Target;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.WeakSubscription;
 using Xamarin.Forms;
 

MvvmCross.Plugins/FieldBinding/MvxLeafFieldSourceBinding.cs

@@ -4,7 +4,7 @@
 
 using System;
 using System.Reflection;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 
 namespace MvvmCross.Plugin.FieldBinding
 {

MvvmCross.Plugins/FieldBinding/MvxLeafNotifyChangeFieldSourceBinding.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 
 namespace MvvmCross.Plugin.FieldBinding
 {

MvvmCross.Plugins/MethodBinding/MvxMethodSourceBindingFactoryExtension.cs

@@ -57,8 +57,7 @@ namespace MvvmCross.Plugin.MethodBinding
 
         protected MethodInfo FindMethodInfo(object source, string name)
         {
-            var methodInfo = source.GetType()
-                                         .GetMethod(name);
+            var methodInfo = source.GetType().GetMethod(name);
             return methodInfo;
         }
     }

MvvmCross.Plugins/PictureChooser/MvxPictureChooserExtensions.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace MvvmCross.Plugin.PictureChooser
 {
-    public static class MvxPictureChooserExtensionMethods
+    public static class MvxPictureChooserExtensions
     {
         public static Task<Stream> ChoosePictureFromLibraryAsync(this IMvxPictureChooserTask chooser, int maxPixelDimension, int percentQuality)
         {

MvvmCross/Base/MvxDelegateExtensions.cs

@@ -6,7 +6,7 @@ using System;
 
 namespace MvvmCross.Base
 {
-    public static class MvxDelegateExtensionMethods
+    public static class MvxDelegateExtensions
     {
         public static void Raise(this EventHandler eventHandler, object sender)
         {

MvvmCross/Base/MvxPropertyNameExtensions.cs

@@ -8,7 +8,7 @@ using System.Reflection;
 
 namespace MvvmCross.Base
 {
-    public static class MvxPropertyNameExtensionMethods
+    public static class MvxPropertyNameExtensions
     {
         private const string WrongExpressionMessage =
             "Wrong expression\nshould be called with expression like\n() => PropertyName";

MvvmCross/Binding/Bindings/MvxBindingModeExtensions.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MS-PL license.
 // See the LICENSE file in the project root for more information.
 
@@ -7,7 +7,7 @@ using MvvmCross.Exceptions;
 
 namespace MvvmCross.Binding.Bindings
 {
-    public static class MvxBindingModeExtensionMethods
+    public static class MvxBindingModeExtensions
     {
         public static MvxBindingMode IfDefault(this MvxBindingMode bindingMode, MvxBindingMode modeIfDefault)
         {

MvvmCross/Binding/Bindings/Source/Leaf/MvxLeafPropertyInfoSourceBinding.cs

@@ -4,7 +4,7 @@
 
 using System;
 using System.Reflection;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.Converters;
 using MvvmCross.Exceptions;
 

MvvmCross/Binding/Bindings/Target/MvxConvertingTargetBinding.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 
 namespace MvvmCross.Binding.Bindings.Target
 {

MvvmCross/Binding/Combiners/MvxBooleanValueCombiner.cs

@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using MvvmCross.Binding.Bindings.SourceSteps;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.Converters;
 
 namespace MvvmCross.Binding.Combiners

MvvmCross/Binding/Combiners/MvxIfValueCombiner.cs

@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using MvvmCross.Binding.Bindings.SourceSteps;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.Converters;
 
 namespace MvvmCross.Binding.Combiners

MvvmCross/Binding/Extensions/IMvxEditableTextView.cs

@@ -1,11 +1,11 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MS-PL license.
 // See the LICENSE file in the project root for more information.
 
-namespace MvvmCross.Binding.ExtensionMethods
+namespace MvvmCross.Binding.Extensions
 {
     public interface IMvxEditableTextView
     {
         string CurrentText { get; }
     }
-}
+}

MvvmCross/Binding/Extensions/MvxBindingExtensions.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MS-PL license.
 // See the LICENSE file in the project root for more information.
 
@@ -7,7 +7,7 @@ using System.Globalization;
 using MvvmCross.Base;
 using MvvmCross.IoC;
 
-namespace MvvmCross.Binding.ExtensionMethods
+namespace MvvmCross.Binding.Extensions
 {
     public static class MvxBindingExtensions
     {
@@ -66,4 +66,4 @@ namespace MvvmCross.Binding.ExtensionMethods
             return propertyType.MakeSafeValueCore(value);
         }
     }
-}
+}

MvvmCross/Binding/Extensions/MvxEnumerableExtensions.cs

@@ -4,7 +4,7 @@
 
 using System.Collections;
 
-namespace MvvmCross.Binding.ExtensionMethods
+namespace MvvmCross.Binding.Extensions
 {
     public static class MvxEnumerableExtensions
     {
@@ -85,4 +85,4 @@ namespace MvvmCross.Binding.ExtensionMethods
             return enumerator.Current;
         }
     }
-}
+}

MvvmCross/Core/MvxSimplePropertyDictionaryExtensions.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MS-PL license.
 // See the LICENSE file in the project root for more information.
 
@@ -14,7 +14,7 @@ using MvvmCross.ViewModels;
 
 namespace MvvmCross.Core
 {
-    public static class MvxSimplePropertyDictionaryExtensionMethods
+    public static class MvxSimplePropertyDictionaryExtensions
     {
         public static IDictionary<string, string> ToSimpleStringPropertyDictionary(
             this IDictionary<string, object> input)
@@ -167,4 +167,4 @@ namespace MvvmCross.Core
             }
         }
     }
-}
+}

MvvmCross/Exceptions/MvxExceptionExtensions.cs

@@ -6,7 +6,7 @@ using System;
 
 namespace MvvmCross.Exceptions
 {
-    public static class MvxExceptionExtensionMethods
+    public static class MvxExceptionExtensions
     {
         public static string ToLongString(this Exception exception)
         {

MvvmCross/IoC/MvxConventionAttributeExtensions.cs

@@ -8,7 +8,7 @@ using System.Reflection;
 
 namespace MvvmCross.IoC
 {
-    public static class MvxConventionAttributeExtensionMethods
+    public static class MvxConventionAttributeExtensions
     {
         /// <summary>
         /// A type is conventional if and only it is:

MvvmCross/Platform/Android/Base/Platform/MvxDateTimeExtensions.cs

@@ -6,7 +6,7 @@ using System;
 
 namespace MvvmCross.Platform.Android.Base.Platform
 {
-    public static class MvxDateTimeExtensionMethods
+    public static class MvxDateTimeExtensions
     {
         private static readonly DateTime UnixZeroUtc = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 

MvvmCross/Platform/Android/Base/WeakSubscription/MvxAndroidWeakSubscriptionExtensions.cs

@@ -6,7 +6,7 @@ using System;
 
 namespace MvvmCross.Platform.Android.Base.WeakSubscription
 {
-    public static class MvxAndroidWeakSubscriptionExtensionMethods
+    public static class MvxAndroidWeakSubscriptionExtensions
     {
         public static MvxJavaEventSubscription<TSource> WeakSubscribe<TSource>(this TSource source, string eventName, EventHandler eventHandler)
             where TSource : class

MvvmCross/Platform/Android/Binding/Target/MvxTextViewTextFormattedTargetBinding.cs

@@ -6,7 +6,7 @@ using System;
 using Android.Text;
 using Android.Widget;
 using MvvmCross.Binding;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.Platform.Android.Base.WeakSubscription;
 
 namespace MvvmCross.Platform.Android.Binding.Target

MvvmCross/Platform/Android/Binding/Target/MvxTextViewTextTargetBinding.cs

@@ -6,7 +6,7 @@ using System;
 using Android.Text;
 using Android.Widget;
 using MvvmCross.Binding;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.Platform.Android.Base.WeakSubscription;
 
 namespace MvvmCross.Platform.Android.Binding.Target

MvvmCross/Platform/Android/Binding/Target/MvxViewHiddenBinding.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using Android.Views;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 
 namespace MvvmCross.Platform.Android.Binding.Target
 {

MvvmCross/Platform/Android/Binding/Target/MvxViewVisibleBinding.cs

@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using Android.Views;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 
 namespace MvvmCross.Platform.Android.Binding.Target
 {

MvvmCross/Platform/Android/Binding/Views/MvxAdapter.cs

@@ -15,7 +15,7 @@ using MvvmCross.Exceptions;
 using MvvmCross.Logging;
 using MvvmCross.Binding;
 using MvvmCross.Binding.Attributes;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.Platform.Android.Binding.BindingContext;
 using MvvmCross.WeakSubscription;
 using Object = Java.Lang.Object;

MvvmCross/Platform/Android/Binding/Views/MvxExpandableListAdapter.cs

@@ -8,7 +8,7 @@ using Android.Content;
 using Android.Runtime;
 using Android.Views;
 using Android.Widget;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.Platform.Android.Binding.BindingContext;
 using Object = Java.Lang.Object;
 

MvvmCross/Platform/Android/Views/Fragments/MvxFragmentExtensions.cs

@@ -5,6 +5,7 @@
 using Android.App;
 using Android.Views;
 using MvvmCross.Exceptions;
+using MvvmCross.Logging;
 using MvvmCross.Platform.Android.Binding.BindingContext;
 using MvvmCross.Platform.Android.Core;
 using MvvmCross.ViewModels;
@@ -102,5 +103,52 @@ namespace MvvmCross.Platform.Android.Views.Fragments
             var setupSingleton = MvxAndroidSetupSingleton.EnsureSingletonAvailable(fragment.Activity.ApplicationContext);
             setupSingleton.EnsureInitialized();
         }
+
+        public static TFragment FindFragmentById<TFragment>(this MvxActivity activity, int resourceId)
+            where TFragment : Fragment
+        {
+            var fragment = activity.FragmentManager.FindFragmentById(resourceId);
+            if (fragment == null) {
+                MvxLog.Instance.Warn("Failed to find fragment id {0} in {1}", resourceId, activity.GetType().Name);
+                return default(TFragment);
+            }
+
+            return SafeCast<TFragment>(fragment);
+        }
+
+        public static TFragment FindFragmentByTag<TFragment>(this MvxActivity activity, string tag)
+            where TFragment : Fragment
+        {
+            var fragment = activity.FragmentManager.FindFragmentByTag(tag);
+            if (fragment == null) {
+                MvxLog.Instance.Warn("Failed to find fragment tag {0} in {1}", tag, activity.GetType().Name);
+                return default(TFragment);
+            }
+
+            return SafeCast<TFragment>(fragment);
+        }
+
+        private static TFragment SafeCast<TFragment>(Fragment fragment) where TFragment : Fragment
+        {
+            if (!(fragment is TFragment)) {
+                MvxLog.Instance.Warn("Fragment type mismatch got {0} but expected {1}", fragment.GetType().FullName,
+                            typeof(TFragment).FullName);
+                return default(TFragment);
+            }
+
+            return (TFragment)fragment;
+        }
+
+        public static void LoadViewModelFrom(this Android.Views.IMvxFragmentView view, MvxViewModelRequest request, IMvxBundle savedState = null)
+        {
+            var loader = Mvx.Resolve<IMvxViewModelLoader>();
+            var viewModel = loader.LoadViewModel(request, savedState);
+            if (viewModel == null) {
+                MvxLog.Instance.Warn("ViewModel not loaded for {0}", request.ViewModelType.FullName);
+                return;
+            }
+
+            view.ViewModel = viewModel;
+        }
     }
 }

MvvmCross/Platform/Android/Views/Fragments/MvxFragmentViewExtensionMethods.cs

@@ -1,64 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MS-PL license.
-// See the LICENSE file in the project root for more information.
-
-using Android.App;
-using MvvmCross.Logging;
-using MvvmCross.ViewModels;
-
-namespace MvvmCross.Platform.Android.Views.Fragments
-{
-    public static class MvxFragmentExtensionMethods
-    {
-        public static TFragment FindFragmentById<TFragment>(this MvxActivity activity, int resourceId)
-            where TFragment : Fragment
-        {
-            var fragment = activity.FragmentManager.FindFragmentById(resourceId);
-            if (fragment == null)
-            {
-                MvxLog.Instance.Warn("Failed to find fragment id {0} in {1}", resourceId, activity.GetType().Name);
-                return default(TFragment);
-            }
-
-            return SafeCast<TFragment>(fragment);
-        }
-
-        public static TFragment FindFragmentByTag<TFragment>(this MvxActivity activity, string tag)
-            where TFragment : Fragment
-        {
-            var fragment = activity.FragmentManager.FindFragmentByTag(tag);
-            if (fragment == null)
-            {
-                MvxLog.Instance.Warn("Failed to find fragment tag {0} in {1}", tag, activity.GetType().Name);
-                return default(TFragment);
-            }
-
-            return SafeCast<TFragment>(fragment);
-        }
-
-        private static TFragment SafeCast<TFragment>(Fragment fragment) where TFragment : Fragment
-        {
-            if (!(fragment is TFragment))
-            {
-                MvxLog.Instance.Warn("Fragment type mismatch got {0} but expected {1}", fragment.GetType().FullName,
-                            typeof(TFragment).FullName);
-                return default(TFragment);
-            }
-
-            return (TFragment)fragment;
-        }
-
-        public static void LoadViewModelFrom(this Android.Views.IMvxFragmentView view, MvxViewModelRequest request, IMvxBundle savedState = null)
-        {
-            var loader = Mvx.Resolve<IMvxViewModelLoader>();
-            var viewModel = loader.LoadViewModel(request, savedState);
-            if (viewModel == null)
-            {
-                MvxLog.Instance.Warn("ViewModel not loaded for {0}", request.ViewModelType.FullName);
-                return;
-            }
-
-            view.ViewModel = viewModel;
-        }
-    }
-}

MvvmCross/Platform/Ios/Base/MvxIosColorExtensions.cs

@@ -7,7 +7,7 @@ using UIKit;
 
 namespace MvvmCross.Platform.Ios.Base
 {
-    public static class MvxIosColorExtensionMethods
+    public static class MvxIosColorExtensions
     {
         public static UIColor ColorFromInt(this uint rgbValue)
         {

MvvmCross/Platform/Ios/Base/MvxIosDateTimeExtensions.cs

@@ -7,7 +7,7 @@ using Foundation;
 
 namespace MvvmCross.Platform.Ios.Base
 {
-    public static class MvxIosDateTimeExtensionMethods
+    public static class MvxIosDateTimeExtensions
     {
         private static readonly DateTime ReferenceNSDateTime = new DateTime(2001, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 

MvvmCross/Platform/Ios/Views/MvxCanCreateIosViewExtensions.cs

@@ -9,7 +9,7 @@ using MvvmCross.ViewModels;
 
 namespace MvvmCross.Platform.Ios.Views
 {
-    public static class MvxCanCreateIosViewExtensionMethods
+    public static class MvxCanCreateIosViewExtensions
     {
         public static IMvxIosView CreateViewControllerFor<TTargetViewModel>(this IMvxCanCreateIosView view,
                                                                               object parameterObject)

MvvmCross/Platform/Ios/Views/MvxSegueExtensions.cs

@@ -15,7 +15,7 @@ using UIKit;
 
 namespace MvvmCross.Platform.Ios.Views
 {
-    internal static class MvxSegueExtensionMethods 
+    internal static class MvxSegueExtensions 
     {
         internal static Type GetViewModelType(this IMvxView view)
         {

MvvmCross/Platform/Ios/Views/MvxViewControllerExtensions.cs

@@ -9,7 +9,7 @@ using MvvmCross.Views;
 
 namespace MvvmCross.Platform.Ios.Views
 {
-    public static class MvxViewControllerExtensionMethods
+    public static class MvxViewControllerExtensions
     {
         public static void OnViewCreate(this IMvxIosView iosView)
         {

MvvmCross/Platform/Ios/Views/UIViewControllerExtensions.cs

@@ -7,7 +7,7 @@ using UIKit;
 
 namespace MvvmCross.Platform.Ios.Views
 {
-    public static class UIViewControllerExtensionMethods
+    public static class UIViewControllerExtensions
     {
         public static IMvxIosView GetIMvxIosView(this UIViewController viewController)
         {

MvvmCross/Platform/Mac/Binding/Views/MvxTableViewSource.cs

@@ -12,7 +12,7 @@ using Foundation;
 using MvvmCross.Base;
 using MvvmCross.Binding.Attributes;
 using MvvmCross.Binding.BindingContext;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.WeakSubscription;
 
 namespace MvvmCross.Platform.Mac.Binding.Views

MvvmCross/Platform/Mac/ExtensionMethods/MvxMacDateTimeExtensions.cs

@@ -7,7 +7,7 @@ using Foundation;
 
 namespace MvvmCross.Platform.Mac.ExtensionMethods
 {
-    public static class MvxMacDateTimeExtensionMethods
+    public static class MvxMacDateTimeExtensions
     {
         private static readonly DateTime ReferenceNSDateTime = new DateTime(2001, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 

MvvmCross/Platform/Mac/Views/MvxSegueExtensions.cs

@@ -15,7 +15,7 @@ using MvvmCross.Views;
 
 namespace MvvmCross.Platform.Mac.Views
 {
-    internal static class MvxSegueExtensionMethods
+    internal static class MvxSegueExtensions
     {
         internal static Type GetViewModelType(this IMvxView view)
         {

MvvmCross/Platform/Mac/Views/MvxViewControllerExtensions.cs

@@ -12,7 +12,7 @@ using MvvmCross.Views;
 
 namespace MvvmCross.Platform.Mac.Views
 {
-    public static class MvxViewControllerExtensionMethods
+    public static class MvxViewControllerExtensions
     {
         public static void OnViewCreate(this IMvxMacView macView)
         {

MvvmCross/Platform/Tvos/Base/MvxTvosColorExtensions.cs

@@ -7,7 +7,7 @@ using UIKit;
 
 namespace MvvmCross.Platform.Tvos.Base
 {
-    public static class MvxTvosColorExtensionMethods
+    public static class MvxTvosColorExtensions
     {
         public static UIColor ColorFromInt(this uint rgbValue)
         {

MvvmCross/Platform/Tvos/Base/MvxTvosDateTimeExtensions.cs

@@ -7,7 +7,7 @@ using Foundation;
 
 namespace MvvmCross.Platform.Tvos.Base
 {
-    public static class MvxTvosDateTimeExtensionMethods
+    public static class MvxTvosDateTimeExtensions
     {
         private static readonly DateTime ReferenceNSDateTime = new DateTime(2001, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 

MvvmCross/Platform/Tvos/Binding/Target/MvxUITextFieldTextTargetBinding.cs

@@ -5,7 +5,7 @@
 using System;
 using MvvmCross.Binding;
 using MvvmCross.Binding.Bindings.Target;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using UIKit;
 
 namespace MvvmCross.Platform.Tvos.Binding.Target

MvvmCross/Platform/Tvos/Binding/Target/MvxUIViewHiddenTargetBinding.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MS-PL license.
 // See the LICENSE file in the project root for more information.
 
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using UIKit;
 
 namespace MvvmCross.Platform.Tvos.Binding.Target

MvvmCross/Platform/Tvos/Binding/Target/MvxUIViewVisibleTargetBinding.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MS-PL license.
 // See the LICENSE file in the project root for more information.
 
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using UIKit;
 
 namespace MvvmCross.Platform.Tvos.Binding.Target

MvvmCross/Platform/Tvos/Binding/Views/MvxCollectionViewSource.cs

@@ -8,7 +8,7 @@ using System.Collections.Specialized;
 using System.Threading.Tasks;
 using Foundation;
 using MvvmCross.Binding.Attributes;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.WeakSubscription;
 using UIKit;
 

MvvmCross/Platform/Tvos/Binding/Views/MvxCollectionViewSourceAnimated.cs

@@ -10,7 +10,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Foundation;
 using MvvmCross.Logging;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using UIKit;
 
 namespace MvvmCross.Platform.Tvos.Binding.Views

MvvmCross/Platform/Tvos/Binding/Views/MvxTableViewSource.cs

@@ -8,7 +8,7 @@ using System.Collections.Specialized;
 using Foundation;
 using MvvmCross.Logging;
 using MvvmCross.Binding.Attributes;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.WeakSubscription;
 using UIKit;
 

MvvmCross/Platform/Tvos/Views/MvxCanCreateTvosViewExtensions.cs

@@ -9,7 +9,7 @@ using MvvmCross.ViewModels;
 
 namespace MvvmCross.Platform.Tvos.Views
 {
-    public static class MvxCanCreateTvosViewExtensionMethods
+    public static class MvxCanCreateTvosViewExtensions
     {
         public static IMvxTvosView CreateViewControllerFor<TTargetViewModel>(this IMvxCanCreateTvosView view,
                                                                               object parameterObject)

MvvmCross/Platform/Tvos/Views/MvxSegueExtensions.cs

@@ -15,7 +15,7 @@ using MvvmCross.Views;
 
 namespace MvvmCross.Platform.Tvos.Views
 {
-    internal static class MvxSegueExtensionMethods
+    internal static class MvxSegueExtensions
     {
         internal static Type GetViewModelType(this IMvxView view)
         {

MvvmCross/Platform/Tvos/Views/MvxViewControllerExtensions.cs

@@ -9,7 +9,7 @@ using MvvmCross.Views;
 
 namespace MvvmCross.Platform.Tvos.Views
 {
-    public static class MvxViewControllerExtensionMethods
+    public static class MvxViewControllerExtensions
     {
         public static void OnViewCreate(this IMvxTvosView tvOSView)
         {

MvvmCross/Platform/Tvos/Views/UIViewControllerExtensions.cs

@@ -7,7 +7,7 @@ using UIKit;
 
 namespace MvvmCross.Platform.Tvos.Views
 {
-    public static class UIViewControllerExtensionMethods
+    public static class UIViewControllerExtensions
     {
         public static IMvxTvosView GetIMvxTvosView(this UIViewController viewController)
         {

MvvmCross/Platform/Uap/Base/Platform/MvxPseudoAsyncExtensions.cs

@@ -7,7 +7,7 @@ using Windows.Foundation;
 
 namespace MvvmCross.Platform.Uap.Base.Platform
 {
-    public static class MvxPseudoAsyncExtensionMethods
+    public static class MvxPseudoAsyncExtensions
     {
         public static void Await(this IAsyncAction operation)
         {

MvvmCross/Platform/Uap/Binding/MvxBinding/Target/MvxDependencyPropertyTargetBinding.cs

@@ -7,7 +7,7 @@ using Windows.UI.Xaml;
 using Windows.UI.Xaml.Media;
 using MvvmCross.Binding;
 using MvvmCross.Binding.Bindings.Target;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 
 namespace MvvmCross.Platform.Uap.Binding.MvxBinding.Target
 {

MvvmCross/Platform/Uap/Binding/MvxDependencyPropertyExtensions.cs

@@ -8,7 +8,7 @@ using Windows.UI.Xaml;
 
 namespace MvvmCross.Platform.Uap.Binding
 {
-    public static class MvxDependencyPropertyExtensionMethods
+    public static class MvxDependencyPropertyExtensions
     {
         public static PropertyInfo FindActualProperty(this Type type, string name)
         {

MvvmCross/Platform/Uap/Views/MvxWindowsExtensions.cs

@@ -11,7 +11,7 @@ using MvvmCross.ViewModels;
 
 namespace MvvmCross.Platform.Uap.Views
 {
-    public static class MvxWindowsExtensionMethods
+    public static class MvxWindowsExtensions
     {
         public static void OnViewCreate(this IMvxWindowsView storeView, string requestText, Func<IMvxBundle> bundleLoader)
         {

MvvmCross/Platform/Wpf/Binding/MvxBinding/Target/MvxDependencyPropertyTargetBinding.cs

@@ -8,7 +8,7 @@ using System.Windows;
 using System.Windows.Media;
 using MvvmCross.Binding;
 using MvvmCross.Binding.Bindings.Target;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 
 namespace MvvmCross.Platform.Wpf.Binding.MvxBinding.Target
 {

MvvmCross/Platform/Wpf/Binding/MvxDependencyPropertyExtensions.cs

@@ -10,7 +10,7 @@ using System.Windows;
 
 namespace MvvmCross.Platform.Wpf.Binding
 {
-    public static class MvxDependencyPropertyExtensionMethods
+    public static class MvxDependencyPropertyExtensions
     {
         public static TypeConverter TypeConverter(this Type type)
         {

MvvmCross/Platform/iOS/Base/MvxIosUIViewControllerExtensions.cs

@@ -1,30 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MS-PL license.
-// See the LICENSE file in the project root for more information.
-
-using UIKit;
-
-namespace MvvmCross.Platform.Ios.Base
-{
-    public static class MvxIosUIViewControllerExtensions
-    {
-        public static bool IsVisible(this UIViewController controller)
-        {
-            // based from answer to http://stackoverflow.com/questions/2777438/how-to-tell-if-uiviewcontrollers-view-is-visible
-            // would ideally prefer to use ViewWillAppear in the controller code - but UINavigationController doesn't pass on
-            // these messages correctly
-            if (!controller.IsViewLoaded)
-                return false;
-
-            var uiNavigationParent = controller.ParentViewController as UINavigationController;
-            if (uiNavigationParent == null)
-            {
-                return controller.View.Window != null;
-            }
-            else
-            {
-                return Equals(uiNavigationParent.VisibleViewController, controller);
-            }
-        }
-    }
-}

MvvmCross/Platform/iOS/Binding/Target/MvxUITextFieldTextTargetBinding.cs

@@ -5,7 +5,7 @@
 using System;
 using MvvmCross.Binding;
 using MvvmCross.Binding.Bindings.Target;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.WeakSubscription;
 using UIKit;
 

MvvmCross/Platform/iOS/Binding/Target/MvxUIViewHiddenTargetBinding.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MS-PL license.
 // See the LICENSE file in the project root for more information.
 
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using UIKit;
 
 namespace MvvmCross.Platform.Ios.Binding.Target

MvvmCross/Platform/iOS/Binding/Target/MvxUIViewVisibleTargetBinding.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MS-PL license.
 // See the LICENSE file in the project root for more information.
 
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using UIKit;
 
 namespace MvvmCross.Platform.Ios.Binding.Target

MvvmCross/Platform/iOS/Binding/Views/MvxCollectionViewSource.cs

@@ -8,7 +8,7 @@ using System.Collections.Specialized;
 using System.Threading.Tasks;
 using Foundation;
 using MvvmCross.Binding.Attributes;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.WeakSubscription;
 using UIKit;
 

MvvmCross/Platform/iOS/Binding/Views/MvxCollectionViewSourceAnimated.cs

@@ -10,7 +10,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Foundation;
 using MvvmCross.Logging;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using UIKit;
 
 namespace MvvmCross.Platform.Ios.Binding.Views

MvvmCross/Platform/iOS/Binding/Views/MvxPickerViewModel.cs

@@ -8,7 +8,7 @@ using System.Collections.Specialized;
 using System.Windows.Input;
 using MvvmCross.Logging;
 using MvvmCross.Binding.Attributes;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.WeakSubscription;
 using UIKit;
 

MvvmCross/Platform/iOS/Binding/Views/MvxTableViewSource.cs

@@ -8,7 +8,7 @@ using System.Collections.Specialized;
 using Foundation;
 using MvvmCross.Logging;
 using MvvmCross.Binding.Attributes;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.WeakSubscription;
 using UIKit;
 

MvvmCross/ViewModels/MvxInteractionExtensions.cs

@@ -8,7 +8,7 @@ using MvvmCross.WeakSubscription;
 
 namespace MvvmCross.ViewModels
 {
-    public static class MvxInteractionExtensionMethods
+    public static class MvxInteractionExtensions
     {
         public static IDisposable WeakSubscribe(this IMvxInteraction interaction, EventHandler<EventArgs> action)
         {
@@ -28,4 +28,4 @@ namespace MvvmCross.ViewModels
             return interaction.WeakSubscribe(wrappedAction);
         }
     }
-}
+}

MvvmCross/Views/MvxViewExtensions.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MS-PL license.
 // See the LICENSE file in the project root for more information.
 
@@ -9,7 +9,7 @@ using MvvmCross.ViewModels;
 
 namespace MvvmCross.Views
 {
-    public static class MvxViewExtensionMethods
+    public static class MvxViewExtensions
     {
         public static void OnViewCreate(this IMvxView view, Func<IMvxViewModel> viewModelLoader)
         {
@@ -75,4 +75,4 @@ namespace MvvmCross.Views
             return viewModel.SaveStateBundle();
         }
     }
-}
+}

MvvmCross/WeakSubscription/MvxWeakSubscriptionExtensions.cs

@@ -12,7 +12,7 @@ using MvvmCross.Base;
 
 namespace MvvmCross.WeakSubscription
 {
-    public static class MvxWeakSubscriptionExtensionMethods
+    public static class MvxWeakSubscriptionExtensions
     {
         public static MvxNotifyPropertyChangedEventSubscription WeakSubscribe(this INotifyPropertyChanged source,
                                                                               EventHandler<PropertyChangedEventArgs> eventHandler)

UnitTests/MvvmCross.UnitTest/Binding/ExtensionMethods/MakeSafeValueTest.cs

@@ -4,7 +4,7 @@
 
 using System;
 using MvvmCross.Binding.Binders;
-using MvvmCross.Binding.ExtensionMethods;
+using MvvmCross.Binding.Extensions;
 using MvvmCross.Converters;
 using MvvmCross.Test;
 using Xunit;