Carousel clean (#135)

CarouselView moving to preview repo

4 files changed, 0 insertions, 427 deletions

diff --git a/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs b/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs
index f1593568..822e143f 100644
--- a/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs
+++ b/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs
@@ -44,7 +44,6 @@ using MonoTouch.UIKit;
 [assembly: ExportRenderer(typeof(Frame), typeof(FrameRenderer))]
 [assembly: ExportRenderer(typeof(NavigationMenu), typeof(NavigationMenuRenderer))]
 [assembly: ExportRenderer(typeof(ListView), typeof(ListViewRenderer))]
-[assembly: ExportRenderer(typeof(CarouselView), typeof(CarouselViewRenderer))]
 [assembly: ExportRenderer(typeof(OpenGLView), typeof(OpenGLViewRenderer))]
 [assembly: ExportRenderer(typeof(NativeViewWrapper), typeof(NativeViewWrapperRenderer))]
 [assembly: ExportRenderer(typeof(TabbedPage), typeof(TabbedRenderer))]
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/CarouselViewRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/CarouselViewRenderer.cs
deleted file mode 100644
index 39cda393..00000000
--- a/Xamarin.Forms.Platform.iOS/Renderers/CarouselViewRenderer.cs
+++ /dev/null
@@ -1,424 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Drawing;
-using System.Linq;
-#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
-
-namespace Xamarin.Forms.Platform.iOS
-{
-	/// <summary>
-	///     UICollectionView visualizes a collection of data. UICollectionViews are created indirectly by first creating a
-	///     CarouselViewController from which the CollectionView is accessed via the CollectionView property.
-	///     The CarouselViewController functionality is exposed through a set of interfaces (aka "conforms to" in the Apple
-	///     docs).
-	///     When Xamarin exposed CarouselViewRenderer the following interfaces where implemented as virtual methods:
-	///     UICollectionViewSource
-	///     UIScrollViewDelegate
-	///     UICollectionViewDelegate		Allow you to manage the selection and highlighting of items in a collection view
-	///     UICollectionViewDataSource		Creation and configuration of cells and supplementary views used to display data
-	///     The interfaces only implement required method while the UICollectionView exposes optional methods via
-	///     ExportAttribute.
-	///     The C# method name may be aliased. For example, C# "GetCell" maps to obj-C "CellForItemAtIndexPath".
-#pragma warning disable 1584
-	///     <seealso cref="https://developer.apple.com/library/ios/documentation/UIKit/Reference/UICollectionView_class/" />
-#pragma warning restore 1584
-	/// </summary>
-	public class CarouselViewRenderer : ViewRenderer<CarouselView, UICollectionView>
-	{
-		#region Static Fields
-		const int DefaultMinimumDimension = 44;
-		#endregion
-
-		#region Fields
-		// As on Android, ScrollToPostion from 0 to 2 should not raise OnPositionChanged for 1
-		// Tracking the _targetPosition allows for skipping events for intermediate positions
-		int? _targetPosition;
-
-		int _position;
-		CarouselViewController _controller;
-		RectangleF _lastBounds;
-		#endregion
-
-		ICarouselViewController Controller
-		{
-			get
-			{
-				return Element;
-			}
-		}
-		void Initialize()
-		{
-			// cache hit? 
-			var carouselView = base.Control;
-			if (carouselView != null)
-				return;
-
-			_lastBounds = Bounds;
-			_controller = new CarouselViewController(
-				renderer: this,
-				initialPosition: Element.Position
-			);
-
-			// hook up on position changed event
-			// not ideal; the event is raised upon releasing the swipe instead of animation completion
-			_controller.OnWillDisplayCell += o => OnPositionChange(o);
-
-			// populate cache
-			SetNativeControl(_controller.CollectionView);
-		}
-
-		void OnItemChange(int position)
-		{
-			var item = Controller.GetItem(position);
-			Controller.SendSelectedItemChanged(item);
-		}
-		void OnPositionChange(int position)
-		{
-			if (position == _position)
-				return;
-
-			if (_targetPosition != null && position != _targetPosition)
-				return;
-
-			_targetPosition = null;
-			_position = position;
-			Element.Position = _position;
-
-			Controller.SendSelectedPositionChanged(position);
-			OnItemChange(position);
-			return;
-		}
-		void ScrollToPosition(int position, bool animated = true)
-		{
-			if (position == _position)
-				return;
-
-			_targetPosition = position;
-			_controller.ScrollToPosition(position, animated);
-		}
-		void OnCollectionChanged(object source, NotifyCollectionChangedEventArgs e)
-		{
-			switch (e.Action)
-			{
-				case NotifyCollectionChangedAction.Add:
-					_controller.ReloadData();
-
-					if (e.NewStartingIndex <= _position)
-						ShiftPosition(e.NewItems.Count);
-
-					break;
-
-				case NotifyCollectionChangedAction.Move:
-					for (var i = 0; i < e.NewItems.Count; i++)
-					{
-						_controller.MoveItem(
-							oldPosition: e.OldStartingIndex + i,
-							newPosition: e.NewStartingIndex + i
-						);
-					}
-					break;
-
-				case NotifyCollectionChangedAction.Remove:
-					if (Controller.Count == 0)
-						throw new InvalidOperationException("CarouselView must retain a least one item.");
-
-					if (e.OldStartingIndex == _position)
-					{
-						_controller.DeleteItems(
-							Enumerable.Range(e.OldStartingIndex, e.OldItems.Count)
-						);
-						if (_position == Controller.Count)
-							_position--;
-						OnItemChange(_position);
-					}
-
-					else
-					{
-						_controller.ReloadData();
-
-						if (e.OldStartingIndex < _position)
-							ShiftPosition(-e.OldItems.Count);
-					}
-
-					break;
-
-				case NotifyCollectionChangedAction.Replace:
-					_controller.ReloadItems(
-						Enumerable.Range(e.OldStartingIndex, e.OldItems.Count)
-					);
-					break;
-
-				case NotifyCollectionChangedAction.Reset:
-					_controller.ReloadData();
-					break;
-
-				default:
-					throw new Exception();
-			}
-		}
-		void ShiftPosition(int offset)
-		{
-			// By default the position remains the same which causes an animation in the case
-			// of the added/removed position preceding the current position. I prefer the constructed
-			// Android behavior whereby the item remains the same and the position changes.
-			ScrollToPosition(_position + offset, false);
-		}
-
-		protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
-		{
-			if (e.PropertyName == "Position" && _position != Element.Position)
-				// not ideal; the event is raised before the animation to move completes (or even starts)
-				ScrollToPosition(Element.Position);
-
-			base.OnElementPropertyChanged(sender, e);
-		}
-		protected override void OnElementChanged(ElementChangedEventArgs<CarouselView> e)
-		{
-			base.OnElementChanged(e);
-
-			CarouselView oldElement = e.OldElement;
-			CarouselView newElement = e.NewElement;
-			if (oldElement != null)
-			{
-				e.OldElement.CollectionChanged -= OnCollectionChanged;
-			}
-
-			if (newElement != null)
-			{
-				if (Control == null)
-				{
-					Initialize();
-				}
-
-				// initialize properties
-				_position = Element.Position;
-
-				// hook up crud events
-				Element.CollectionChanged += OnCollectionChanged;
-			}
-		}
-
-		public override void LayoutSubviews()
-		{
-			base.LayoutSubviews();
-
-			if (_lastBounds == Bounds)
-				return;
-
-			base.Control.ReloadData();
-			_lastBounds = Bounds;
-			_controller.ScrollToPosition(_position, false);
-		}
-		public override SizeRequest GetDesiredSize(double widthConstraint, double heightConstraint)
-		{
-			return Control.GetSizeRequest(widthConstraint, heightConstraint, DefaultMinimumDimension, DefaultMinimumDimension);
-		}
-	}
-
-	internal sealed class CarouselViewController : UICollectionViewController
-	{
-		new sealed class Layout : UICollectionViewFlowLayout
-		{
-			static readonly nfloat ZeroMinimumInteritemSpacing = 0;
-			static readonly nfloat ZeroMinimumLineSpacing = 0;
-
-			public Layout(UICollectionViewScrollDirection scrollDirection)
-			{
-				ScrollDirection = scrollDirection;
-				MinimumInteritemSpacing = ZeroMinimumInteritemSpacing;
-				MinimumLineSpacing = ZeroMinimumLineSpacing;
-			}
-		}
-		sealed class Cell : UICollectionViewCell
-		{
-			IItemViewController _controller;
-			int _position;
-			IVisualElementRenderer _renderer;
-			View _view;
-
-			void Bind(object item, int position)
-			{
-				//if (position != this._position)
-				//	controller.SendPositionDisappearing (this._position);
-
-				_position = position;
-				OnBind?.Invoke(_position);
-
-				_controller.BindView(_view, item);
-			}
-
-			[Export("initWithFrame:")]
-			internal Cell(RectangleF frame) : base(frame)
-			{
-				_position = -1;
-			}
-			internal void Initialize(IItemViewController controller, object itemType, object item, int position)
-			{
-				_position = position;
-
-				if (_controller == null)
-				{
-					_controller = controller;
-
-					// create view
-					_view = controller.CreateView(itemType);
-
-					// bind view
-					Bind(item, _position);
-
-					// render view
-					_renderer = Platform.CreateRenderer(_view);
-					Platform.SetRenderer(_view, _renderer);
-
-					// attach view
-					var uiView = _renderer.NativeView;
-					ContentView.AddSubview(uiView);
-				}
-				else
-					Bind(item, _position);
-			}
-
-			public Action<int> OnBind;
-			public override void LayoutSubviews()
-			{
-				base.LayoutSubviews();
-
-				_renderer.Element.Layout(new Rectangle(0, 0, ContentView.Frame.Width, ContentView.Frame.Height));
-			}
-		}
-
-		readonly Dictionary<object, int> _typeIdByType;
-		CarouselViewRenderer _renderer;
-		int _nextItemTypeId;
-		int _initialPosition;
-
-		internal CarouselViewController(
-			CarouselViewRenderer renderer,
-			int initialPosition)
-			: base(new Layout(UICollectionViewScrollDirection.Horizontal))
-		{
-			_renderer = renderer;
-			_typeIdByType = new Dictionary<object, int>();
-			_nextItemTypeId = 0;
-			_initialPosition = initialPosition;
-		}
-
-		CarouselViewRenderer Renderer => _renderer;
-		CarouselView Element => _renderer.Element;
-		ICarouselViewController Controller => Element;
-
-		[Export("collectionView:layout:sizeForItemAtIndexPath:")]
-		SizeF GetSizeForItem(
-			UICollectionView collectionView,
-			UICollectionViewLayout layout,
-			NSIndexPath indexPath)
-		{
-			return collectionView.Frame.Size;
-		}
-
-		internal Action<int> OnBind;
-		internal Action<int> OnWillDisplayCell;
-
-		public override void WillDisplayCell(UICollectionView collectionView, UICollectionViewCell cell, NSIndexPath indexPath)
-		{
-			if (_initialPosition != 0)
-			{
-				ScrollToPosition(_initialPosition, false);
-				_initialPosition = 0;
-				return;
-			}
-
-			var index = indexPath.Row;
-			OnWillDisplayCell?.Invoke(index);
-		}
-		public override nint NumberOfSections(UICollectionView collectionView)
-		{
-			return 1;
-		}
-		public override void ViewDidLoad()
-		{
-			base.ViewDidLoad();
-
-			CollectionView.PagingEnabled = true;
-			CollectionView.BackgroundColor = UIColor.Clear;
-		}
-		public override nint GetItemsCount(UICollectionView collectionView, nint section)
-		{
-			var result = Controller.Count;
-			return result;
-		}
-		public override UICollectionViewCell GetCell(UICollectionView collectionView, NSIndexPath indexPath)
-		{
-			var index = indexPath.Row;
-
-			if (_initialPosition != 0)
-				index = _initialPosition;
-
-			var item = Controller.GetItem(index);
-			var itemType = Controller.GetItemType(item);
-
-			var itemTypeId = default(int);
-			if (!_typeIdByType.TryGetValue(itemType, out itemTypeId))
-			{
-				_typeIdByType[itemType] = itemTypeId = _nextItemTypeId++;
-				CollectionView.RegisterClassForCell(typeof(Cell), itemTypeId.ToString());
-			}
-
-			var cell = (Cell)CollectionView.DequeueReusableCell(itemTypeId.ToString(), indexPath);
-			cell.Initialize(Element, itemType, item, index);
-
-			// a semantically weak approach to OnAppearing; decided not to expose as such
-			if (cell.OnBind == null)
-				cell.OnBind += o => OnBind?.Invoke(o);
-
-			return cell;
-		}
-
-		internal void ReloadData() => CollectionView.ReloadData();
-		internal void ReloadItems(IEnumerable<int> positions)
-		{
-			var indices = positions.Select(o => NSIndexPath.FromRowSection(o, 0)).ToArray();
-			CollectionView.ReloadItems(indices);
-		}
-		internal void DeleteItems(IEnumerable<int> positions)
-		{
-			var indices = positions.Select(o => NSIndexPath.FromRowSection(o, 0)).ToArray();
-			CollectionView.DeleteItems(indices);
-		}
-		internal void MoveItem(int oldPosition, int newPosition)
-		{
-			base.MoveItem(
-				CollectionView,
-				NSIndexPath.FromRowSection(oldPosition, 0),
-				NSIndexPath.FromRowSection(newPosition, 0)
-			);
-		}
-		internal void ScrollToPosition(int position, bool animated = true)
-		{
-			CollectionView.ScrollToItem(
-				indexPath: NSIndexPath.FromRowSection(position, 0),
-				scrollPosition: UICollectionViewScrollPosition.CenteredHorizontally,
-				animated: animated
-			);
-		}
-	}
-}
\ No newline at end of file
diff --git a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.Classic.csproj b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.Classic.csproj
index a3ba13c1..285660e6 100644
--- a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.Classic.csproj
+++ b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.Classic.csproj
@@ -78,7 +78,6 @@
     <Compile Include="LayoutExtensions.cs" />
     <Compile Include="Renderers\AlignmentExtensions.cs" />
     <Compile Include="PageExtensions.cs" />
-    <Compile Include="Renderers\CarouselViewRenderer.cs" />
     <Compile Include="Renderers\ExportCellAttribute.cs" />
     <Compile Include="Renderers\ExportImageSourceHandlerAttribute.cs" />
     <Compile Include="Renderers\ExportRendererAttribute.cs" />
diff --git a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj
index 1f9a92e2..3ed36e7f 100644
--- a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj
+++ b/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj
@@ -140,7 +140,6 @@
     <Compile Include="Renderers\AlignmentExtensions.cs" />
     <Compile Include="Forms.cs" />
     <Compile Include="PageExtensions.cs" />
-    <Compile Include="Renderers\CarouselViewRenderer.cs" />
     <Compile Include="Resources\StringResources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>