Added IndicatorsView

Stubs/Xamarin.Forms.Platform.cs

@@ -119,6 +119,11 @@ internal class _FrameRenderer { }
 	internal class _CheckBoxRenderer { }
 #endif
 
+#if !TIZEN4_0
+	[RenderWith(typeof(IndicatorViewRenderer))]
+#endif
+	internal class _IndicatorViewRenderer { }
+
 #if __IOS__
 	// current previewer doesn't work with appcompat so this renderer is here for the previewer only
 	// once previewer switches to appcompat then we can remove this

Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj

@@ -397,4 +397,4 @@
     </CreateItem>
     <Copy SourceFiles="@(MapsKey)" DestinationFiles="Properties\MapsKey.cs" Condition="!Exists('Properties\MapsKey.cs')" />
   </Target>
-</Project>
+</Project>

Xamarin.Forms.Controls/CoreGallery.cs

@@ -288,6 +288,7 @@ public override string ToString()
 				new GalleryPageFactory(() => new MemoryLeakGallery(), "Memory Leak"),
 				new GalleryPageFactory(() => new Issues.A11yTabIndex(), "Accessibility TabIndex"),
 				new GalleryPageFactory(() => new FontImageSourceGallery(), "Font ImageSource"),
+				new GalleryPageFactory(() => new IndicatorsSample(), "Indicator Gallery"),
 				new GalleryPageFactory(() => new CarouselViewGallery(), "CarouselView Gallery"),           
 				new GalleryPageFactory(() => new CarouselViewCoreGalleryPage(), "CarouselView Core Gallery"),
 				new GalleryPageFactory(() => new CollectionViewGallery(), "CollectionView Gallery"),

Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselItemsGallery.cs

@@ -12,9 +12,9 @@ public CarouselItemsGallery()
 		{
 			var viewModel = new CarouselItemsGalleryViewModel();
 
-			Title = $"CarouselView (Items)";
+			Title = $"CarouselView (Indicators)";
 
-			var layout = new Grid
+			var grid = new Grid
 			{
 				RowDefinitions = new RowDefinitionCollection
 				{
@@ -42,7 +42,22 @@ public CarouselItemsGallery()
 				EmptyView = "This is the empty view"
 			};
 
-			layout.Children.Add(carouselView, 0, 0);
+			var absolute = new AbsoluteLayout();
+			absolute.Children.Add(carouselView, new Rectangle(0, 0, 1, 1), AbsoluteLayoutFlags.All);
+
+			var indicators = new IndicatorView
+			{
+				Margin = new Thickness(15, 20),
+				IndicatorColor = Color.Gray,
+				SelectedIndicatorColor = Color.Black,
+				IndicatorsShape = IndicatorShape.Square
+			};
+
+			IndicatorView.SetItemsSourceBy(indicators, carouselView);
+
+			absolute.Children.Add(indicators, new Rectangle(.5, 1, -1, -1), AbsoluteLayoutFlags.PositionProportional);
+
+			grid.Children.Add(absolute, 0, 0);
 
 			var stacklayoutButtons = new StackLayout
 			{
@@ -92,9 +107,9 @@ public CarouselItemsGallery()
 			stacklayoutButtons.Children.Add(removeItemButton);
 			stacklayoutButtons.Children.Add(clearItemsButton);
 
-			layout.Children.Add(stacklayoutButtons, 0, 1);
+			grid.Children.Add(stacklayoutButtons, 0, 1);
 
-			Content = layout;
+			Content = grid;
 			BindingContext = viewModel;
 		}
 

Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselViewGallery.cs

@@ -33,14 +33,18 @@ public CarouselViewGallery()
 							new CarouselCodeGallery(ItemsLayoutOrientation.Vertical), Navigation),
 						GalleryBuilder.NavButton("CarouselView (XAML, Horizontal)", () =>
 							new CarouselXamlGallery(), Navigation),
-						GalleryBuilder.NavButton("CarouselView (Items)", () =>
+						GalleryBuilder.NavButton("CarouselView (Indicators Forms)", () =>
+							new CarouselItemsGallery(), Navigation),
+						GalleryBuilder.NavButton("CarouselView (Indicators Default (Native))", () =>
 							new CarouselItemsGallery(), Navigation),
 	  					GalleryBuilder.NavButton("CarouselView Snap", () =>
  							new CarouselSnapGallery(), Navigation),
 						GalleryBuilder.NavButton("ObservableCollection and CarouselView", () =>
  							new CollectionCarouselViewGallery(), Navigation),
 						GalleryBuilder.NavButton("CarouselView EmptyView", () =>
-  							new EmptyCarouselGallery(), Navigation)
+  							new EmptyCarouselGallery(), Navigation),    
+	  					GalleryBuilder.NavButton("IndicatorView", () =>
+  							new IndicatorCodeGallery(), Navigation)
 					}
 				}
 			};
