Implement Font properties in PickerHandlers (#589)

dotnet · Apr 7, 2021 · b83f98a · b83f98a
1 parent 0736879
commit b83f98a
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 9 deletions.
diff --git a/src/Compatibility/Core/src/Android/AppCompat/PickerRenderer.cs b/src/Compatibility/Core/src/Android/AppCompat/PickerRenderer.cs
@@ -155,6 +155,7 @@ void RowsCollectionChanged(object sender, EventArgs e)
 			UpdatePicker();
 		}
 
+		[PortHandler]
 		void UpdateFont()
 		{
 			EditText.Typeface = Element.ToTypeface();

diff --git a/src/Compatibility/Core/src/iOS/Renderers/PickerRenderer.cs b/src/Compatibility/Core/src/iOS/Renderers/PickerRenderer.cs
@@ -203,6 +203,7 @@ protected void UpdateCharacterSpacing()
 				UpdateAttributedPlaceholder(placeHolder);
 		}
 
+		[PortHandler]
         protected internal virtual void UpdateFont()
 		{
 			Control.Font = Element.ToUIFont();			

diff --git a/src/Controls/samples/Controls.Sample/Pages/MainPage.cs b/src/Controls/samples/Controls.Sample/Pages/MainPage.cs
@@ -171,7 +171,7 @@ void SetupMauiLayout()
 				"Japanese Macaque"
 			};
 
-			var picker = new Picker { Title = "Select a monkey" };
+			var picker = new Picker { Title = "Select a monkey", FontFamily = "Dokdo" };
 
 			picker.ItemsSource = monkeyList;
 			verticalStack.Add(picker);

diff --git a/src/Core/src/Handlers/Picker/PickerHandler.Android.cs b/src/Core/src/Handlers/Picker/PickerHandler.Android.cs
@@ -2,6 +2,7 @@
 using System.Collections.Specialized;
 using System.Linq;
 using Android.App;
+using Microsoft.Extensions.DependencyInjection;
 using AResource = Android.Resource;
 
 namespace Microsoft.Maui.Handlers
@@ -49,8 +50,14 @@ public static void MapCharacterSpacing(PickerHandler handler, IPicker picker)
 			handler.NativeView?.UpdateCharacterSpacing(picker);
 		}
 
-		[MissingMapper]
-		public static void MapFont(PickerHandler handler, IPicker view) { }
+		public static void MapFont(PickerHandler handler, IPicker picker)
+		{
+			_ = handler.Services ?? throw new InvalidOperationException($"{nameof(Services)} should have been set by base class.");
+
+			var fontManager = handler.Services.GetRequiredService<IFontManager>();
+
+			handler.NativeView?.UpdateFont(picker, fontManager);
+		}
 
 		[MissingMapper]
 		public static void MapTextColor(PickerHandler handler, IPicker view) { }

diff --git a/src/Core/src/Handlers/Picker/PickerHandler.iOS.cs b/src/Core/src/Handlers/Picker/PickerHandler.iOS.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Specialized;
+using Microsoft.Extensions.DependencyInjection;
 using UIKit;
 using RectangleF = CoreGraphics.CGRect;
 
@@ -106,8 +107,14 @@ public static void MapCharacterSpacing(PickerHandler handler, IPicker picker)
 			handler.NativeView?.UpdateCharacterSpacing(picker);
 		}
 
-		[MissingMapper]
-		public static void MapFont(PickerHandler handler, IPicker view) { }
+		public static void MapFont(PickerHandler handler, IPicker picker)
+		{
+			_ = handler.Services ?? throw new InvalidOperationException($"{nameof(Services)} should have been set by base class.");
+
+			var fontManager = handler.Services.GetRequiredService<IFontManager>();
+
+			handler.NativeView?.UpdateFont(picker, fontManager);
+		}
 
 		[MissingMapper]
 		public static void MapTextColor(PickerHandler handler, IPicker view) { }

diff --git a/src/Core/src/Platform/iOS/PickerExtensions.cs b/src/Core/src/Platform/iOS/PickerExtensions.cs
@@ -1,7 +1,5 @@
 using System;
-using Foundation;
 using Microsoft.Maui.Handlers;
