Merge remote-tracking branch 'origin/pr/797'

reactiveui · Feb 8, 2015 · ff6e317 · ff6e317
2 parents 1e70b76 + 7a71ce2
commit ff6e317
Show file tree

Hide file tree

Showing 50 changed files with 284 additions and 121 deletions.
diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 
 [assembly: AssemblyVersion("6.3.1")]
 [assembly: AssemblyFileVersion("6.3.1")]
diff --git a/ReactiveUI.Tests/ReactiveUI.Tests_Android.csproj b/ReactiveUI.Tests/ReactiveUI.Tests_Android.csproj
@@ -142,7 +142,4 @@
       <Name>ReactiveUI_Android</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Android\" />
-  </ItemGroup>
 </Project>
diff --git a/ReactiveUI/AutoPersistHelper.cs b/ReactiveUI/AutoPersistHelper.cs
@@ -1,4 +1,4 @@
-using ReactiveUI;
+using ReactiveUI;
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;

diff --git a/ReactiveUI/BindingTypeConverters.cs b/ReactiveUI/BindingTypeConverters.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Reflection;

diff --git a/ReactiveUI/Cocoa/AppKitAutoSuspendHelper.cs b/ReactiveUI/Cocoa/AppKitAutoSuspendHelper.cs
@@ -1,13 +1,19 @@
-using System;
+using System;
 using System.Reactive;
 using System.Reactive.Concurrency;
 using System.Reactive.Subjects;
 using System.Reactive.Linq;
-using MonoMac.Foundation;
-using MonoMac.AppKit;
 using System.Reactive.Disposables;
 using Splat;
 
