Update iOS ReactiveView subclasses : add .ctor(CGRect) for Unified api.

Author: Nicolas VERINAUD

ReactiveUI/Cocoa/ReactiveCollectionView.cs

@@ -1,21 +1,22 @@
 using System;
-using ReactiveUI;
-using System.Runtime.Serialization;
+using System.Collections.Generic;
 using System.ComponentModel;
-using System.Reflection;
+using System.Diagnostics.Contracts;
+using System.Drawing;
+using System.Linq;
 using System.Reactive;
-using System.Reactive.Subjects;
 using System.Reactive.Concurrency;
-using System.Linq;
-using System.Threading;
 using System.Reactive.Disposables;
-using System.Diagnostics.Contracts;
+using System.Reactive.Subjects;
+using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Collections.Generic;
-using System.Drawing;
+using System.Runtime.Serialization;
+using System.Threading;
+using ReactiveUI;
 using Splat;
 
 #if UNIFIED
+using CoreGraphics;
 using Foundation;
 using UIKit;
 #else
@@ -28,7 +29,12 @@ namespace ReactiveUI
     public abstract class ReactiveCollectionView : UICollectionView, 
         IReactiveNotifyPropertyChanged<ReactiveCollectionView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation
     {
+#if UNIFIED
+        protected ReactiveCollectionView(CGRect frame, UICollectionViewLayout layout) : base(frame, layout) { setupRxObj(); }
+#else
         protected ReactiveCollectionView(RectangleF frame, UICollectionViewLayout layout) : base(frame, layout) { setupRxObj(); }
+#endif
+
         protected ReactiveCollectionView(IntPtr handle) : base(handle) { setupRxObj(); }
         protected ReactiveCollectionView(NSObjectFlag t) : base(t) { setupRxObj(); }
         protected ReactiveCollectionView(NSCoder coder) : base(coder) { setupRxObj(); }

ReactiveUI/Cocoa/ReactiveCollectionViewCell.cs

@@ -1,21 +1,22 @@
 using System;
-using System.Drawing;
-using ReactiveUI;
-using System.Runtime.Serialization;
+using System.Collections.Generic;
 using System.ComponentModel;
-using System.Reflection;
-using System.Reactive.Subjects;
-using System.Reactive.Concurrency;
-using System.Reactive;
+using System.Diagnostics.Contracts;
+using System.Drawing;
 using System.Linq;
-using System.Threading;
+using System.Reactive;
+using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
-using System.Diagnostics.Contracts;
+using System.Reactive.Subjects;
+using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Threading;
+using ReactiveUI;
 using Splat;
 
 #if UNIFIED
+using CoreGraphics;
 using Foundation;
 using UIKit;
 #else
@@ -27,11 +28,17 @@ namespace ReactiveUI
 {
     public abstract class ReactiveCollectionViewCell : UICollectionViewCell, IReactiveNotifyPropertyChanged<ReactiveCollectionViewCell>, IHandleObservableErrors, IReactiveObject, ICanActivate
     {
-        public ReactiveCollectionViewCell(IntPtr handle) : base (handle) { setupRxObj(); }
+#if UNIFIED
+        public ReactiveCollectionViewCell(CGRect frame) : base (frame) { setupRxObj(); }
+#else
+        public ReactiveCollectionViewCell(RectangleF frame) : base (frame) { setupRxObj(); }
+#endif
+
         public ReactiveCollectionViewCell(NSObjectFlag t) : base (t) { setupRxObj(); }
         public ReactiveCollectionViewCell(NSCoder coder) : base (NSObjectFlag.Empty) { setupRxObj(); }
         public ReactiveCollectionViewCell() : base() { setupRxObj(); }
-        public ReactiveCollectionViewCell(RectangleF frame) : base (frame) { setupRxObj(); }
+
+        protected ReactiveCollectionViewCell(IntPtr handle) : base (handle) { setupRxObj(); }
 
         public event PropertyChangingEventHandler PropertyChanging {
             add { PropertyChangingEventManager.AddHandler(this, value); }

ReactiveUI/Cocoa/ReactiveImageView.cs

@@ -1,25 +1,26 @@
 using System;
-using ReactiveUI;
-using System.Runtime.Serialization;
+using System.Collections.Generic;
 using System.ComponentModel;
-using System.Reflection;
-using System.Reactive.Subjects;
-using System.Reactive.Concurrency;
+using System.Diagnostics.Contracts;
+using System.Drawing;
 using System.Linq;
-using System.Threading;
+using System.Reactive;
+using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
-using System.Diagnostics.Contracts;
+using System.Reactive.Subjects;
+using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Collections.Generic;
-using System.Drawing;
+using System.Runtime.Serialization;
+using System.Threading;
+using ReactiveUI;
 using Splat;
-using System.Reactive;
 
 #if UNIFIED
+using CoreGraphics;
 using Foundation;
 using UIKit;
-using NSImageView = UIKit.UIImageView;
 using NSImage = UIKit.UIImage;
+using NSImageView = UIKit.UIImageView;
 using NSView = UIKit.UIView;
 #elif UIKIT
 using MonoTouch.Foundation;
@@ -36,8 +37,12 @@ namespace ReactiveUI
 {
     public abstract class ReactiveImageView : NSImageView, IReactiveNotifyPropertyChanged<ReactiveImageView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation
     {
+#if UNIFIED
+        public ReactiveImageView(CGRect frame) : base(frame) { }
+#else
         public ReactiveImageView(RectangleF frame) : base(frame) { }
-        public ReactiveImageView(IntPtr handle) : base(handle) { }
+#endif
+
         public ReactiveImageView() { }
 
 #if UIKIT
@@ -47,6 +52,8 @@ public ReactiveImageView(NSImage image, NSImage highlightedImage) : base(image,
         public ReactiveImageView(NSCoder coder) : base(coder) { }
 #endif
 
+        protected ReactiveImageView(IntPtr handle) : base(handle) { }
+
         public event PropertyChangingEventHandler PropertyChanging {
             add { PropertyChangingEventManager.AddHandler(this, value); }
             remove { PropertyChangingEventManager.RemoveHandler(this, value); }

ReactiveUI/Cocoa/ReactiveTableView.cs

@@ -1,21 +1,22 @@
 using System;
-using ReactiveUI;
-using System.Runtime.Serialization;
+using System.Collections.Generic;
 using System.ComponentModel;
-using System.Reflection;
-using System.Reactive.Subjects;
-using System.Reactive.Concurrency;
+using System.Diagnostics.Contracts;
+using System.Drawing;
 using System.Linq;
-using System.Threading;
+using System.Reactive;
+using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
-using System.Diagnostics.Contracts;
+using System.Reactive.Subjects;
+using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Collections.Generic;
-using System.Drawing;
+using System.Runtime.Serialization;
+using System.Threading;
+using ReactiveUI;
 using Splat;
-using System.Reactive;
 
 #if UNIFIED
+using CoreGraphics;
 using Foundation;
 using UIKit;
 #else
@@ -27,14 +28,20 @@ namespace ReactiveUI
 {
     public abstract class ReactiveTableView : UITableView, IReactiveNotifyPropertyChanged<ReactiveTableView>, IHandleObservableErrors, IReactiveObject, ICanActivate, ICanForceManualActivation
     {
+#if UNIFIED
+        public ReactiveTableView(CGRect frame) : base(frame) { }
+        public ReactiveTableView(CGRect frame, UITableViewStyle style) : base(frame, style) { }
+#else
         public ReactiveTableView(RectangleF frame) : base(frame) { }
-        public ReactiveTableView(IntPtr handle) : base(handle) { }
         public ReactiveTableView(RectangleF frame, UITableViewStyle style) : base(frame, style) { }
+#endif
 
         public ReactiveTableView(NSObjectFlag t) : base(t) { }
         public ReactiveTableView(NSCoder coder) : base(coder) { }
         public ReactiveTableView() { }
 
+        protected ReactiveTableView(IntPtr handle) : base(handle) { }
+
         public event PropertyChangingEventHandler PropertyChanging {
             add { PropertyChangingEventManager.AddHandler(this, value); }
             remove { PropertyChangingEventManager.RemoveHandler(this, value); }

ReactiveUI/Cocoa/ReactiveTableViewCell.cs

@@ -1,21 +1,22 @@
 using System;
-using System.Drawing;
-using ReactiveUI;
-using System.Runtime.Serialization;
+using System.Collections.Generic;
 using System.ComponentModel;
-using System.Reflection;
-using System.Reactive.Subjects;
-using System.Reactive.Concurrency;
+using System.Diagnostics.Contracts;
+using System.Drawing;
 using System.Linq;
-using System.Threading;
+using System.Reactive;
+using System.Reactive.Concurrency;
 using System.Reactive.Disposables;
-using System.Diagnostics.Contracts;
+using System.Reactive.Subjects;
+using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Threading;
+using ReactiveUI;
 using Splat;
-using System.Reactive;
 
 #if UNIFIED
+using CoreGraphics;
 using Foundation;
 using UIKit;
 #else
@@ -27,13 +28,18 @@ namespace ReactiveUI
 {
     public abstract class ReactiveTableViewCell : UITableViewCell, IReactiveNotifyPropertyChanged<ReactiveTableViewCell>, IHandleObservableErrors, IReactiveObject, ICanActivate
     {
-        public ReactiveTableViewCell(IntPtr handle) : base (handle) { setupRxObj(); }
+#if UNIFIED
+        public ReactiveTableViewCell(CGRect frame) : base (frame) { setupRxObj(); }
+#else
+        public ReactiveTableViewCell(RectangleF frame) : base (frame) { setupRxObj(); }
+#endif
+
         public ReactiveTableViewCell(NSObjectFlag t) : base (t) { setupRxObj(); }
         public ReactiveTableViewCell(NSCoder coder) : base (NSObjectFlag.Empty) { setupRxObj(); }
         public ReactiveTableViewCell() : base() { setupRxObj(); }
         public ReactiveTableViewCell(UITableViewCellStyle style, string reuseIdentifier) : base(style, reuseIdentifier) { setupRxObj(); }
         public ReactiveTableViewCell(UITableViewCellStyle style, NSString reuseIdentifier) : base(style, reuseIdentifier) { setupRxObj(); }
-        public ReactiveTableViewCell(RectangleF frame) : base (frame) { setupRxObj(); }
+        protected ReactiveTableViewCell(IntPtr handle) : base (handle) { setupRxObj(); }
 
         public event PropertyChangingEventHandler PropertyChanging {
             add { PropertyChangingEventManager.AddHandler(this, value); }