-using UIKit;
 
 namespace Microsoft.Maui
 {
@@ -39,7 +37,7 @@ internal static void SetSelectedIndex(this MauiPicker nativePicker, IPicker pick
 			if (pickerView?.Model is PickerSource source)
 			{
 				source.SelectedIndex = selectedIndex;
-				source.SelectedItem = selectedIndex >= 0 ? picker.Items[selectedIndex] : null;
+				source.SelectedItem = (selectedIndex >= 0 && picker.Items.Count > selectedIndex) ? picker.Items[selectedIndex] : null;
 			}
 
 			pickerView?.Select(Math.Max(selectedIndex, 0), 0, true);

diff --git a/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.Android.cs
@@ -72,5 +72,17 @@ double GetNativeCharacterSpacing(PickerHandler pickerHandler)
 
 			return -1;
 		}
+
+		double GetNativeUnscaledFontSize(PickerHandler pickerHandler)
+		{
+			var mauiPicker = GetNativePicker(pickerHandler);
+			return mauiPicker.TextSize / mauiPicker.Resources.DisplayMetrics.Density;
+		}
+
+		bool GetNativeIsBold(PickerHandler pickerHandler) =>
+			GetNativePicker(pickerHandler).Typeface.IsBold;
+
+		bool GetNativeIsItalic(PickerHandler pickerHandler) =>
+			GetNativePicker(pickerHandler).Typeface.IsItalic;
 	}
 }
diff --git a/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.cs b/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.cs
@@ -1,10 +1,65 @@
-using Microsoft.Maui.DeviceTests.Stubs;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Maui.DeviceTests.Stubs;
 using Microsoft.Maui.Handlers;
+using Xunit;
 
 namespace Microsoft.Maui.DeviceTests
 {
 	[Category(TestCategory.Picker)]
 	public partial class PickerHandlerTests : HandlerTestBase<PickerHandler, PickerStub>
 	{
+		[Theory(DisplayName = "Font Size Initializes Correctly")]
+		[InlineData(1)]
+		[InlineData(10)]
+		[InlineData(20)]
+		[InlineData(100)]
+		public async Task FontSizeInitializesCorrectly(int fontSize)
+		{
+			var items = new List<string>
+			{
+				"Item 1",
+				"Item 2",
+				"Item 3"
+			};
+
+			var picker = new PickerStub()
+			{
+				Title = "Select an Item",
+				Font = Font.OfSize("Arial", fontSize)
+			};
+
+			picker.ItemsSource = items;
+			picker.SelectedIndex = 0;
+
+			await ValidatePropertyInitValue(picker, () => picker.Font.FontSize, GetNativeUnscaledFontSize, picker.Font.FontSize);
+		}
+
+		[Theory(DisplayName = "Font Attributes Initialize Correctly")]
+		[InlineData(FontAttributes.None, false, false)]
+		[InlineData(FontAttributes.Bold, true, false)]
+		[InlineData(FontAttributes.Italic, false, true)]
+		[InlineData(FontAttributes.Bold | FontAttributes.Italic, true, true)]
+		public async Task FontAttributesInitializeCorrectly(FontAttributes attributes, bool isBold, bool isItalic)
+		{
+			var items = new List<string>
+			{
+				"Item 1",
+				"Item 2",
+				"Item 3"
+			};
+
+			var picker = new PickerStub()
+			{
+				Title = "Select an Item",
+				Font = Font.OfSize("Arial", 10).WithAttributes(attributes)
+			};
+
+			picker.ItemsSource = items;
+			picker.SelectedIndex = 0;
+
+			await ValidatePropertyInitValue(picker, () => picker.Font.FontAttributes.HasFlag(FontAttributes.Bold), GetNativeIsBold, isBold);
+			await ValidatePropertyInitValue(picker, () => picker.Font.FontAttributes.HasFlag(FontAttributes.Italic), GetNativeIsItalic, isItalic);
+		}
 	}
 }
diff --git a/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.iOS.cs b/src/Core/tests/DeviceTests/Handlers/Picker/PickerHandlerTests.iOS.cs
@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using Microsoft.Maui.Handlers;
+using UIKit;
 using Xunit;
 
 namespace Microsoft.Maui.DeviceTests
@@ -36,5 +37,14 @@ async Task ValidateNativeSelectedIndex(IPicker slider, int selectedIndex)
 			});
 			Assert.Equal(expected, selectedIndex);
 		}
+
+		double GetNativeUnscaledFontSize(PickerHandler pickerHandler) =>
+			GetNativePicker(pickerHandler).Font.PointSize;
+
+		bool GetNativeIsBold(PickerHandler pickerHandler) =>
+			GetNativePicker(pickerHandler).Font.FontDescriptor.SymbolicTraits.HasFlag(UIFontDescriptorSymbolicTraits.Bold);
+
+		bool GetNativeIsItalic(PickerHandler pickerHandler) =>
+			GetNativePicker(pickerHandler).Font.FontDescriptor.SymbolicTraits.HasFlag(UIFontDescriptorSymbolicTraits.Italic);
 	}
 }