Merge pull request #2612 from DGenix/forms-namespaces

Update Forms namespaces to match traditional Xamarin
MvvmCross · Feb 12, 2018 · acf2472 · acf2472
2 parents 0f5ab75 + 95287c0
commit acf2472
Show file tree

Hide file tree

Showing 78 changed files with 108 additions and 107 deletions.
diff --git a/MvvmCross.Forms/Platform/Android/Core/MvxFormsAndroidSetup.cs b/MvvmCross.Forms/Platform/Android/Core/MvxFormsAndroidSetup.cs
@@ -5,18 +5,18 @@
 using Android.Content;
 using MvvmCross.Binding;
 using MvvmCross.Binding.Bindings.Target.Construction;
-using MvvmCross.Forms.Views;
 using MvvmCross.Localization;
 using System.Collections.Generic;
 using System.Reflection;
 using MvvmCross.Forms.Core;
 using MvvmCross.Forms.Platform.Android.Bindings;
-using MvvmCross.Forms.Platform.Android.Views;
 using MvvmCross.Platform.Android.Core;
 using MvvmCross.Platform.Android.Presenters;
 using MvvmCross.Plugins;
 using MvvmCross.ViewModels;
 using MvvmCross.Platform.Android;
+using MvvmCross.Forms.Presenters;
+using MvvmCross.Forms.Platform.Android.Presenters;
 
 namespace MvvmCross.Forms.Platform.Android.Core
 {

diff --git a/...oid/Views/MvxFormsAndroidViewPresenter.cs → ...resenters/MvxFormsAndroidViewPresenter.cs b/...oid/Views/MvxFormsAndroidViewPresenter.cs → ...resenters/MvxFormsAndroidViewPresenter.cs
@@ -3,16 +3,16 @@
 // See the LICENSE file in the project root for more information.
 
 using MvvmCross.Droid.Support.V7.AppCompat;
-using MvvmCross.Forms.Views;
+using MvvmCross.Forms.Presenters;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
 using MvvmCross.Forms.Core;
 using MvvmCross.Platform.Android.Views;
 using MvvmCross.ViewModels;
+using MvvmCross.Forms.Platform.Android.Views;
 
-
-namespace MvvmCross.Forms.Platform.Android.Views
+namespace MvvmCross.Forms.Platform.Android.Presenters
 {
     public class MvxFormsAndroidViewPresenter
         : MvxAppCompatViewPresenter, IMvxFormsViewPresenter

diff --git a/...e/MvxEventSourceFormsAppCompatActivity.cs → ...e/MvxEventSourceFormsAppCompatActivity.cs b/...e/MvxEventSourceFormsAppCompatActivity.cs → ...e/MvxEventSourceFormsAppCompatActivity.cs
@@ -10,7 +10,7 @@
 using MvvmCross.Platform.Android.Views.Base;
 using Xamarin.Forms.Platform.Android;
 
-namespace MvvmCross.Forms.Platform.Android.Views.EventSource
+namespace MvvmCross.Forms.Platform.Android.Views.Base
 {
     public abstract class MvxEventSourceFormsAppCompatActivity
         : FormsAppCompatActivity, IMvxEventSourceActivity

diff --git a/...MvxEventSourceFormsApplicationActivity.cs → ...MvxEventSourceFormsApplicationActivity.cs b/...MvxEventSourceFormsApplicationActivity.cs → ...MvxEventSourceFormsApplicationActivity.cs
@@ -10,7 +10,7 @@
 using MvvmCross.Platform.Android.Views.Base;
 using Xamarin.Forms.Platform.Android;
 
-namespace MvvmCross.Forms.Platform.Android.Views.EventSource
+namespace MvvmCross.Forms.Platform.Android.Views.Base
 {
     public abstract class MvxEventSourceFormsApplicationActivity
         : FormsApplicationActivity, IMvxEventSourceActivity

diff --git a/MvvmCross.Forms/Platform/Android/Views/MvxFormsAppCompatActivity.cs b/MvvmCross.Forms/Platform/Android/Views/MvxFormsAppCompatActivity.cs
@@ -10,8 +10,8 @@
 using MvvmCross.Binding.BindingContext;
 using MvvmCross.Droid.Support.V7.AppCompat;
 using MvvmCross.Forms.Core;
-using MvvmCross.Forms.Platform.Android.Views.EventSource;
-using MvvmCross.Forms.Views;
+using MvvmCross.Forms.Platform.Android.Views.Base;
+using MvvmCross.Forms.Presenters;
 using MvvmCross.Platform.Android.Binding.BindingContext;
 using MvvmCross.Platform.Android.Binding.Views;
 using MvvmCross.Platform.Android.Core;

diff --git a/MvvmCross.Forms/Platform/Android/Views/MvxFormsApplicationActivity.cs b/MvvmCross.Forms/Platform/Android/Views/MvxFormsApplicationActivity.cs
@@ -8,8 +8,8 @@
 using Android.Views;
 using MvvmCross.Binding.BindingContext;
 using MvvmCross.Forms.Core;
-using MvvmCross.Forms.Platform.Android.Views.EventSource;
-using MvvmCross.Forms.Views;
+using MvvmCross.Forms.Platform.Android.Views.Base;
+using MvvmCross.Forms.Presenters;
 using MvvmCross.Platform.Android.Binding.BindingContext;
 using MvvmCross.Platform.Android.Binding.Views;
 using MvvmCross.Platform.Android.Core;

diff --git a/MvvmCross.Forms/Platform/Mac/Core/MvxFormsApplicationDelegate.cs b/MvvmCross.Forms/Platform/Mac/Core/MvxFormsApplicationDelegate.cs
@@ -4,7 +4,7 @@
 
 using System;
 using MvvmCross.Core;
-using MvvmCross.Forms.Views;
+using MvvmCross.Forms.Presenters;
 using MvvmCross.Platform.Mac.Core;
 using Xamarin.Forms.Platform.MacOS;
 

diff --git a/MvvmCross.Forms/Platform/Mac/Core/MvxFormsMacSetup.cs b/MvvmCross.Forms/Platform/Mac/Core/MvxFormsMacSetup.cs
@@ -4,18 +4,18 @@
 
 using MvvmCross.Binding;
 using MvvmCross.Binding.Bindings.Target.Construction;
-using MvvmCross.Forms.Views;
 using MvvmCross.Localization;
 using System.Collections.Generic;
 using System.Reflection;
 using AppKit;
 using MvvmCross.Forms.Core;
 using MvvmCross.Forms.Platform.Mac.Bindings;
-using MvvmCross.Forms.Platform.Mac.Views;
 using MvvmCross.Platform.Mac.Core;
 using MvvmCross.Platform.Mac.Presenters;
 using MvvmCross.Plugins;
 using MvvmCross.ViewModels;
+using MvvmCross.Forms.Platform.Mac.Presenters;
+using MvvmCross.Forms.Presenters;
 
 namespace MvvmCross.Forms.Platform.Mac.Core
 {

diff --git a/...orm/Mac/Views/MvxFormsMacViewPresenter.cs → ...ac/Presenters/MvxFormsMacViewPresenter.cs b/...orm/Mac/Views/MvxFormsMacViewPresenter.cs → ...ac/Presenters/MvxFormsMacViewPresenter.cs
@@ -5,12 +5,12 @@
 using System;
 using AppKit;
 using MvvmCross.Forms.Core;
-using MvvmCross.Forms.Views;
+using MvvmCross.Forms.Presenters;
 using MvvmCross.Logging;
 using MvvmCross.Platform.Mac.Presenters;
 using MvvmCross.ViewModels;
 
-namespace MvvmCross.Forms.Platform.Mac.Views
+namespace MvvmCross.Forms.Platform.Mac.Presenters
 {
     public class MvxFormsMacViewPresenter
         : MvxMacViewPresenter

diff --git a/MvvmCross.Forms/Platform/Uap/Core/MvxFormsWindowsSetup.cs b/MvvmCross.Forms/Platform/Uap/Core/MvxFormsWindowsSetup.cs
@@ -4,13 +4,13 @@
 
 using MvvmCross.Binding;
 using MvvmCross.Binding.Bindings.Target.Construction;
-using MvvmCross.Forms.Views;
+using MvvmCross.Forms.Presenters;
 using System.Collections.Generic;
 using System.Reflection;
 using Windows.ApplicationModel.Activation;
 using MvvmCross.Forms.Core;
 using MvvmCross.Forms.Platform.Uap.Bindings;
-using MvvmCross.Forms.Platform.Uap.Views;
+using MvvmCross.Forms.Platform.Uap.Presenters;
 using MvvmCross.Platform.Uap.Core;
 using MvvmCross.Platform.Uap.Views;
 using MvvmCross.Plugins;

diff --git a/...orm/Uap/Views/MvxFormsUwpViewPresenter.cs → ...ap/Presenters/MvxFormsUwpViewPresenter.cs b/...orm/Uap/Views/MvxFormsUwpViewPresenter.cs → ...ap/Presenters/MvxFormsUwpViewPresenter.cs
@@ -2,15 +2,15 @@
 // 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.Forms.Views;
+using MvvmCross.Forms.Presenters;
 using System;
 using MvvmCross.Forms.Core;
 using MvvmCross.Logging;
 using MvvmCross.Platform.Uap.Presenters;
 using MvvmCross.Platform.Uap.Views;
 using MvvmCross.ViewModels;
 
-namespace MvvmCross.Forms.Platform.Uap.Views
+namespace MvvmCross.Forms.Platform.Uap.Presenters
 {
     public class MvxFormsUwpViewPresenter
         : MvxWindowsViewPresenter

diff --git a/MvvmCross.Forms/Platform/iOS/Core/MvxFormsApplicationDelegate.cs b/MvvmCross.Forms/Platform/iOS/Core/MvxFormsApplicationDelegate.cs
@@ -5,7 +5,7 @@
 using System;
 using Foundation;
 using MvvmCross.Core;
-using MvvmCross.Forms.Views;
+using MvvmCross.Forms.Presenters;
 using MvvmCross.Platform.Ios.Core;
 using UIKit;
 using Xamarin.Forms.Platform.iOS;

diff --git a/MvvmCross.Forms/Platform/iOS/Core/MvxFormsIosSetup.cs b/MvvmCross.Forms/Platform/iOS/Core/MvxFormsIosSetup.cs
@@ -4,18 +4,18 @@
 
 using MvvmCross.Binding;
 using MvvmCross.Binding.Bindings.Target.Construction;
-using MvvmCross.Forms.Views;
+using MvvmCross.Forms.Presenters;
 using MvvmCross.Localization;
 using System.Collections.Generic;
 using System.Reflection;
 using MvvmCross.Forms.Core;
 using MvvmCross.Forms.Platform.iOS.Bindings;
-using MvvmCross.Forms.Platform.iOS.Views;
 using MvvmCross.Platform.Ios.Core;
 using MvvmCross.Platform.Ios.Presenters;
 using MvvmCross.Plugins;
 using MvvmCross.ViewModels;
 using UIKit;
+using MvvmCross.Forms.Platform.iOS.Presenters;
 
 namespace MvvmCross.Forms.Platform.iOS.Core
 {

diff --git a/...orm/iOS/Views/MvxFormsIosViewPresenter.cs → ...OS/Presenters/MvxFormsIosViewPresenter.cs b/...orm/iOS/Views/MvxFormsIosViewPresenter.cs → ...OS/Presenters/MvxFormsIosViewPresenter.cs
@@ -4,14 +4,14 @@
 
 using System;
 using MvvmCross.Forms.Core;
-using MvvmCross.Forms.Views;
+using MvvmCross.Forms.Presenters;
 using MvvmCross.Logging;
 using MvvmCross.Platform.Ios.Presenters;
 using MvvmCross.ViewModels;
 using UIKit;
 using Xamarin.Forms;
 
-namespace MvvmCross.Forms.Platform.iOS.Views
+namespace MvvmCross.Forms.Platform.iOS.Presenters
 {
     public class MvxFormsIosViewPresenter
         : MvxIosViewPresenter

diff --git a/...s/MvxCarouselPagePresentationAttribute.cs → ...s/MvxCarouselPagePresentationAttribute.cs b/...s/MvxCarouselPagePresentationAttribute.cs → ...s/MvxCarouselPagePresentationAttribute.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace MvvmCross.Forms.Views.Attributes
+namespace MvvmCross.Forms.Presenters.Attributes
 {
     [AttributeUsage(AttributeTargets.Class)]
     public class MvxCarouselPagePresentationAttribute : MvxPagePresentationAttribute

diff --git a/...es/MvxContentPagePresentationAttribute.cs → ...es/MvxContentPagePresentationAttribute.cs b/...es/MvxContentPagePresentationAttribute.cs → ...es/MvxContentPagePresentationAttribute.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace MvvmCross.Forms.Views.Attributes
+namespace MvvmCross.Forms.Presenters.Attributes
 {
     [AttributeUsage(AttributeTargets.Class)]
     public class MvxContentPagePresentationAttribute : MvxPagePresentationAttribute
@@ -13,4 +13,4 @@ public MvxContentPagePresentationAttribute()
         {
         }
     }
-}
+}
diff --git a/...xMasterDetailPagePresentationAttribute.cs → ...xMasterDetailPagePresentationAttribute.cs b/...xMasterDetailPagePresentationAttribute.cs → ...xMasterDetailPagePresentationAttribute.cs
@@ -1,10 +1,10 @@
-// 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.
 
 using System;
 
-namespace MvvmCross.Forms.Views.Attributes
+namespace MvvmCross.Forms.Presenters.Attributes
 {
     [AttributeUsage(AttributeTargets.Class)]
     public class MvxMasterDetailPagePresentationAttribute : MvxPagePresentationAttribute
@@ -31,4 +31,4 @@ public enum MasterDetailPosition
         Master,
         Detail
     }
-}
+}
diff --git a/...tributes/MvxModalPresentationAttribute.cs → ...tributes/MvxModalPresentationAttribute.cs b/...tributes/MvxModalPresentationAttribute.cs → ...tributes/MvxModalPresentationAttribute.cs
@@ -1,10 +1,10 @@
-// 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.
 
 using System;
 
-namespace MvvmCross.Forms.Views.Attributes
+namespace MvvmCross.Forms.Presenters.Attributes
 {
     [AttributeUsage(AttributeTargets.Class)]
     public class MvxModalPresentationAttribute : MvxPagePresentationAttribute
@@ -13,4 +13,4 @@ public MvxModalPresentationAttribute()
         {
         }
     }
-}
+}
diff --git a/...MvxNavigationPagePresentationAttribute.cs → ...MvxNavigationPagePresentationAttribute.cs b/...MvxNavigationPagePresentationAttribute.cs → ...MvxNavigationPagePresentationAttribute.cs
@@ -1,10 +1,10 @@
-// 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.
 
 using System;
 
-namespace MvvmCross.Forms.Views.Attributes
+namespace MvvmCross.Forms.Presenters.Attributes
 {
     [AttributeUsage(AttributeTargets.Class)]
     public class MvxNavigationPagePresentationAttribute : MvxPagePresentationAttribute
@@ -13,4 +13,4 @@ public MvxNavigationPagePresentationAttribute()
         {
         }
     }
-}
+}
diff --git a/...ttributes/MvxPagePresentationAttribute.cs → ...ttributes/MvxPagePresentationAttribute.cs b/...ttributes/MvxPagePresentationAttribute.cs → ...ttributes/MvxPagePresentationAttribute.cs
@@ -5,7 +5,7 @@
 using System;
 using MvvmCross.Presenters;
 
-namespace MvvmCross.Forms.Views.Attributes
+namespace MvvmCross.Forms.Presenters.Attributes
 {
     [AttributeUsage(AttributeTargets.Class)]
     public abstract class MvxPagePresentationAttribute : MvxBasePresentationAttribute

diff --git a/...tes/MvxTabbedPagePresentationAttribute.cs → ...tes/MvxTabbedPagePresentationAttribute.cs b/...tes/MvxTabbedPagePresentationAttribute.cs → ...tes/MvxTabbedPagePresentationAttribute.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace MvvmCross.Forms.Views.Attributes
+namespace MvvmCross.Forms.Presenters.Attributes
 {
     [AttributeUsage(AttributeTargets.Class)]
     public class MvxTabbedPagePresentationAttribute : MvxPagePresentationAttribute
@@ -22,4 +22,4 @@ public enum TabbedPosition
         Root,
         Tab
     }
-}
+}
diff --git a/...oss.Forms/Views/IMvxFormsPagePresenter.cs → ...orms/Presenters/IMvxFormsPagePresenter.cs b/...oss.Forms/Views/IMvxFormsPagePresenter.cs → ...orms/Presenters/IMvxFormsPagePresenter.cs
@@ -8,7 +8,7 @@
 using MvvmCross.Presenters;
 using Xamarin.Forms;
 
-namespace MvvmCross.Forms.Views
+namespace MvvmCross.Forms.Presenters
 {
     public interface IMvxFormsPagePresenter : IMvxAttributeViewPresenter
     {

diff --git a/...oss.Forms/Views/IMvxFormsViewPresenter.cs → ...orms/Presenters/IMvxFormsViewPresenter.cs b/...oss.Forms/Views/IMvxFormsViewPresenter.cs → ...orms/Presenters/IMvxFormsViewPresenter.cs
@@ -6,7 +6,7 @@
 using MvvmCross.Forms.Core;
 using MvvmCross.Presenters;
 
-namespace MvvmCross.Forms.Views
+namespace MvvmCross.Forms.Presenters
 {
     public interface IMvxFormsViewPresenter : IMvxAttributeViewPresenter
     {

diff --git a/...ross.Forms/Views/MvxFormsPagePresenter.cs → ...Forms/Presenters/MvxFormsPagePresenter.cs b/...ross.Forms/Views/MvxFormsPagePresenter.cs → ...Forms/Presenters/MvxFormsPagePresenter.cs
@@ -8,14 +8,15 @@
 using System.Threading.Tasks;
 using MvvmCross.Exceptions;
 using MvvmCross.Forms.Core;
-using MvvmCross.Forms.Views.Attributes;
+using MvvmCross.Forms.Presenters.Attributes;
+using MvvmCross.Forms.Views;
 using MvvmCross.Logging;
 using MvvmCross.Presenters;
 using MvvmCross.ViewModels;
 using MvvmCross.ViewModels.Hints;
 using Xamarin.Forms;
 
-namespace MvvmCross.Forms.Views
+namespace MvvmCross.Forms.Presenters
 {
     //Handles common Forms Presenter code
     public class MvxFormsPagePresenter :

diff --git a/.../Views/EventSource/IMvxEventSourceCell.cs → ...s.Forms/Views/Base/IMvxEventSourceCell.cs b/.../Views/EventSource/IMvxEventSourceCell.cs → ...s.Forms/Views/Base/IMvxEventSourceCell.cs
@@ -4,7 +4,7 @@
 
 using System;
 
-namespace MvvmCross.Forms.Views.EventSource
+namespace MvvmCross.Forms.Views.Base
 {
     public interface IMvxEventSourceCell : IMvxEventSourceElement
     {
@@ -14,4 +14,4 @@ public interface IMvxEventSourceCell : IMvxEventSourceElement
 
         event EventHandler TappedCalled;
     }
-}
+}
diff --git a/...ews/EventSource/IMvxEventSourceElement.cs → ...orms/Views/Base/IMvxEventSourceElement.cs b/...ews/EventSource/IMvxEventSourceElement.cs → ...orms/Views/Base/IMvxEventSourceElement.cs
@@ -4,12 +4,12 @@
 
 using System;
 
-namespace MvvmCross.Forms.Views.EventSource
+namespace MvvmCross.Forms.Views.Base
 {
     public interface IMvxEventSourceElement
     {
         event EventHandler BindingContextChangedCalled;
 
         event EventHandler ParentSetCalled;
     }
-}
+}