Fixed some deprecated Forms code

Author: chrisriesgo

src/CustomLayouts/Controls/CarouselLayout.cs

@@ -2,8 +2,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Timers;
 using Xamarin.Forms;
+using System.Threading.Tasks;
 
 namespace CustomLayouts.Controls
 {
@@ -17,7 +17,6 @@ public enum IndicatorStyleEnum
 		}
 
 		readonly StackLayout _stack;
-		Timer _selectedItemTimer;
 
 		int _selectedIndex;
 
@@ -31,13 +30,6 @@ public CarouselLayout ()
 			};
 
 			Content = _stack;
-
-			_selectedItemTimer = new Timer {
-				AutoReset = false,
-				Interval = 300
-			};
-
-			_selectedItemTimer.Elapsed += SelectedItemTimerElapsed;
 		}
 
 		public IndicatorStyleEnum IndicatorStyle { get; set; }
@@ -60,13 +52,16 @@ protected override void LayoutChildren (double x, double y, double width, double
 		}
 
 		public static readonly BindableProperty SelectedIndexProperty =
-			BindableProperty.Create<CarouselLayout, int> (
-				carousel => carousel.SelectedIndex,
-				0,
+			BindableProperty.Create(
+				nameof(SelectedIndex), 
+				typeof(int), 
+				typeof(CarouselLayout), 
+				0, 
 				BindingMode.TwoWay,
-				propertyChanged: (bindable, oldValue, newValue) => {
-				((CarouselLayout)bindable).UpdateSelectedItem ();
-			}
+				propertyChanged: async (bindable, oldValue, newValue) =>
+				{
+					await ((CarouselLayout)bindable).UpdateSelectedItem();
+				}
 			);
 
 		public int SelectedIndex {
@@ -78,26 +73,26 @@ public int SelectedIndex {
 			}
 		}
 
-		void UpdateSelectedItem ()
+		async Task UpdateSelectedItem ()
 		{
-			_selectedItemTimer.Stop ();
-			_selectedItemTimer.Start ();
-		}
-
-		void SelectedItemTimerElapsed (object sender, ElapsedEventArgs e) {
-			SelectedItem = SelectedIndex > -1 ? Children [SelectedIndex].BindingContext : null;
+			await Task.Delay(300);
+			SelectedItem = SelectedIndex > -1 ? Children[SelectedIndex].BindingContext : null;
 		}
 
 		public static readonly BindableProperty ItemsSourceProperty =
-			BindableProperty.Create<CarouselLayout, IList> (
-				view => view.ItemsSource,
+			BindableProperty.Create(
+				nameof(ItemsSource),
+				typeof(IList),
+				typeof(CarouselLayout),
 				null,
-				propertyChanging: (bindableObject, oldValue, newValue) => {
-				((CarouselLayout)bindableObject).ItemsSourceChanging ();
-			},
-				propertyChanged: (bindableObject, oldValue, newValue) => {
-				((CarouselLayout)bindableObject).ItemsSourceChanged ();
-			}
+				propertyChanging: (bindableObject, oldValue, newValue) =>
+				{
+					((CarouselLayout)bindableObject).ItemsSourceChanging();
+				},
+				propertyChanged: (bindableObject, oldValue, newValue) =>
+				{
+					((CarouselLayout)bindableObject).ItemsSourceChanged();
+				}
 			);
 
 		public IList ItemsSource {
@@ -134,14 +129,17 @@ public DataTemplate ItemTemplate {
 			set;
 		}
 
-		public static readonly BindableProperty SelectedItemProperty = 
-			BindableProperty.Create<CarouselLayout, object> (
-				view => view.SelectedItem,
+		public static readonly BindableProperty SelectedItemProperty =
+			BindableProperty.Create(
+				nameof(SelectedItem),
+				typeof(object),
+				typeof(CarouselLayout),
 				null,
 				BindingMode.TwoWay,
-				propertyChanged: (bindable, oldValue, newValue) => {
-				((CarouselLayout)bindable).UpdateSelectedIndex ();
-			}
+				propertyChanged: (bindable, oldValue, newValue) =>
+				{
+					((CarouselLayout)bindable).UpdateSelectedIndex();
+				}
 			);
 
 		public object SelectedItem {

src/CustomLayouts/PagerIndicatorDots.cs

@@ -12,7 +12,6 @@ public interface ITabProvider
 
 	public class PagerIndicatorDots : StackLayout
 	{
-		int dotCount = 1;
 		int _selectedIndex;
 
 		public Color DotColor { get; set; }
@@ -54,16 +53,20 @@ void CreateTabs()
 		}
 
 		public static BindableProperty ItemsSourceProperty =
-			BindableProperty.Create<PagerIndicatorDots, IList> (
-				pi => pi.ItemsSource,
+			BindableProperty.Create(
+				nameof(ItemsSource),
+				typeof(IList),
+				typeof(PagerIndicatorDots),
 				null,
 				BindingMode.OneWay,
-				propertyChanging: (bindable, oldValue, newValue) => {
-				((PagerIndicatorDots)bindable).ItemsSourceChanging ();
-			},
-				propertyChanged: (bindable, oldValue, newValue) => {
-				((PagerIndicatorDots)bindable).ItemsSourceChanged ();
-			}
+				propertyChanging: (bindable, oldValue, newValue) =>
+				{
+					((PagerIndicatorDots)bindable).ItemsSourceChanging();
+				},
+				propertyChanged: (bindable, oldValue, newValue) =>
+				{
+					((PagerIndicatorDots)bindable).ItemsSourceChanged();
+				}
 		);
 
 		public IList ItemsSource {
@@ -76,13 +79,17 @@ public IList ItemsSource {
 		}
 
 		public static BindableProperty SelectedItemProperty =
-			BindableProperty.Create<PagerIndicatorDots, object> (
-				pi => pi.SelectedItem,
+			BindableProperty.Create(
+				nameof(SelectedItem),
+				typeof(object),
+				typeof(PagerIndicatorDots),
 				null,
 				BindingMode.TwoWay,
-				propertyChanged: (bindable, oldValue, newValue) => {
-				((PagerIndicatorDots)bindable).SelectedItemChanged ();
-			});
+				propertyChanged: (bindable, oldValue, newValue) =>
+				{
+					((PagerIndicatorDots)bindable).SelectedItemChanged();
+				}
+		);
 
 		public object SelectedItem {
 			get {

src/CustomLayouts/PagerIndicatorTabs.cs

@@ -8,7 +8,6 @@ namespace CustomLayouts
 {
 	public class PagerIndicatorTabs : Grid
 	{
-		int dotCount = 1;
 		int _selectedIndex;
 
 		public Color DotColor { get; set; }
@@ -63,16 +62,20 @@ void CreateTabs()
 		}
 
 		public static BindableProperty ItemsSourceProperty =
-			BindableProperty.Create<PagerIndicatorTabs, IList> (
-				pi => pi.ItemsSource,
+			BindableProperty.Create(
+				nameof(ItemsSource),
+				typeof(IList),
+				typeof(PagerIndicatorTabs),
 				null,
 				BindingMode.OneWay,
-				propertyChanging: (bindable, oldValue, newValue) => {
-				((PagerIndicatorTabs)bindable).ItemsSourceChanging ();
-			},
-				propertyChanged: (bindable, oldValue, newValue) => {
-				((PagerIndicatorTabs)bindable).ItemsSourceChanged ();
-			}
+				propertyChanging: (bindable, oldValue, newValue) =>
+				{
+					((PagerIndicatorTabs)bindable).ItemsSourceChanging();
+				},
+				propertyChanged: (bindable, oldValue, newValue) =>
+				{
+					((PagerIndicatorTabs)bindable).ItemsSourceChanged();
+				}
 		);
 
 		public IList ItemsSource {
@@ -85,13 +88,17 @@ public IList ItemsSource {
 		}
 
 		public static BindableProperty SelectedItemProperty =
-			BindableProperty.Create<PagerIndicatorTabs, object> (
-				pi => pi.SelectedItem,
+			BindableProperty.Create(
+				nameof(SelectedItem),
+				typeof(object),
+				typeof(PagerIndicatorTabs),
 				null,
 				BindingMode.TwoWay,
-				propertyChanged: (bindable, oldValue, newValue) => {
-				((PagerIndicatorTabs)bindable).SelectedItemChanged ();
-			});
+				propertyChanged: (bindable, oldValue, newValue) =>
+				{
+					((PagerIndicatorTabs)bindable).SelectedItemChanged();
+				}
+		);
 
 		public object SelectedItem {
 			get {