diff options
author | Rui Marinho <me@ruimarinho.net> | 2016-09-14 22:56:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-14 22:56:17 +0100 |
commit | eb79ff842e701ca4d2c9e1c9d02f654fd2c0f058 (patch) | |
tree | f19a733800ada7f18584a35e2f2c8c01dca9245e /Xamarin.Forms.Platform.iOS | |
parent | e6a2bed3b2a532aa2f937fc6a2957458f4680ef9 (diff) | |
download | xamarin-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')
74 files changed, 59 insertions, 1068 deletions
diff --git a/Xamarin.Forms.Platform.iOS/CADisplayLinkTicker.cs b/Xamarin.Forms.Platform.iOS/CADisplayLinkTicker.cs index e9102978..8b60b010 100644 --- a/Xamarin.Forms.Platform.iOS/CADisplayLinkTicker.cs +++ b/Xamarin.Forms.Platform.iOS/CADisplayLinkTicker.cs @@ -1,17 +1,10 @@ using System; using System.Collections.Concurrent; using System.Threading; -using Xamarin.Forms.Internals; -#if __UNIFIED__ -using UIKit; using CoreAnimation; using Foundation; - -#else -using MonoTouch.UIKit; -using MonoTouch.CoreAnimation; -using MonoTouch.Foundation; -#endif +using UIKit; +using Xamarin.Forms.Internals; namespace Xamarin.Forms.Platform.iOS { diff --git a/Xamarin.Forms.Platform.iOS/Cells/CellRenderer.cs b/Xamarin.Forms.Platform.iOS/Cells/CellRenderer.cs index 3ec12bd8..ea0e8d3f 100644 --- a/Xamarin.Forms.Platform.iOS/Cells/CellRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Cells/CellRenderer.cs @@ -1,13 +1,6 @@ using System; -using Xamarin.Forms.Internals; -#if __UNIFIED__ using UIKit; -using Foundation; - -#else -using MonoTouch.UIKit; -using MonoTouch.Foundation; -#endif +using Xamarin.Forms.Internals; namespace Xamarin.Forms.Platform.iOS { diff --git a/Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs b/Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs index 39bedf4b..e32e86cd 100644 --- a/Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs +++ b/Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs @@ -1,13 +1,7 @@ using System; using System.ComponentModel; -using Xamarin.Forms.Internals; -#if __UNIFIED__ using UIKit; -#else -using MonoTouch.UIKit; -#endif - namespace Xamarin.Forms.Platform.iOS { public class CellTableViewCell : UITableViewCell, INativeElementView @@ -32,7 +26,7 @@ namespace Xamarin.Forms.Platform.iOS if (cellController != null) Device.BeginInvokeOnMainThread(cellController.SendDisappearing); - + _cell = value; cellController = value; diff --git a/Xamarin.Forms.Platform.iOS/Cells/EntryCellRenderer.cs b/Xamarin.Forms.Platform.iOS/Cells/EntryCellRenderer.cs index e94e0ea5..b00ff9dd 100644 --- a/Xamarin.Forms.Platform.iOS/Cells/EntryCellRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Cells/EntryCellRenderer.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/Cells/ImageCellRenderer.cs b/Xamarin.Forms.Platform.iOS/Cells/ImageCellRenderer.cs index 010319ba..38aae375 100644 --- a/Xamarin.Forms.Platform.iOS/Cells/ImageCellRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Cells/ImageCellRenderer.cs @@ -1,14 +1,7 @@ using System.ComponentModel; using System.Threading.Tasks; -using Xamarin.Forms.Internals; -#if __UNIFIED__ -using UIKit; using Foundation; - -#else -using MonoTouch.UIKit; -using MonoTouch.Foundation; -#endif +using UIKit; namespace Xamarin.Forms.Platform.iOS { diff --git a/Xamarin.Forms.Platform.iOS/Cells/SwitchCellRenderer.cs b/Xamarin.Forms.Platform.iOS/Cells/SwitchCellRenderer.cs index ed7ddc10..d93ec5c1 100644 --- a/Xamarin.Forms.Platform.iOS/Cells/SwitchCellRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Cells/SwitchCellRenderer.cs @@ -1,13 +1,8 @@ using System; using System.ComponentModel; using System.Drawing; -#if __UNIFIED__ using UIKit; -#else -using MonoTouch.UIKit; -#endif - namespace Xamarin.Forms.Platform.iOS { public class SwitchCellRenderer : CellRenderer diff --git a/Xamarin.Forms.Platform.iOS/Cells/TextCellRenderer.cs b/Xamarin.Forms.Platform.iOS/Cells/TextCellRenderer.cs index 41c43341..2f5cfdd1 100644 --- a/Xamarin.Forms.Platform.iOS/Cells/TextCellRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Cells/TextCellRenderer.cs @@ -1,11 +1,6 @@ using System.ComponentModel; -#if __UNIFIED__ using UIKit; -#else -using MonoTouch.UIKit; -#endif - namespace Xamarin.Forms.Platform.iOS { public class TextCellRenderer : CellRenderer diff --git a/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs b/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs index d1cd9399..8f8a92ce 100644 --- a/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs @@ -1,23 +1,8 @@ using System; using System.ComponentModel; -using Xamarin.Forms.Internals; - -#if __UNIFIED__ using UIKit; -#else -using MonoTouch.UIKit; -using System.Drawing; -#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/ContextActionCell.cs b/Xamarin.Forms.Platform.iOS/ContextActionCell.cs index 5d50d31d..bb7bea1a 100644 --- a/Xamarin.Forms.Platform.iOS/ContextActionCell.cs +++ b/Xamarin.Forms.Platform.iOS/ContextActionCell.cs @@ -1,25 +1,13 @@ using System; +using System.Collections.Generic; using System.Collections.Specialized; using System.ComponentModel; -using System.Collections.Generic; -using System.Drawing; -using Xamarin.Forms.Platform.iOS.Resources; -#if __UNIFIED__ -using UIKit; using Foundation; -#else -using MonoTouch.UIKit; -using MonoTouch.Foundation; -#endif -#if __UNIFIED__ +using UIKit; +using Xamarin.Forms.Platform.iOS.Resources; +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; -#endif namespace Xamarin.Forms.Platform.iOS { diff --git a/Xamarin.Forms.Platform.iOS/ContextScrollViewDelegate.cs b/Xamarin.Forms.Platform.iOS/ContextScrollViewDelegate.cs index b2b34e4a..bc04ede2 100644 --- a/Xamarin.Forms.Platform.iOS/ContextScrollViewDelegate.cs +++ b/Xamarin.Forms.Platform.iOS/ContextScrollViewDelegate.cs @@ -1,23 +1,9 @@ using System; -using System.Drawing; using System.Collections.Generic; -#if __UNIFIED__ using UIKit; -using Foundation; -#else -using MonoTouch.UIKit; -using MonoTouch.Foundation; -#endif -#if __UNIFIED__ using NSAction = System.Action; -using RectangleF = CoreGraphics.CGRect; -using SizeF = CoreGraphics.CGSize; using PointF = CoreGraphics.CGPoint; - -#else -using nfloat=System.Single; -using nint=System.Int32; -#endif +using RectangleF = CoreGraphics.CGRect; namespace Xamarin.Forms.Platform.iOS { diff --git a/Xamarin.Forms.Platform.iOS/EventTracker.cs b/Xamarin.Forms.Platform.iOS/EventTracker.cs index 16ccd505..9c6c90e9 100644 --- a/Xamarin.Forms.Platform.iOS/EventTracker.cs +++ b/Xamarin.Forms.Platform.iOS/EventTracker.cs @@ -3,21 +3,7 @@ using System.Collections.Generic; using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; -#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/Extensions/CellExtensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/CellExtensions.cs index 7243456b..80473a8c 100644 --- a/Xamarin.Forms.Platform.iOS/Extensions/CellExtensions.cs +++ b/Xamarin.Forms.Platform.iOS/Extensions/CellExtensions.cs @@ -1,11 +1,6 @@ using System; -using Xamarin.Forms.Internals; -#if __UNIFIED__ using Foundation; - -#else -using MonoTouch.Foundation; -#endif +using Xamarin.Forms.Internals; namespace Xamarin.Forms.Platform.iOS { diff --git a/Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs index f512e157..bb4342ab 100644 --- a/Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs +++ b/Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs @@ -1,28 +1,9 @@ using System; -using System.ComponentModel; -using System.Drawing; -using System.Linq; -#if __UNIFIED__ -using CoreAnimation; using CoreGraphics; -using Foundation; using UIKit; -#else -using MonoTouch.CoreAnimation; -using MonoTouch.CoreGraphics; -using MonoTouch.Foundation; -using MonoTouch.UIKit; -#endif -#if __UNIFIED__ +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/Extensions/DateExtensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/DateExtensions.cs index a75e7a69..bb0dfff9 100644 --- a/Xamarin.Forms.Platform.iOS/Extensions/DateExtensions.cs +++ b/Xamarin.Forms.Platform.iOS/Extensions/DateExtensions.cs @@ -1,20 +1,5 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Linq; -#if __UNIFIED__ -using CoreAnimation; -using CoreGraphics; using Foundation; -using UIKit; - -#else -using MonoTouch.CoreAnimation; -using MonoTouch.CoreGraphics; -using MonoTouch.Foundation; -using MonoTouch.UIKit; -#endif namespace Xamarin.Forms.Platform.iOS { diff --git a/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs index e74fed8d..3b24c1a8 100644 --- a/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs +++ b/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs @@ -1,12 +1,5 @@ -using System; -using System.Collections.Generic; -#if __UNIFIED__ using UIKit; -#else -using MonoTouch.UIKit; -#endif - namespace Xamarin.Forms.Platform.iOS { public static class Extensions diff --git a/Xamarin.Forms.Platform.iOS/Extensions/LayoutExtensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/LayoutExtensions.cs index 6e7f5738..823c3f30 100644 --- a/Xamarin.Forms.Platform.iOS/Extensions/LayoutExtensions.cs +++ b/Xamarin.Forms.Platform.iOS/Extensions/LayoutExtensions.cs @@ -1,17 +1,7 @@ using System.Collections.Generic; -#if __UNIFIED__ using CoreGraphics; using UIKit; -#else -using MonoTouch.UIKit; -#endif - -#if !__UNIFIED__ - // Save ourselves a ton of ugly ifdefs below -using CGSize = System.Drawing.SizeF; -#endif - namespace Xamarin.Forms.Platform.iOS { public delegate SizeRequest? GetDesiredSizeDelegate(NativeViewWrapperRenderer renderer, double widthConstraint, double heightConstraint); diff --git a/Xamarin.Forms.Platform.iOS/Extensions/ToolbarItemExtensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/ToolbarItemExtensions.cs index 3ee09643..295ebd52 100644 --- a/Xamarin.Forms.Platform.iOS/Extensions/ToolbarItemExtensions.cs +++ b/Xamarin.Forms.Platform.iOS/Extensions/ToolbarItemExtensions.cs @@ -1,23 +1,9 @@ -using System; -using System.Drawing; using System.ComponentModel; -#if __UNIFIED__ using CoreGraphics; using UIKit; -#else -using MonoTouch.CoreGraphics; -using MonoTouch.UIKit; -#endif -#if __UNIFIED__ +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/Extensions/UIViewExtensions.cs b/Xamarin.Forms.Platform.iOS/Extensions/UIViewExtensions.cs index 73475b13..eab88e81 100644 --- a/Xamarin.Forms.Platform.iOS/Extensions/UIViewExtensions.cs +++ b/Xamarin.Forms.Platform.iOS/Extensions/UIViewExtensions.cs @@ -1,15 +1,9 @@ +using System; using System.Collections.Generic; using System.Drawing; using System.Linq; -using System; -using static System.String; - -#if __UNIFIED__ using UIKit; - -#else -using MonoTouch.UIKit; -#endif +using static System.String; namespace Xamarin.Forms.Platform.iOS { diff --git a/Xamarin.Forms.Platform.iOS/Forms.cs b/Xamarin.Forms.Platform.iOS/Forms.cs index eb4100d8..820d3c0a 100644 --- a/Xamarin.Forms.Platform.iOS/Forms.cs +++ b/Xamarin.Forms.Platform.iOS/Forms.cs @@ -11,16 +11,10 @@ using System.Security.Cryptography; using System.Text; using System.Threading; using System.Threading.Tasks; -using Xamarin.Forms.Internals; -#if __UNIFIED__ -using UIKit; using CoreFoundation; using Foundation; -#else -using MonoTouch.UIKit; -using MonoTouch.CoreFoundation; -using MonoTouch.Foundation; -#endif +using UIKit; +using Xamarin.Forms.Internals; using Xamarin.Forms.Platform.iOS; namespace Xamarin.Forms @@ -241,18 +235,10 @@ namespace Xamarin.Forms public void StartTimer(TimeSpan interval, Func<bool> callback) { NSTimer timer = null; -#if __UNIFIED__ timer = NSTimer.CreateRepeatingScheduledTimer(interval, t => { -#else - timer = NSTimer.CreateRepeatingScheduledTimer (interval, () => { - #endif if (!callback()) -#if __UNIFIED__ t.Invalidate(); -#else - timer.Invalidate (); - #endif }); NSRunLoop.Main.AddTimer(timer, NSRunLoopMode.Common); } diff --git a/Xamarin.Forms.Platform.iOS/FormsApplicationDelegate.cs b/Xamarin.Forms.Platform.iOS/FormsApplicationDelegate.cs index 78dc6dca..a14bd7e7 100644 --- a/Xamarin.Forms.Platform.iOS/FormsApplicationDelegate.cs +++ b/Xamarin.Forms.Platform.iOS/FormsApplicationDelegate.cs @@ -1,17 +1,8 @@ using System; using System.ComponentModel; -using System.Linq; -using System.Text; -#if __UNIFIED__ +using CoreSpotlight; using Foundation; using UIKit; -using CoreSpotlight; - -#else -using MonoTouch.Foundation; -using MonoTouch.UIKit; -using MonoTouch.CoreSpotlight; -#endif namespace Xamarin.Forms.Platform.iOS { diff --git a/Xamarin.Forms.Platform.iOS/GlobalCloseContextGestureRecognizer.cs b/Xamarin.Forms.Platform.iOS/GlobalCloseContextGestureRecognizer.cs index f0e8522b..1a4e9c04 100644 --- a/Xamarin.Forms.Platform.iOS/GlobalCloseContextGestureRecognizer.cs +++ b/Xamarin.Forms.Platform.iOS/GlobalCloseContextGestureRecognizer.cs @@ -1,22 +1,7 @@ -using System.Collections.Generic; -using System.Drawing; -#if __UNIFIED__ using Foundation; using UIKit; -#else -using MonoTouch.Foundation; -using MonoTouch.UIKit; -#endif -#if __UNIFIED__ -using RectangleF = CoreGraphics.CGRect; -using SizeF = CoreGraphics.CGSize; -using PointF = CoreGraphics.CGPoint; using NSAction = System.Action; - -#else -using nfloat=System.Single; -using nint=System.Int32; -#endif +using RectangleF = CoreGraphics.CGRect; namespace Xamarin.Forms.Platform.iOS { diff --git a/Xamarin.Forms.Platform.iOS/IVisualElementRenderer.cs b/Xamarin.Forms.Platform.iOS/IVisualElementRenderer.cs index 5ffabf08..9a2bf580 100644 --- a/Xamarin.Forms.Platform.iOS/IVisualElementRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/IVisualElementRenderer.cs @@ -1,11 +1,6 @@ using System; -#if __UNIFIED__ using UIKit; -#else -using MonoTouch.UIKit; -#endif - namespace Xamarin.Forms.Platform.iOS { public interface IVisualElementRenderer : IDisposable, IRegisterable diff --git a/Xamarin.Forms.Platform.iOS/NativeViewPropertyListener.cs b/Xamarin.Forms.Platform.iOS/NativeViewPropertyListener.cs index ffe117f4..2d872af2 100644 --- a/Xamarin.Forms.Platform.iOS/NativeViewPropertyListener.cs +++ b/Xamarin.Forms.Platform.iOS/NativeViewPropertyListener.cs @@ -1,12 +1,7 @@ using System; using System.ComponentModel; -#if __UNIFIED__ using Foundation; -#else -using MonoTouch.Foundation; -#endif - namespace Xamarin.Forms.Platform.iOS { class NativeViewPropertyListener : NSObject, INotifyPropertyChanged diff --git a/Xamarin.Forms.Platform.iOS/NativeViewWrapper.cs b/Xamarin.Forms.Platform.iOS/NativeViewWrapper.cs index 5474c65b..31cb186d 100644 --- a/Xamarin.Forms.Platform.iOS/NativeViewWrapper.cs +++ b/Xamarin.Forms.Platform.iOS/NativeViewWrapper.cs @@ -1,16 +1,4 @@ -using System.Collections.Generic; -#if __UNIFIED__ -using CoreGraphics; -using UIKit; - -#else -using MonoTouch.UIKit; -#endif - -#if !__UNIFIED__ - // Save ourselves a ton of ugly ifdefs below -using CGSize = System.Drawing.SizeF; -#endif +using UIKit; namespace Xamarin.Forms.Platform.iOS { diff --git a/Xamarin.Forms.Platform.iOS/NativeViewWrapperRenderer.cs b/Xamarin.Forms.Platform.iOS/NativeViewWrapperRenderer.cs index 58cacdc6..4d1252ee 100644 --- a/Xamarin.Forms.Platform.iOS/NativeViewWrapperRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/NativeViewWrapperRenderer.cs @@ -1,17 +1,6 @@ -using System.Collections.Generic; -using Xamarin.Forms.Internals; -#if __UNIFIED__ -using CoreGraphics; +using CoreGraphics; using UIKit; - -#else -using MonoTouch.UIKit; -#endif - -#if !__UNIFIED__ - // Save ourselves a ton of ugly ifdefs below -using CGSize = System.Drawing.SizeF; -#endif +using Xamarin.Forms.Internals; namespace Xamarin.Forms.Platform.iOS { diff --git a/Xamarin.Forms.Platform.iOS/PageExtensions.cs b/Xamarin.Forms.Platform.iOS/PageExtensions.cs index 07da048a..51a5a33e 100644 --- a/Xamarin.Forms.Platform.iOS/PageExtensions.cs +++ b/Xamarin.Forms.Platform.iOS/PageExtensions.cs @@ -1,11 +1,6 @@ using System; -#if __UNIFIED__ using UIKit; -#else -using MonoTouch.UIKit; -#endif - namespace Xamarin.Forms { public static class PageExtensions diff --git a/Xamarin.Forms.Platform.iOS/Platform.cs b/Xamarin.Forms.Platform.iOS/Platform.cs index 3022fa0e..9ec4a8a8 100644 --- a/Xamarin.Forms.Platform.iOS/Platform.cs +++ b/Xamarin.Forms.Platform.iOS/Platform.cs @@ -1,33 +1,10 @@ using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; using System.Linq; -using System.Runtime.InteropServices; using System.Threading.Tasks; - -#if __UNIFIED__ -using CoreGraphics; using Foundation; -using ObjCRuntime; using UIKit; using RectangleF = CoreGraphics.CGRect; -using SizeF = CoreGraphics.CGSize; -using PointF = CoreGraphics.CGPoint; - -#else -using MonoTouch; -using MonoTouch.CoreAnimation; -using MonoTouch.CoreFoundation; -using MonoTouch.CoreGraphics; -using MonoTouch.UIKit; -using MonoTouch.Foundation; -using MonoTouch.ObjCRuntime; - -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/PlatformEffect.cs b/Xamarin.Forms.Platform.iOS/PlatformEffect.cs index 436ef6d7..8fb4f975 100644 --- a/Xamarin.Forms.Platform.iOS/PlatformEffect.cs +++ b/Xamarin.Forms.Platform.iOS/PlatformEffect.cs @@ -1,10 +1,4 @@ -using System.ComponentModel; -#if __UNIFIED__ -using UIKit; - -#else -using MonoTouch.UIKit; -#endif +using UIKit; namespace Xamarin.Forms.Platform.iOS { diff --git a/Xamarin.Forms.Platform.iOS/PlatformRenderer.cs b/Xamarin.Forms.Platform.iOS/PlatformRenderer.cs index 554c0f50..f2d897e4 100644 --- a/Xamarin.Forms.Platform.iOS/PlatformRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/PlatformRenderer.cs @@ -1,11 +1,5 @@ -using System; -#if __UNIFIED__ using UIKit; -#else -using MonoTouch.UIKit; -#endif - namespace Xamarin.Forms.Platform.iOS { internal class ModalWrapper : UIViewController diff --git a/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs b/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs index 822e143f..24df203f 100644 --- a/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs +++ b/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs @@ -5,13 +5,8 @@ using System.Runtime.CompilerServices; using Xamarin.Forms; using Xamarin.Forms.Internals; using Xamarin.Forms.Platform.iOS; -#if __UNIFIED__ using UIKit; -#else -using MonoTouch.UIKit; -#endif - [assembly: AssemblyTitle("Xamarin.Forms.Platform.iOS")] [assembly: AssemblyDescription("iOS Backend for Xamarin.Forms")] [assembly: AssemblyConfiguration("")] diff --git a/Xamarin.Forms.Platform.iOS/RendererPool.cs b/Xamarin.Forms.Platform.iOS/RendererPool.cs index 51f7f4fb..babfa7bc 100644 --- a/Xamarin.Forms.Platform.iOS/RendererPool.cs +++ b/Xamarin.Forms.Platform.iOS/RendererPool.cs @@ -1,12 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -#if __UNIFIED__ -using UIKit; - -#else -using MonoTouch.UIKit; -#endif namespace Xamarin.Forms.Platform.iOS { 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 { diff --git a/Xamarin.Forms.Platform.iOS/ResourcesProvider.cs b/Xamarin.Forms.Platform.iOS/ResourcesProvider.cs index 847107d9..cb5e3cfe 100644 --- a/Xamarin.Forms.Platform.iOS/ResourcesProvider.cs +++ b/Xamarin.Forms.Platform.iOS/ResourcesProvider.cs @@ -1,10 +1,5 @@ -#if __UNIFIED__ using UIKit; -#else -using MonoTouch.UIKit; -#endif - namespace Xamarin.Forms.Platform.iOS { internal class ResourcesProvider : ISystemResourcesProvider diff --git a/Xamarin.Forms.Platform.iOS/ViewInitializedEventArgs.cs b/Xamarin.Forms.Platform.iOS/ViewInitializedEventArgs.cs index e34a493e..73041163 100644 --- a/Xamarin.Forms.Platform.iOS/ViewInitializedEventArgs.cs +++ b/Xamarin.Forms.Platform.iOS/ViewInitializedEventArgs.cs @@ -1,11 +1,6 @@ using System; -#if __UNIFIED__ using UIKit; -#else -using MonoTouch.UIKit; -#endif - namespace Xamarin.Forms { public class ViewInitializedEventArgs : EventArgs diff --git a/Xamarin.Forms.Platform.iOS/ViewRenderer.cs b/Xamarin.Forms.Platform.iOS/ViewRenderer.cs index 0c0f8f93..6ecc307b 100644 --- a/Xamarin.Forms.Platform.iOS/ViewRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/ViewRenderer.cs @@ -1,21 +1,8 @@ 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/VisualElementPackager.cs b/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs index 0aefc482..1670176d 100644 --- a/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs +++ b/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs @@ -1,10 +1,4 @@ using System; -#if __UNIFIED__ -using UIKit; - -#else -using MonoTouch.UIKit; -#endif namespace Xamarin.Forms.Platform.iOS { diff --git a/Xamarin.Forms.Platform.iOS/VisualElementRenderer.cs b/Xamarin.Forms.Platform.iOS/VisualElementRenderer.cs index d4da0930..b4a60f63 100644 --- a/Xamarin.Forms.Platform.iOS/VisualElementRenderer.cs +++ b/Xamarin.Forms.Platform.iOS/VisualElementRenderer.cs @@ -1,27 +1,11 @@ using System; using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.Drawing; using System.ComponentModel; -using Xamarin.Forms.PlatformConfiguration.iOSSpecific; - -#if __UNIFIED__ using UIKit; -#else -using MonoTouch.UIKit; -#endif -#if __UNIFIED__ +using Xamarin.Forms.PlatformConfiguration.iOSSpecific; using RectangleF = CoreGraphics.CGRect; using SizeF = CoreGraphics.CGSize; -using PointF = CoreGraphics.CGPoint; -using CoreGraphics; - -#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/VisualElementTracker.cs b/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs index c9396769..5b41ca84 100644 --- a/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs +++ b/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs @@ -1,16 +1,9 @@ using System; -using System.Drawing; using System.ComponentModel; +using System.Drawing; using System.Threading; -#if __UNIFIED__ -using UIKit; using CoreAnimation; -#else -using MonoTouch.UIKit; -using MonoTouch.CoreAnimation; -#endif - namespace Xamarin.Forms.Platform.iOS { public class VisualElementTracker : IDisposable diff --git a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.Classic.csproj b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.Classic.csproj deleted file mode 100644 index 45699dae..00000000 --- a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.Classic.csproj +++ /dev/null @@ -1,274 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform> - <ProductVersion>8.0.30703</ProductVersion> - <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{4A47B5DF-DDFC-476B-AC41-5105FF3B9B8B}</ProjectGuid> - <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> - <OutputType>Library</OutputType> - <RootNamespace>Xamarin.Forms.Platform.iOS</RootNamespace> - <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> - <AssemblyName>Xamarin.Forms.Platform.iOS.Classic</AssemblyName> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>classic_bin\iPhoneSimulator\Debug\</OutputPath> - <BaseIntermediateOutputPath>classic_obj\</BaseIntermediateOutputPath> - <DefineConstants>TRACE;DEBUG;__MOBILE__;__IOS__</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <ConsolePause>false</ConsolePause> - <MtouchDebug>true</MtouchDebug> - <CodesignKey>iPhone Developer</CodesignKey> - <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn> - </NoWarn> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>none</DebugType> - <Optimize>true</Optimize> - <OutputPath>classic_bin\iPhoneSimulator\Release\</OutputPath> - <BaseIntermediateOutputPath>classic_obj\</BaseIntermediateOutputPath> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <ConsolePause>false</ConsolePause> - <CodesignKey>iPhone Developer</CodesignKey> - <DefineConstants>TRACE;__IOS__;__MOBILE__;</DefineConstants> - <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn> - </NoWarn> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|AnyCPU'"> - <DebugSymbols>true</DebugSymbols> - <OutputPath>bin\Turkey\</OutputPath> - <DefineConstants>__MOBILE__;__IOS__;TRACE;DEBUG;__MOBILE__;__IOS__</DefineConstants> - <DebugType>full</DebugType> - <PlatformTarget>AnyCPU</PlatformTarget> - <UseVSHostingProcess>false</UseVSHostingProcess> - <ErrorReport>prompt</ErrorReport> - <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> - <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn> - </NoWarn> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppStore|AnyCPU'"> - <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <NoWarn> - </NoWarn> - </PropertyGroup> - <ItemGroup> - <Compile Include="..\Xamarin.Forms.Core\Properties\GlobalAssemblyInfo.cs"> - <Link>Properties\GlobalAssemblyInfo.cs</Link> - </Compile> - <Compile Include="CADisplayLinkTicker.cs" /> - <Compile Include="ContextActionCell.cs" /> - <Compile Include="ContextScrollViewDelegate.cs" /> - <Compile Include="EffectUtilities.cs" /> - <Compile Include="Extensions\CellExtensions.cs" /> - <Compile Include="Extensions\PlatformConfigurationExtensions.cs" /> - <Compile Include="Forms.cs" /> - <Compile Include="GlobalCloseContextGestureRecognizer.cs" /> - <Compile Include="Extensions\ArrayExtensions.cs" /> - <Compile Include="NativeViewWrapper.cs" /> - <Compile Include="NativeViewWrapperRenderer.cs" /> - <Compile Include="PlatformEffect.cs" /> - <Compile Include="Renderers\AlignmentExtensions.cs" /> - <Compile Include="PageExtensions.cs" /> - <Compile Include="Renderers\ExportCellAttribute.cs" /> - <Compile Include="Renderers\ExportImageSourceHandlerAttribute.cs" /> - <Compile Include="Renderers\ExportRendererAttribute.cs" /> - <Compile Include="Resources\StringResources.Designer.cs" /> - <Compile Include="ViewInitializedEventArgs.cs" /> - <Compile Include="NativeViewPropertyListener.cs" /> - <Compile Include="Extensions\LayoutExtensions.cs" /> - </ItemGroup> - <ItemGroup> - <Compile Include="$(MSBuildThisFileDirectory)Deserializer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)ElementChangedEventArgs.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)EventTracker.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)FormsApplicationDelegate.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)IVisualElementRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Platform.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)PlatformRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)RendererFactory.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)RendererPool.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)ResourcesProvider.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)ViewRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)VisualElementPackager.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)VisualElementRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)VisualElementTracker.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Cells\CellRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Cells\CellTableViewCell.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Cells\EntryCellRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Cells\ImageCellRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Cells\SwitchCellRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Cells\TextCellRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Cells\ViewCellRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Extensions\ColorExtensions.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Extensions\DateExtensions.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Extensions\Extensions.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Extensions\ToolbarItemExtensions.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Extensions\UIViewExtensions.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Extensions\ViewExtensions.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\ActivityIndicatorRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\BoxRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\ButtonRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\CarouselPageRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\DatePickerRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\EditorRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\EntryRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\FontExtensions.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\FormattedStringExtensions.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\FrameRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\ImageRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\KeyboardInsetTracker.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\KeyboardObserver.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\LabelRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\ListViewRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\NavigationMenuRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\NavigationRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\OpenGLViewRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\PageRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\PhoneMasterDetailRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\PickerRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\ProgressBarRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\ScrollViewRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\SearchBarRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\SliderRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\StepperRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\SwitchRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\TabbedRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\TableViewModelRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\TableViewRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\TabletMasterDetailRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\TimePickerRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Renderers\WebViewRenderer.cs" /> - <Compile Include="$(MSBuildThisFileDirectory)Properties\AssemblyInfo.cs" /> - <Compile Include="iOSAppIndexingProvider.cs" /> - <Compile Include="iOSAppLinks.cs" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.ar.resx" /> - </ItemGroup> - <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Runtime.Serialization" /> - <Reference Include="System.Xml" /> - <Reference Include="System.Core" /> - <Reference Include="monotouch" /> - <Reference Include="System.Net.Http" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj"> - <Project>{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}</Project> - <Name>Xamarin.Forms.Core</Name> - </ProjectReference> - </ItemGroup> - <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" /> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.ca.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.cs.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.da.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.de.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.el.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.es.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.fi.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.fr.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.he.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.hi.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.hr.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.hu.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.id.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.it.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.ja.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.ko.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.ms.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.nb.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.nl.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.pl.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.pt-BR.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.pt.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.ro.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.ru.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.sk.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.sv.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.th.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.tr.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.uk.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.vi.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.zh-Hans.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.zh-Hant.resx" /> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Resources\StringResources.zh-HK.resx" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj index e31aa3ac..c7f02785 100644 --- a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj +++ b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj @@ -37,7 +37,7 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Turkey|AnyCPU'"> <DebugSymbols>true</DebugSymbols> <OutputPath>bin\Turkey\</OutputPath> - <DefineConstants>__UNIFIED__;__MOBILE__;__IOS__;DEBUG;</DefineConstants> + <DefineConstants>__MOBILE__;__IOS__;DEBUG;</DefineConstants> <DebugType>full</DebugType> <PlatformTarget>AnyCPU</PlatformTarget> <UseVSHostingProcess>false</UseVSHostingProcess> diff --git a/Xamarin.Forms.Platform.iOS/iOSAppLinks.cs b/Xamarin.Forms.Platform.iOS/iOSAppLinks.cs index 8c46ed07..f8771a93 100644 --- a/Xamarin.Forms.Platform.iOS/iOSAppLinks.cs +++ b/Xamarin.Forms.Platform.iOS/iOSAppLinks.cs @@ -1,16 +1,9 @@ using System; using System.Threading.Tasks; -#if __UNIFIED__ -using Foundation; using CoreSpotlight; +using Foundation; using UIKit; -#else -using MonoTouch.Foundation; -using MonoTouch.UIKit; -using MonoTouch.CoreSpotlight; -#endif - namespace Xamarin.Forms.Platform.iOS { internal class IOSAppLinks : IAppLinks @@ -60,11 +53,7 @@ namespace Xamarin.Forms.Platform.iOS //we need to make sure we index the item in spotlight first or the RelatedUniqueIdentifier will not work await IndexItemAsync(searchItem); -#if __UNIFIED__ var activity = new NSUserActivity($"{appDomain}.{contentType}"); -#else - var activity = new NSUserActivity (new NSString($"{appDomain}.{contentType}")); -#endif activity.Title = deepLinkUri.Title; activity.EligibleForSearch = true; |