🐛 Fix system font bug

Fixes #70

Author: roycornelissen

src/GMImagePicker/FontParser.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Linq;
+using UIKit;
+
+namespace GMImagePicker
+{
+	internal static class FontParser
+	{
+		public static UIFont GetFont(string family, nfloat size)
+		{
+			UIFont result;
+
+			if (family.StartsWith(".SFUI", System.StringComparison.InvariantCultureIgnoreCase))
+			{
+				var fontWeight = family.Split('-').LastOrDefault();
+
+				if (!string.IsNullOrWhiteSpace(fontWeight) && System.Enum.TryParse<UIFontWeight>(fontWeight, true, out var uIFontWeight))
+				{
+					result = UIFont.SystemFontOfSize(size, uIFontWeight);
+					return result;
+				}
+
+				result = UIFont.SystemFontOfSize(size, UIFontWeight.Regular);
+				return result;
+			}
+			else
+			{
+				result = GetFont(family, size);
+				if (result != null)
+					return result;
+			}
+
+			// fallback
+			return UIFont.SystemFontOfSize(size);
+		}
+	}
+}

src/GMImagePicker/GMAlbumsViewController.cs

@@ -16,6 +16,7 @@
 using System.Collections.Generic;
 using CoreFoundation;
 using System.Diagnostics;
+using CoreText;
 
 namespace GMImagePicker
 {
@@ -121,7 +122,7 @@ public override void ViewDidLoad()
 			// Buttons
 			var barButtonItemAttributes = new UITextAttributes
 			{
-				Font = UIFont.FromName(_picker.PickerFontName, _picker.PickerFontHeaderSize)
+				Font = FontParser.GetFont(_picker.PickerFontName, _picker.PickerFontHeaderSize)
 			};
 
 			var cancelTitle = _picker.CustomCancelButtonTitle ?? "picker.navigation.cancel-button".Translate(defaultValue: "Cancel");
@@ -324,7 +325,7 @@ public override UITableViewCell GetCell(UITableView tableView, NSIndexPath index
 			cell.Tag = currentTag;
 
 			// Set the label
-			cell.TextLabel.Font = UIFont.FromName(_picker.PickerFontName, _picker.PickerFontHeaderSize);
+			cell.TextLabel.Font = FontParser.GetFont(_picker.PickerFontName, _picker.PickerFontHeaderSize);
 			cell.TextLabel.Text = _collectionsFetchResultsTitles[indexPath.Section][indexPath.Row];
 			cell.TextLabel.TextColor = _picker.PickerTextColor;
 
@@ -334,7 +335,7 @@ public override UITableViewCell GetCell(UITableView tableView, NSIndexPath index
 			// Display the number of assets
 			if (_picker.DisplayAlbumsNumberOfAssets)
 			{
-				cell.DetailTextLabel.Font = UIFont.FromName(_picker.PickerFontName, _picker.PickerFontNormalSize);
+				cell.DetailTextLabel.Font = FontParser.GetFont(_picker.PickerFontName, _picker.PickerFontNormalSize);
 				// Just use the number of assets. Album app does this:
 				cell.DetailTextLabel.Text = string.Format("{0:0}", assetsFetchResult.Count);
 				cell.DetailTextLabel.TextColor = _picker.PickerTextColor;
@@ -456,7 +457,7 @@ public override void WillDisplayHeaderView(UITableView tableView, UIView headerV
 			header.BackgroundView.BackgroundColor = _picker.PickerBackgroundColor;
 
 			// Default is a bold font, but keep this styled as a normal font
-			header.TextLabel.Font = UIFont.FromName(_picker.PickerFontName, _picker.PickerFontNormalSize);
+			header.TextLabel.Font = FontParser.GetFont(_picker.PickerFontName, _picker.PickerFontNormalSize);
 			header.TextLabel.TextColor = _picker.PickerTextColor;
 		}
 

src/GMImagePicker/GMGridViewController.cs

@@ -163,7 +163,7 @@ private void SetupButtons ()
 			}
 			if (_picker.UseCustomFontForNavigationBar) {
 				var barButtonItemAttributes = new UITextAttributes {
-					Font = UIFont.FromName(_picker.PickerFontName, _picker.PickerFontHeaderSize)
+					Font = FontParser.GetFont(_picker.PickerFontName, _picker.PickerFontHeaderSize)
 				};
 				NavigationItem.RightBarButtonItem.SetTitleTextAttributes (barButtonItemAttributes, UIControlState.Normal);
 				NavigationItem.RightBarButtonItem.SetTitleTextAttributes (barButtonItemAttributes, UIControlState.Highlighted);

src/GMImagePicker/GMImagePicker.csproj

@@ -21,7 +21,10 @@
     <PackageLicenseUrl>https://raw.githubusercontent.com/roycornelissen/GMImagePicker.Xamarin/master/LICENSE</PackageLicenseUrl>
     <Owners>Roy Cornelissen</Owners>
     <PackageProjectUrl>https://github.com/roycornelissen/GMImagePicker.Xamarin</PackageProjectUrl>
-    <PackageReleaseNotes>[2.3.5]
+    <PackageReleaseNotes>[2.3.6]
+- #70 Fixes system fonts in iOS 13 reverting to TimesNewRoman.
+- #71 Fixes Picker auto scroll to bottom when selecting images. Thanks @dustintnguyen
+[2.3.5]
 - #65: Fixes the checkmark image not being visible on selected items. Thanks @sergbuk
 [2.3.4]
 - #58: Fixes for Norwegian translations. Thanks @jasonctoms
@@ -131,6 +134,7 @@
     <Compile Include="Events.cs" />
     <Compile Include="GMAlbumsViewController.cs" />
     <Compile Include="TranslationExtensions.cs" />
+    <Compile Include="FontParser.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <ItemGroup>

src/GMImagePicker/GMImagePickerController.cs

@@ -704,7 +704,7 @@ public sealed override async void ViewWillAppear (bool animated)
 				UIStringAttributes attributes;
 				if (UseCustomFontForNavigationBar) {
 					attributes = new UIStringAttributes { ForegroundColor = NavigationBarTextColor, 
-						Font = UIFont.FromName (PickerBoldFontName, PickerFontHeaderSize)
+						Font = FontParser.GetFont (PickerBoldFontName, PickerFontHeaderSize)
 					};
 				} else {
 					attributes = new UIStringAttributes { ForegroundColor = NavigationBarTextColor };
@@ -885,7 +885,7 @@ private UITextAttributes ToolbarTitleTextAttributes
 			get {
 				return new UITextAttributes {
 					TextColor = ToolbarTextColor,
-					Font = UIFont.FromName (PickerFontName, PickerFontHeaderSize)
+					Font = FontParser.GetFont (PickerFontName, PickerFontHeaderSize)
 				};
 			}
 		}

src/GMPhotoPicker.Xamarin/Info.plist

@@ -13,7 +13,7 @@
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>MinimumOSVersion</key>
-	<string>13.2</string>
+	<string>13.4</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>