@@ -54,7 +58,7 @@ void ButtonClicked(object sender, System.EventArgs e)
 			button.TextColor = Color.Black;
 			button.IsEnabled = false;
 
-			Device.SetFlags(new[] { ExperimentalFlags.CarouselViewExperimental });
+			Device.SetFlags(new[] { ExperimentalFlags.CarouselViewExperimental, ExperimentalFlags.IndicatorViewExperimental });
 		}
 	}
 }

Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/IndicatorCodeGallery.cs

@@ -0,0 +1,187 @@
+using System.Collections.Generic;
+using Xamarin.Forms.Internals;
+using Xamarin.Forms.PlatformConfiguration;
+using Xamarin.Forms.PlatformConfiguration.iOSSpecific;
+
+namespace Xamarin.Forms.Controls.GalleryPages.CollectionViewGalleries.CarouselViewGalleries
+{
+	[Preserve(AllMembers = true)]
+	public class IndicatorCodeGallery : ContentPage
+	{
+		public IndicatorCodeGallery()
+		{
+			Title = "IndicatorView Gallery";
+
+			On<iOS>().SetLargeTitleDisplay(LargeTitleDisplayMode.Never);
+
+			var nItems = 10;
+
+			var layout = new Grid
+			{
+				RowDefinitions = new RowDefinitionCollection
+				{
+					new RowDefinition { Height = GridLength.Auto },
+					new RowDefinition { Height = GridLength.Auto },
+					new RowDefinition { Height = GridLength.Auto },
+					new RowDefinition { Height = GridLength.Auto },
+					new RowDefinition { Height = GridLength.Star },
+					new RowDefinition { Height = GridLength.Auto }
+				}
+			};
+
+			var itemsLayout = new LinearItemsLayout(ItemsLayoutOrientation.Horizontal)
+			{
+				SnapPointsType = SnapPointsType.MandatorySingle,
+				SnapPointsAlignment = SnapPointsAlignment.Center
+			};
+
+			var itemTemplate = ExampleTemplates.CarouselTemplate();
+
+			var carouselView = new CarouselView
+			{
+				ItemsLayout = itemsLayout,
+				ItemTemplate = itemTemplate,
+				BackgroundColor = Color.LightGray,
+				AutomationId = "TheCarouselView"
+			};
+
+			layout.Children.Add(carouselView);
+
+			var generator = new ItemsSourceGenerator(carouselView, nItems, ItemsSourceType.ObservableCollection, false);
+
+			layout.Children.Add(generator);
+
+			generator.GenerateItems();
+
+			var indicatorView = new IndicatorView
+			{
+				HorizontalOptions = LayoutOptions.Center,
+				Margin = new Thickness(12, 6, 12, 24),
+				IndicatorColor = Color.Gray,
+				SelectedIndicatorColor = Color.Black,
+				IndicatorsShape = IndicatorShape.Square,
+				AutomationId = "TheIndicatorView"
+			};
+
+			IndicatorView.SetItemsSourceBy(indicatorView, carouselView);
+
+			layout.Children.Add(indicatorView);
+
+			var stckMaxVisible = new StackLayout { Orientation = StackOrientation.Horizontal };
+			stckMaxVisible.Children.Add(new Label { VerticalOptions = LayoutOptions.Center, Text = "MaximumVisible" });
+			var maxVisibleSlider = new Slider
+			{
+				Maximum = nItems,
+				Minimum = 0,
+				Value = nItems,
+				WidthRequest = 150,
+				BackgroundColor = Color.Pink
+			};
+			stckMaxVisible.Children.Add(maxVisibleSlider);
+
+			maxVisibleSlider.ValueChanged += (s, e) =>
+			{
+				var maximumVisible = (int)maxVisibleSlider.Value;
+				indicatorView.MaximumVisible = maximumVisible;
+			};
+
+			layout.Children.Add(stckMaxVisible);
+
+			var stckColors = new StackLayout { Orientation = StackOrientation.Horizontal };
+			stckColors.Children.Add(new Label { VerticalOptions = LayoutOptions.Center, Text = "IndicatorColor" });
+
+			var colors = new List<string>
+   			{
+				"Black",
+				"Blue",
+				"Red"
+			};
+
+			var colorsPicker = new Picker
+			{
+				ItemsSource = colors,
+				WidthRequest = 150
+			};
+			colorsPicker.SelectedIndex = 0;
+
+			colorsPicker.SelectedIndexChanged += (s, e) =>
+			{
+				var selectedIndex = colorsPicker.SelectedIndex;
+
+				switch (selectedIndex)
+				{
+					case 0:
+						indicatorView.IndicatorColor = Color.Black;
+						break;
+					case 1:
+						indicatorView.IndicatorColor = Color.Blue;
+						break;
+					case 2:
+						indicatorView.IndicatorColor = Color.Red;
+						break;
+				}
+			};
+
+			stckColors.Children.Add(colorsPicker);
+
+			layout.Children.Add(stckColors);
+
+			var stckTemplate = new StackLayout { Orientation = StackOrientation.Horizontal };
+			stckTemplate.Children.Add(new Label { VerticalOptions = LayoutOptions.Center, Text = "IndicatorTemplate" });
+
+			var templates = new List<string>
+			{
+				"Circle",
+				"Square",
+				"Template"
+			};
+
+			var templatePicker = new Picker
+			{
+				ItemsSource = templates,
+				WidthRequest = 150,
+				TextColor = Color.Black
+			};
+
+			templatePicker.SelectedIndexChanged += (s, e) =>
+			{
+				var selectedIndex = templatePicker.SelectedIndex;
+
+				switch (selectedIndex)
+				{
+					case 0:
+						indicatorView.IndicatorTemplate = null;
+						indicatorView.IndicatorsShape = IndicatorShape.Circle;
+						break;
+					case 1:
+						indicatorView.IndicatorTemplate = null;
+						indicatorView.IndicatorsShape = IndicatorShape.Square;
+						break;
+					case 2:
+						indicatorView.IndicatorTemplate = ExampleTemplates.IndicatorTemplate();
+						break;
+				}
+			};
+
+			templatePicker.SelectedIndex = 0;
+
+			stckTemplate.Children.Add(templatePicker);
+
+			layout.Children.Add(stckTemplate);
+
+			Grid.SetRow(generator, 0);
+			Grid.SetRow(stckMaxVisible, 1);
+			Grid.SetRow(stckColors, 2);
+			Grid.SetRow(stckTemplate, 3);
+			Grid.SetRow(carouselView, 4);
+			Grid.SetRow(indicatorView, 5);
+
+			Content = layout;
+
+			generator.CollectionChanged += (sender, e) =>
+			{
+				maxVisibleSlider.Maximum = generator.Count;
+			};
+		}
+	}
+}

Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ExampleTemplates.cs

