summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Platform.iOS/Renderers
diff options
context:
space:
mode:
authorRui Marinho <me@ruimarinho.net>2016-09-14 22:56:17 +0100
committerGitHub <noreply@github.com>2016-09-14 22:56:17 +0100
commiteb79ff842e701ca4d2c9e1c9d02f654fd2c0f058 (patch)
treef19a733800ada7f18584a35e2f2c8c01dca9245e /Xamarin.Forms.Platform.iOS/Renderers
parente6a2bed3b2a532aa2f937fc6a2957458f4680ef9 (diff)
downloadxamarin-forms-eb79ff842e701ca4d2c9e1c9d02f654fd2c0f058.tar.gz
xamarin-forms-eb79ff842e701ca4d2c9e1c9d02f654fd2c0f058.tar.bz2
xamarin-forms-eb79ff842e701ca4d2c9e1c9d02f654fd2c0f058.zip
Remove iOS classic from CI system (#353)beta-2.3.3-pre2
* [CI] Remove classic from build * [Build] Remove classic forwarder * [Nuget] Remove classic from Pages azure * [Build] Remove classic csproj * [IOS] Remove _UNIFIED_
Diffstat (limited to 'Xamarin.Forms.Platform.iOS/Renderers')
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs7
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/AlignmentExtensions.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/BoxRenderer.cs16
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs14
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/CarouselPageRenderer.cs16
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/DatePickerRenderer.cs17
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs14
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs9
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs6
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs6
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs23
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/KeyboardInsetTracker.cs15
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/KeyboardObserver.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs15
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs18
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/NavigationMenuRenderer.cs19
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs26
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/OpenGLViewRenderer.cs17
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs6
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/PhoneMasterDetailRenderer.cs16
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/PickerRenderer.cs14
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/ProgressBarRenderer.cs14
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs12
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs7
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/SliderRenderer.cs14
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/StepperRenderer.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/SwitchRenderer.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/TabbedRenderer.cs21
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs19
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs9
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs5
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/TimePickerRenderer.cs17
-rw-r--r--Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs12
34 files changed, 31 insertions, 398 deletions
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs
index 0ef8741f..abd8f24f 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs
@@ -1,12 +1,7 @@
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
+using System.Drawing;
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class ActivityIndicatorRenderer : ViewRenderer<ActivityIndicator, UIActivityIndicatorView>
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/AlignmentExtensions.cs b/Xamarin.Forms.Platform.iOS/Renderers/AlignmentExtensions.cs
index 01d0bf66..e6ae550f 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/AlignmentExtensions.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/AlignmentExtensions.cs
@@ -1,10 +1,5 @@
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
internal static class AlignmentExtensions
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/BoxRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/BoxRenderer.cs
index 20e9c38b..466773b5 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/BoxRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/BoxRenderer.cs
@@ -1,23 +1,7 @@
using System.ComponentModel;
-using System.Drawing;
-using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
-#if __UNIFIED__
using UIKit;
-using CoreGraphics;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.CoreGraphics;
-#endif
-#if __UNIFIED__
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs
index 34609b49..ac972230 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs
@@ -1,22 +1,10 @@
using System;
-using System.Linq;
using System.ComponentModel;
using System.Diagnostics;
-
-#if __UNIFIED__
+using System.Linq;
using Foundation;
using UIKit;
-using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-#else
-using System.Drawing;
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/CarouselPageRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/CarouselPageRenderer.cs
index 49921313..58587e83 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/CarouselPageRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/CarouselPageRenderer.cs
@@ -2,23 +2,11 @@ using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
-using System.Drawing;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
+using Xamarin.Forms.Internals;
+using PointF = CoreGraphics.CGPoint;
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat = System.Single;
-using nint = System.Int32;
-using nuint = System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/DatePickerRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/DatePickerRenderer.cs
index d4ba00e7..710aa364 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/DatePickerRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/DatePickerRenderer.cs
@@ -1,23 +1,8 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
-using UIKit;
using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
-#if __UNIFIED__
+using UIKit;
using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs
index 939a9841..49126dad 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs
@@ -1,21 +1,7 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs
index f946de89..2e37a95b 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs
@@ -1,13 +1,8 @@
using System;
-using System.Drawing;
-using System.Runtime.Remoting.Channels;
using System.ComponentModel;
-#if __UNIFIED__
-using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
+using System.Drawing;
+using UIKit;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs b/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs
index c2e565d9..ae16c662 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/FontExtensions.cs
@@ -1,14 +1,8 @@
-using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public static class FontExtensions
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs b/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs
index 4bb829b5..dce86b98 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs
@@ -1,12 +1,6 @@
-#if __UNIFIED__
using Foundation;
using UIKit;
-#else
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public static class FormattedStringExtensions
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs
index 3f2f1ccb..3d2213f4 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs
@@ -1,12 +1,7 @@
using System.ComponentModel;
using System.Drawing;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class FrameRenderer : VisualElementRenderer<Frame>
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs
index a08365e8..6f6392b1 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs
@@ -1,26 +1,11 @@
-using System.Drawing;
+using System;
using System.ComponentModel;
using System.IO;
-using System.Threading.Tasks;
using System.Threading;
-using System;
-#if __UNIFIED__
-using UIKit;
+using System.Threading.Tasks;
using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
-#if __UNIFIED__
+using UIKit;
using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
@@ -180,7 +165,7 @@ namespace Xamarin.Forms.Platform.iOS
{
public async Task<UIImage> LoadImageAsync(ImageSource imagesource, CancellationToken cancelationToken = default(CancellationToken), float scale = 1f)
{
- UIImage image = null;
+ UIImage image = null;
var streamsource = imagesource as StreamImageSource;
if (streamsource != null && streamsource.Stream != null)
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/KeyboardInsetTracker.cs b/Xamarin.Forms.Platform.iOS/Renderers/KeyboardInsetTracker.cs
index d5759947..95217672 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/KeyboardInsetTracker.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/KeyboardInsetTracker.cs
@@ -1,20 +1,7 @@
using System;
-using System.Drawing;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
+using RectangleF = CoreGraphics.CGRect;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/KeyboardObserver.cs b/Xamarin.Forms.Platform.iOS/Renderers/KeyboardObserver.cs
index 4ebb75d7..987858bc 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/KeyboardObserver.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/KeyboardObserver.cs
@@ -1,11 +1,6 @@
using System;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
internal static class KeyboardObserver
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
index f886cb35..0a9ef79a 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
@@ -1,23 +1,8 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-using CoreText;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.CoreText;
-#endif
-#if __UNIFIED__
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs
index d0dacbd4..07025c70 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs
@@ -3,26 +3,12 @@ using System.Collections;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
-using System.Drawing;
using System.Linq;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
-using UIKit;
using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
-#if __UNIFIED__
+using UIKit;
+using Xamarin.Forms.Internals;
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/NavigationMenuRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/NavigationMenuRenderer.cs
index aa9b5ff3..2ea8a008 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/NavigationMenuRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/NavigationMenuRenderer.cs
@@ -1,23 +1,9 @@
using System;
-using System.Drawing;
using System.Linq;
-#if __UNIFIED__
-using UIKit;
using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
-#if __UNIFIED__
+using UIKit;
using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
@@ -41,7 +27,8 @@ namespace Xamarin.Forms.Platform.iOS
SectionInset = new UIEdgeInsets(margin, margin, bottomMargin, margin),
MinimumInteritemSpacing = margin,
MinimumLineSpacing = margin
- }) { DataSource = new DataSource((NavigationMenu)Element), BackgroundColor = UIColor.White };
+ })
+ { DataSource = new DataSource((NavigationMenu)Element), BackgroundColor = UIColor.White };
using (var navigationCellId = new NSString("NavigationCell"))
_collectionView.RegisterClassForCell(typeof(NavigationCell), navigationCellId);
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs
index c4186880..654fc8ed 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs
@@ -1,30 +1,14 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
-using System.Diagnostics;
-using System.Drawing;
using System.Linq;
-using System.Threading;
using System.Threading.Tasks;
+using CoreGraphics;
+using UIKit;
using Xamarin.Forms.Internals;
using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
-#if __UNIFIED__
-using UIKit;
-using CoreGraphics;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.CoreGraphics;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat = System.Single;
-using nint = System.Int32;
-using nuint = System.UInt32;
-#endif
+using RectangleF = CoreGraphics.CGRect;
namespace Xamarin.Forms.Platform.iOS
{
@@ -309,11 +293,7 @@ namespace Xamarin.Forms.Platform.iOS
var task = GetAppearedOrDisappearedTask(page);
UIViewController poppedViewController;
-#if __UNIFIED__
poppedViewController = base.PopViewController(animated);
-#else
- poppedViewController = base.PopViewControllerAnimated (animated);
-#endif
if (poppedViewController == null)
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/OpenGLViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/OpenGLViewRenderer.cs
index 84c67744..58c172cf 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/OpenGLViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/OpenGLViewRenderer.cs
@@ -1,27 +1,10 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
using GLKit;
using OpenGLES;
using Foundation;
using CoreAnimation;
-#else
-using MonoTouch.GLKit;
-using MonoTouch.OpenGLES;
-using MonoTouch.Foundation;
-using MonoTouch.CoreAnimation;
-#endif
-#if __UNIFIED__
using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs
index ff286537..94caef04 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs
@@ -1,14 +1,8 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class PageRenderer : UIViewController, IVisualElementRenderer, IEffectControlProvider
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/PhoneMasterDetailRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/PhoneMasterDetailRenderer.cs
index 55ed9610..17c08e75 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/PhoneMasterDetailRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/PhoneMasterDetailRenderer.cs
@@ -1,23 +1,9 @@
using System;
-using System.Linq;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
+using System.Linq;
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
using PointF = CoreGraphics.CGPoint;
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class PhoneMasterDetailRenderer : UIViewController, IVisualElementRenderer, IEffectControlProvider
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/PickerRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/PickerRenderer.cs
index 069fc026..d0cc4ece 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/PickerRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/PickerRenderer.cs
@@ -1,21 +1,7 @@
using System;
using System.ComponentModel;
-using System.Drawing;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ProgressBarRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ProgressBarRenderer.cs
index 37091720..234f8128 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ProgressBarRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ProgressBarRenderer.cs
@@ -1,20 +1,6 @@
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs
index 1e8ea1fc..b2107db7 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs
@@ -1,21 +1,9 @@
using System;
using System.ComponentModel;
-using System.Drawing;
-#if __UNIFIED__
using UIKit;
-using Foundation;
-using ObjCRuntime;
using PointF = CoreGraphics.CGPoint;
using RectangleF = CoreGraphics.CGRect;
-#else
-using MonoTouch.Foundation;
-using MonoTouch.ObjCRuntime;
-using MonoTouch.UIKit;
-using nfloat=System.Single;
-
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class ScrollViewRenderer : UIScrollView, IVisualElementRenderer
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs
index 90a24376..8c54702f 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs
@@ -1,13 +1,8 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
+using System.Drawing;
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class SearchBarRenderer : ViewRenderer<SearchBar, UISearchBar>
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SliderRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/SliderRenderer.cs
index 2df61f2f..aa01c955 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/SliderRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/SliderRenderer.cs
@@ -1,21 +1,7 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/StepperRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/StepperRenderer.cs
index 0cb0fcb7..9d96399d 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/StepperRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/StepperRenderer.cs
@@ -1,13 +1,8 @@
using System;
using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class StepperRenderer : ViewRenderer<Stepper, UIStepper>
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SwitchRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/SwitchRenderer.cs
index 0bb7fbef..50889b8f 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/SwitchRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/SwitchRenderer.cs
@@ -1,12 +1,7 @@
using System;
using System.Drawing;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class SwitchRenderer : ViewRenderer<Switch, UISwitch>
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TabbedRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/TabbedRenderer.cs
index 695ce2ac..626a61f1 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/TabbedRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/TabbedRenderer.cs
@@ -1,24 +1,9 @@
using System;
+using System.Collections.Generic;
using System.Collections.Specialized;
using System.ComponentModel;
-using System.Linq;
-using System.Collections.Generic;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
+using Xamarin.Forms.Internals;
namespace Xamarin.Forms.Platform.iOS
{
@@ -356,7 +341,7 @@ namespace Xamarin.Forms.Platform.iOS
if (!_defaultBarTextColorSet)
{
- _defaultBarTextColor = TabBar.TintColor;
+ _defaultBarTextColor = TabBar.TintColor;
_defaultBarTextColorSet = true;
}
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs
index cc70a5f1..4a9f694d 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs
@@ -1,24 +1,7 @@
using System;
using System.Collections.Generic;
-using Xamarin.Forms;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
-using UIKit;
using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
-#if __UNIFIED__
-using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
+using UIKit;
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs
index cdfc138f..725ef51f 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs
@@ -1,15 +1,8 @@
-using System;
-using System.ComponentModel;
-using System.Drawing;
using System.Collections.Generic;
-#if __UNIFIED__
+using System.ComponentModel;
using UIKit;
using RectangleF = CoreGraphics.CGRect;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
public class TableViewRenderer : ViewRenderer<TableView, UITableView>
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs
index cb76b765..7b54faf6 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs
@@ -1,12 +1,7 @@
using System;
using System.ComponentModel;
-#if __UNIFIED__
using UIKit;
-#else
-using MonoTouch.UIKit;
-#endif
-
namespace Xamarin.Forms.Platform.iOS
{
internal class ChildViewController : UIViewController
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TimePickerRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/TimePickerRenderer.cs
index c64ce8fb..f2632768 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/TimePickerRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/TimePickerRenderer.cs
@@ -1,23 +1,8 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-#if __UNIFIED__
-using UIKit;
using Foundation;
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
-#if __UNIFIED__
+using UIKit;
using RectangleF = CoreGraphics.CGRect;
-using SizeF = CoreGraphics.CGSize;
-using PointF = CoreGraphics.CGPoint;
-
-#else
-using nfloat=System.Single;
-using nint=System.Int32;
-using nuint=System.UInt32;
-#endif
namespace Xamarin.Forms.Platform.iOS
{
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs
index 11ab72f2..70c9bf60 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs
@@ -1,15 +1,9 @@
using System;
-using System.Drawing;
using System.ComponentModel;
-using Xamarin.Forms.Internals;
-#if __UNIFIED__
-using UIKit;
+using System.Drawing;
using Foundation;
-
-#else
-using MonoTouch.UIKit;
-using MonoTouch.Foundation;
-#endif
+using UIKit;
+using Xamarin.Forms.Internals;
namespace Xamarin.Forms.Platform.iOS
{