+#if UNIFIED
+using AppKit;
+using Foundation;
+#else
+using MonoMac.AppKit;
+using MonoMac.Foundation;
+#endif
+
 namespace ReactiveUI
 {
     public class AutoSuspendHelper : IEnableLogger

diff --git a/ReactiveUI/Cocoa/AutoLayoutViewModelViewHost.cs b/ReactiveUI/Cocoa/AutoLayoutViewModelViewHost.cs
@@ -1,5 +1,7 @@
-#if UNIFIED && UIKIT
+#if UNIFIED && UIKIT
 using NSView = UIKit.UIView;
+#elif UNIFIED && COCOA
+using AppKit;
 #elif UIKIT
 using NSView = MonoTouch.UIKit.UIView;
 #else

diff --git a/ReactiveUI/Cocoa/CocoaDefaultPropertyBinding.cs b/ReactiveUI/Cocoa/CocoaDefaultPropertyBinding.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Linq;
 
-#if UNIFIED
+#if UNIFIED && UIKIT
 using UIKit;
+#elif UNIFIED && COCOA
+using AppKit;
 #elif UIKIT
 using MonoTouch.UIKit;
 #else

diff --git a/ReactiveUI/Cocoa/KVOObservableForProperty.cs b/ReactiveUI/Cocoa/KVOObservableForProperty.cs
@@ -1,22 +1,22 @@
 using System;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Reflection;
-using ReactiveUI;
 using System.Runtime.InteropServices;
+using ReactiveUI;
 using Splat;
 
-#if UNIFIED
-using Foundation;
+#if UNIFIED && UIKIT
 using UIKit;
+using Foundation;
+#elif UNIFIED && COCOA
+using Foundation;
 #elif UIKIT
 using MonoTouch.UIKit;
 using MonoTouch.Foundation;
 #else
-using MonoMac.AppKit;
 using MonoMac.Foundation;
 #endif
 

diff --git a/ReactiveUI/Cocoa/NSRunloopScheduler.cs b/ReactiveUI/Cocoa/NSRunloopScheduler.cs
@@ -1,21 +1,16 @@
 using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Reactive;
 using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
 
 #if UNIFIED
-using UIKit;
-using Foundation;
 using CoreFoundation;
+using Foundation;
 using NSAction = System.Action;
 #elif UIKIT
 using MonoTouch.UIKit;
 using MonoTouch.Foundation;
 using MonoTouch.CoreFoundation;
 #else
-using MonoMac.AppKit;
 using MonoMac.Foundation;
 using MonoMac.CoreFoundation;
 #endif

diff --git a/ReactiveUI/Cocoa/PlatformOperations.cs b/ReactiveUI/Cocoa/PlatformOperations.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace ReactiveUI
 {
     /// <summary>
@@ -9,7 +7,7 @@ public class PlatformOperations : IPlatformOperations
     {
         public string GetOrientation()
         {
-#if UNIFIED
+#if UNIFIED && UIKIT
             return UIKit.UIDevice.CurrentDevice.Orientation.ToString();
 #elif UIKIT
             return MonoTouch.UIKit.UIDevice.CurrentDevice.Orientation.ToString();
@@ -19,4 +17,3 @@ public string GetOrientation()
         }
     }
 }
-
diff --git a/ReactiveUI/Cocoa/ReactiveControl.cs b/ReactiveUI/Cocoa/ReactiveControl.cs
@@ -1,23 +1,30 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Drawing;
 using System.Reactive;
 using System.Reactive.Concurrency;
 using System.Reactive.Subjects;
 
 #if UNIFIED
-using CoreGraphics;
 using Foundation;
-using UIKit;
+using CoreGraphics;
 #elif UIKIT
 using MonoTouch.Foundation;
 using MonoTouch.UIKit;
 #else
-using MonoMac.Foundation;
 using MonoMac.AppKit;
+using MonoMac.Foundation;
 using UIControl = MonoMac.AppKit.NSControl;
 #endif
 
+#if UNIFIED && UIKIT
+using UIKit;
+#elif UNIFIED && COCOA
+using AppKit;
+using UIControl = AppKit.NSControl;
+#endif
+
+
 namespace ReactiveUI
 {
     public class ReactiveControl : UIControl, IReactiveNotifyPropertyChanged<ReactiveControl>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation

diff --git a/ReactiveUI/Cocoa/ReactiveImageView.cs b/ReactiveUI/Cocoa/ReactiveImageView.cs
@@ -1,27 +1,14 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics.Contracts;
 using System.Drawing;
-using System.Linq;
 using System.Reactive;
 using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
 using System.Reactive.Subjects;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
-using System.Threading;
 using ReactiveUI;
-using Splat;
 
 #if UNIFIED
 using CoreGraphics;
 using Foundation;
-using UIKit;
-using NSImage = UIKit.UIImage;
-using NSImageView = UIKit.UIImageView;
-using NSView = UIKit.UIView;
 #elif UIKIT
 using MonoTouch.Foundation;
 using MonoTouch.UIKit;
@@ -32,6 +19,15 @@
 using MonoMac.AppKit;
 #endif
 
+#if UNIFIED && UIKIT
+using UIKit;
+using NSImage = UIKit.UIImage;
+using NSImageView = UIKit.UIImageView;
+using NSView = UIKit.UIView;
+#elif UNIFIED && COCOA
+using AppKit;
+#endif
+
 
 namespace ReactiveUI
 {
@@ -121,4 +117,3 @@ void ICanForceManualActivation.Activate(bool activate)
         }
     }
 }
-
diff --git a/ReactiveUI/Cocoa/ReactiveNSView.cs b/ReactiveUI/Cocoa/ReactiveNSView.cs
@@ -1,24 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics.Contracts;
 using System.Drawing;
-using System.Linq;
 using System.Reactive;
 using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
 using System.Reactive.Subjects;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.Serialization;
-using System.Threading;
-using Splat;
 
 #if UNIFIED
 using CoreGraphics;
 using Foundation;
-using NSView = UIKit.UIView;
-using UIKit;
 #elif UIKIT
 using MonoTouch.Foundation;
 using MonoTouch.UIKit;
@@ -28,6 +17,13 @@
 using MonoMac.Foundation;
 #endif
 