@@ -150,6 +150,28 @@ public static DataTemplate CarouselTemplate()
 			});
 		}
 
+		public static DataTemplate IndicatorTemplate()
+		{
+			return new DataTemplate(() =>
+			{
+				var image = new Image
+				{
+					HorizontalOptions = LayoutOptions.Center,
+					VerticalOptions = LayoutOptions.Center,
+					Aspect = Aspect.AspectFill,
+					Source = new FontImageSource
+					{
+						FontFamily = DefaultFontFamily(),
+						Glyph = "\uf30c",
+					},
+					HeightRequest = 10,
+					WidthRequest = 10
+				};
+
+				return image;
+			});
+		}
+
 		public static DataTemplate ScrollToIndexTemplate()
 		{
 			return new DataTemplate(() =>
@@ -469,6 +491,26 @@ static void More_Clicked(object sender, EventArgs e)
 			throw new NotImplementedException();
 		}
 
+		static string DefaultFontFamily()
+		{
+			var fontFamily = "";
+			switch (Device.RuntimePlatform)
+			{
+				case Device.iOS:
+					fontFamily = "Ionicons";
+					break;
+				case Device.UWP:
+					fontFamily = "Assets/Fonts/ionicons.ttf#ionicons";
+					break;
+				case Device.Android:
+				default:
+					fontFamily = "fonts/ionicons.ttf#";
+					break;
+			}
+
+			return fontFamily;
+		}
+
 		class IndexRequestConverter : IValueConverter
 		{
 			readonly int _cutoff;

Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemsSourceGenerator.cs

@@ -27,7 +27,7 @@ internal class ItemsSourceGenerator : ContentView
 
 		public int Count => _count;
 		public ItemsSourceGenerator(ItemsView cv, int initialItems = 1000, 
-			ItemsSourceType itemsSourceType = ItemsSourceType.List)
+			ItemsSourceType itemsSourceType = ItemsSourceType.List, bool sideItems = true)
 		{
 			_count = initialItems;
 			_cv = cv;
@@ -40,14 +40,20 @@ public ItemsSourceGenerator(ItemsView cv, int initialItems = 1000,
 
 			var button = new Button { Text = "Update", AutomationId = "btnUpdate"  };
 			var label = new Label { Text = "Items:", VerticalTextAlignment = TextAlignment.Center };
-			var labelSideItems = new Label { Text = "Side items:", VerticalTextAlignment = TextAlignment.Center };
 			_entry = new Entry { Keyboard = Keyboard.Numeric, Text = initialItems.ToString(), WidthRequest = 100, AutomationId = "entryUpdate" };
-			_entrySideItems = new Entry { Keyboard = Keyboard.Numeric, Text = carousel?.NumberOfSideItems.ToString(), WidthRequest = 100, AutomationId = "entrySideItemsUpdate" };
 
 			layout.Children.Add(label);
 			layout.Children.Add(_entry);
-			layout.Children.Add(labelSideItems);
-			layout.Children.Add(_entrySideItems);
+
+			if (sideItems)
+			{
+				var labelSideItems = new Label { Text = "Side items:", VerticalTextAlignment = TextAlignment.Center };
+				_entrySideItems = new Entry { Keyboard = Keyboard.Numeric, Text = carousel?.NumberOfSideItems.ToString(), WidthRequest = 100, AutomationId = "entrySideItemsUpdate" };
+
+				layout.Children.Add(labelSideItems);
+				layout.Children.Add(_entrySideItems);
+			}
+
 			layout.Children.Add(button);
 
 			button.Clicked += GenerateItems;
@@ -169,7 +175,7 @@ void GenerateItems(object sender, EventArgs e)
 			if (carousel == null)
 				return;
 
-			if (int.TryParse(_entrySideItems.Text, out int count))
+			if (int.TryParse(_entrySideItems?.Text, out int count))
 				carousel.NumberOfSideItems = count;
 		}
 	}