+#if UNIFIED && UIKIT
+using NSView = UIKit.UIView;
+using UIKit;
+#elif UNIFIED && COCOA
+using AppKit;
+#endif
+
 namespace ReactiveUI
 {
     /// <summary>

diff --git a/ReactiveUI/Cocoa/ReactiveNSViewController.cs b/ReactiveUI/Cocoa/ReactiveNSViewController.cs
@@ -1,32 +1,28 @@
 using System;
-using System.Drawing;
-using System.Runtime.Serialization;
-using System.Reactive.Subjects;
-using System.Reactive.Concurrency;
-using System.Reflection;
 using System.ComponentModel;
-using System.Linq;
-using System.Threading;
-using System.Reactive.Disposables;
-using System.Diagnostics.Contracts;
-using System.Runtime.CompilerServices;
-using System.Collections.Generic;
-using Splat;
 using System.Reactive;
+using System.Reactive.Subjects;
 
 #if UNIFIED
-using UIKit;
 using Foundation;
-using NSViewController = UIKit.UIViewController;
 #elif UIKIT
 using MonoTouch.UIKit;
 using MonoTouch.Foundation;
 using NSViewController = MonoTouch.UIKit.UIViewController;
+using NSView = MonoTouch.UIKit.UIView;
 #else
 using MonoMac.AppKit;
 using MonoMac.Foundation;
 #endif
 
+#if UNIFIED && UIKIT
+using UIKit;
+using NSViewController = UIKit.UIViewController;
+using NSView = UIKit.UIView;
+#elif UNIFIED && COCOA
+using AppKit;
+#endif
+
 namespace ReactiveUI
 {
     /// <summary>
@@ -134,12 +130,12 @@ public override void ViewDidDisappear(bool animated)
 #if UIKIT || UNIFIED
     static class UIViewControllerMixins 
     {
-        internal static void ActivateSubviews(this UIViewController This, bool activate) 
+        internal static void ActivateSubviews(this NSViewController This, bool activate) 
         {
             This.View.ActivateSubviews(activate);
         }
 
-        static void ActivateSubviews(this UIView This, bool activate) 
+        static void ActivateSubviews(this NSView This, bool activate) 
         {
             foreach (var view in This.Subviews) {
                 var subview = view as ICanForceManualActivation;

diff --git a/ReactiveUI/Cocoa/ReactiveNSWindowController.cs b/ReactiveUI/Cocoa/ReactiveNSWindowController.cs
@@ -1,10 +1,16 @@
-using System;
-using MonoMac.AppKit;
-using MonoMac.Foundation;
+using System;
 using System.ComponentModel;
 using System.Reactive.Subjects;
 using System.Reactive;
 
+#if UNIFIED
+using AppKit;
+using Foundation;
+#else
+using MonoMac.AppKit;
+using MonoMac.Foundation;
+#endif
+
 namespace ReactiveUI
 {
     public class ReactiveWindowController : NSWindowController, IReactiveNotifyPropertyChanged<ReactiveWindowController>, IHandleObservableErrors, IReactiveObject, ICanActivate

diff --git a/ReactiveUI/Cocoa/RoutedViewHost.cs b/ReactiveUI/Cocoa/RoutedViewHost.cs
@@ -1,16 +1,15 @@
 using System;
-using ReactiveUI;
-using System.Linq;
 using System.Reactive.Linq;
+using ReactiveUI;
 
-#if UNIFIED
+#if UNIFIED && UIKIT
 using UIKit;
-
 using NSView = UIKit.UIView;
 using NSViewController = UIKit.UIViewController;
+#elif UNIFIED && COCOA
+using AppKit;
 #elif UIKIT
 using MonoTouch.UIKit;
-
 using NSView = MonoTouch.UIKit.UIView;
 using NSViewController = MonoTouch.UIKit.UIViewController;
 #else

diff --git a/ReactiveUI/Cocoa/TargetActionCommandBinder.cs b/ReactiveUI/Cocoa/TargetActionCommandBinder.cs
@@ -1,16 +1,14 @@
 using System;
 using System.Linq;
-using System.Linq.Expressions;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using System.Reflection;
 using System.Windows.Input;
 using ReactiveUI;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
 
 #if UNIFIED
 using Foundation;
 using ObjCRuntime;
-using UIKit;
 #elif UIKIT
 using MonoTouch.Foundation;
 using MonoTouch.ObjCRuntime;
@@ -21,6 +19,12 @@
 using MonoMac.ObjCRuntime;
 #endif
 
+#if UNIFIED && UIKIT
+using UIKit;
+#elif UNIFIED && COCOA
+using AppKit;
+#endif
+
 namespace ReactiveUI
 {
     /// <summary>