Entry keyboard handler

src/Compatibility/Core/src/Android/Compatibility.Android.csproj

@@ -13,6 +13,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="AppCompat\Resource.cs" />
+    <Compile Remove="Renderers\LocalizedDigitsKeyListener.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\anim\enterfromleft.xml" />

src/Compatibility/Core/src/Android/Renderers/EntryRenderer.cs

@@ -319,7 +319,8 @@ protected virtual void UpdateFont()
 			EditText.SetTextSize(ComplexUnitType.Sp, (float)Element.FontSize);
 		}
 
-		[PortHandler("Partially ported")]
+		[PortHandler("IsSpellCheckEnabled is missing.")]
+		[PortHandler("No override for GetDigitsKeyListener")]
 		void UpdateInputType()
 		{
 			Entry model = Element;

src/Compatibility/Core/src/iOS/Cells/EntryCellRenderer.cs

@@ -1,6 +1,7 @@
 using System;
 using System.ComponentModel;
 using Foundation;
+using Microsoft.Maui.Platform.iOS;
 using UIKit;
 using RectangleF = CoreGraphics.CGRect;
 

src/Compatibility/Core/src/iOS/Extensions/Extensions.cs

@@ -6,77 +6,9 @@
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
+	[PortHandler("Following methods still need to be ported.")]
 	public static class Extensions
 	{
-		public static void ApplyKeyboard(this IUITextInput textInput, Keyboard keyboard)
-		{
-			if(textInput is IUITextInputTraits traits)
-				ApplyKeyboard(traits, keyboard);
-		}
-
-		public static void ApplyKeyboard(this IUITextInputTraits textInput, Keyboard keyboard)
-		{
-			textInput.AutocapitalizationType = UITextAutocapitalizationType.None;
-			textInput.AutocorrectionType = UITextAutocorrectionType.No;
-			textInput.SpellCheckingType = UITextSpellCheckingType.No;
-			textInput.KeyboardType = UIKeyboardType.Default;
-
-			if (keyboard == Keyboard.Default)
-			{
-				textInput.AutocapitalizationType = UITextAutocapitalizationType.Sentences;
-				textInput.AutocorrectionType = UITextAutocorrectionType.Default;
-				textInput.SpellCheckingType = UITextSpellCheckingType.Default;
-			}
-			else if (keyboard == Keyboard.Chat)
-			{
-				textInput.AutocapitalizationType = UITextAutocapitalizationType.Sentences;
-				textInput.AutocorrectionType = UITextAutocorrectionType.Yes;
-			}
-			else if (keyboard == Keyboard.Email)
-				textInput.KeyboardType = UIKeyboardType.EmailAddress;
-			else if (keyboard == Keyboard.Numeric)
-				textInput.KeyboardType = UIKeyboardType.DecimalPad;
-			else if (keyboard == Keyboard.Telephone)
-				textInput.KeyboardType = UIKeyboardType.PhonePad;
-			else if (keyboard == Keyboard.Text)
-			{
-				textInput.AutocapitalizationType = UITextAutocapitalizationType.Sentences;
-				textInput.AutocorrectionType = UITextAutocorrectionType.Yes;
-				textInput.SpellCheckingType = UITextSpellCheckingType.Yes;
-			}
-			else if (keyboard == Keyboard.Url)
-				textInput.KeyboardType = UIKeyboardType.Url;
-			else if (keyboard is CustomKeyboard)
-			{
-				var custom = (CustomKeyboard)keyboard;
-
-				var capitalizedSentenceEnabled = (custom.Flags & KeyboardFlags.CapitalizeSentence) == KeyboardFlags.CapitalizeSentence;
-				var capitalizedWordsEnabled = (custom.Flags & KeyboardFlags.CapitalizeWord) == KeyboardFlags.CapitalizeWord;
-				var capitalizedCharacterEnabled = (custom.Flags & KeyboardFlags.CapitalizeCharacter) == KeyboardFlags.CapitalizeCharacter;
-				var capitalizedNone = (custom.Flags & KeyboardFlags.None) == KeyboardFlags.None;
-
-				var spellcheckEnabled = (custom.Flags & KeyboardFlags.Spellcheck) == KeyboardFlags.Spellcheck;
-				var suggestionsEnabled = (custom.Flags & KeyboardFlags.Suggestions) == KeyboardFlags.Suggestions;
-
-
-				UITextAutocapitalizationType capSettings = UITextAutocapitalizationType.None;
-
-				// Sentence being first ensures that the behavior of ALL is backwards compatible
-				if (capitalizedSentenceEnabled)
-					capSettings = UITextAutocapitalizationType.Sentences;
-				else if (capitalizedWordsEnabled)
-					capSettings = UITextAutocapitalizationType.Words;
-				else if (capitalizedCharacterEnabled)
-					capSettings = UITextAutocapitalizationType.AllCharacters;
-				else if (capitalizedNone)
-					capSettings = UITextAutocapitalizationType.None;
-
-				textInput.AutocapitalizationType = capSettings;
-				textInput.AutocorrectionType = suggestionsEnabled ? UITextAutocorrectionType.Yes : UITextAutocorrectionType.No;
-				textInput.SpellCheckingType = spellcheckEnabled ? UITextSpellCheckingType.Yes : UITextSpellCheckingType.No;
-			}
-		}
-
 		public static UIModalPresentationStyle ToNativeModalPresentationStyle(this PlatformConfiguration.iOSSpecific.UIModalPresentationStyle style)
 		{
 			switch (style)
@@ -150,64 +82,6 @@ internal static DeviceOrientation ToDeviceOrientation(this UIDeviceOrientation o
 			}
 		}
 
-		[PortHandler]
-		internal static NSMutableAttributedString AddCharacterSpacing(this NSAttributedString attributedString, string text, double characterSpacing)
-		{
-			if (attributedString == null && characterSpacing == 0)
-				return null;
-
-			NSMutableAttributedString mutableAttributedString = attributedString as NSMutableAttributedString;
-			if (attributedString == null || attributedString.Length == 0)
-			{
-				mutableAttributedString = text == null ? new NSMutableAttributedString() : new NSMutableAttributedString(text);
-			}
-			else
-			{
-				mutableAttributedString = new NSMutableAttributedString(attributedString);
-
-				if (!mutableAttributedString.MutableString.ToString().Equals(text))
-				{
-					mutableAttributedString.MutableString.SetString(new NSString(text));
-				}
-			}
-
-			AddKerningAdjustment(mutableAttributedString, text, characterSpacing);
-
-			return mutableAttributedString;
-		}
-
-		[PortHandler]
-		internal static bool HasCharacterAdjustment(this NSMutableAttributedString mutableAttributedString)
-		{
-			if (mutableAttributedString == null)
-				return false;
-
-			NSRange removalRange;
-			var attributes = mutableAttributedString.GetAttributes(0, out removalRange);
-
-			for (uint i = 0; i < attributes.Count; i++)
-				if (attributes.Keys[i] is NSString nSString && nSString == UIStringAttributeKey.KerningAdjustment)
-					return true;
-
-			return false;
-		}
-
-		[PortHandler]
-		internal static void AddKerningAdjustment(NSMutableAttributedString mutableAttributedString, string text, double characterSpacing)
-		{
-			if (!string.IsNullOrEmpty(text))
-			{
-				if (characterSpacing == 0 && !mutableAttributedString.HasCharacterAdjustment())
-					return;
-
-				mutableAttributedString.AddAttribute
-				(
-					UIStringAttributeKey.KerningAdjustment,
-					NSObject.FromObject(characterSpacing), new NSRange(0, text.Length - 1)
-				);
-			}
-		}
-
 		internal static bool IsHorizontal(this Button.ButtonContentLayout layout) =>
 			layout.Position == Button.ButtonContentLayout.ImagePosition.Left ||
 			layout.Position == Button.ButtonContentLayout.ImagePosition.Right;

src/Compatibility/Core/src/iOS/Platform.cs

@@ -9,6 +9,7 @@
 using RectangleF = CoreGraphics.CGRect;
 using Microsoft.Maui.Controls.Internals;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using Microsoft.Maui.Platform.iOS;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {

src/Compatibility/Core/src/iOS/Renderers/ButtonLayoutManager.cs

@@ -3,6 +3,7 @@
 using System.Threading.Tasks;
 using CoreGraphics;
 using Foundation;
+using Microsoft.Maui.Platform.iOS;
 using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
@@ -209,17 +210,17 @@ internal void UpdateText()
 			var normal =
 				control
 					.GetAttributedTitle(UIControlState.Normal)
-					.AddCharacterSpacing(text, _element.CharacterSpacing);
+					.WithCharacterSpacing(_element.CharacterSpacing);
 
 			var highlighted =
 				control
 					.GetAttributedTitle(UIControlState.Highlighted)
-					.AddCharacterSpacing(text, _element.CharacterSpacing);
+					.WithCharacterSpacing(_element.CharacterSpacing);
 
 			var disabled =
 				control
 					.GetAttributedTitle(UIControlState.Disabled)
-					.AddCharacterSpacing(text, _element.CharacterSpacing);
+					.WithCharacterSpacing(_element.CharacterSpacing);
 
 			normal.AddAttribute(
 				UIStringAttributeKey.ForegroundColor,

src/Compatibility/Core/src/iOS/Renderers/DatePickerRenderer.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using Foundation;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using Microsoft.Maui.Platform.iOS;
 using UIKit;
 using RectangleF = CoreGraphics.CGRect;
 
@@ -217,7 +218,7 @@ protected internal virtual void UpdateFont()
 		[PortHandler]
 		void UpdateCharacterSpacing()
 		{
-			var textAttr = Control.AttributedText.AddCharacterSpacing(Control.Text, Element.CharacterSpacing);
+			var textAttr = Control.AttributedText.WithCharacterSpacing(Element.CharacterSpacing);
 
 			if (textAttr != null)
 				Control.AttributedText = textAttr;

src/Compatibility/Core/src/iOS/Renderers/EditorRenderer.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using CoreGraphics;
 using Foundation;
+using Microsoft.Maui.Platform.iOS;
 using UIKit;
 using RectangleF = CoreGraphics.CGRect;
 
@@ -74,12 +75,12 @@ protected internal override void UpdatePlaceholderText()
 		[PortHandler("Partially ported")]
 		protected internal override void UpdateCharacterSpacing()
 		{
-			var textAttr = TextView.AttributedText.AddCharacterSpacing(Element.Text, Element.CharacterSpacing);
+			var textAttr = TextView.AttributedText.WithCharacterSpacing(Element.CharacterSpacing);
 
 			if(textAttr != null)
 				TextView.AttributedText = textAttr;
 
-			var placeHolder = _placeholderLabel.AttributedText.AddCharacterSpacing(Element.Placeholder, Element.CharacterSpacing);
+			var placeHolder = _placeholderLabel.AttributedText.WithCharacterSpacing(Element.CharacterSpacing);
 
 			if(placeHolder != null)
 				_placeholderLabel.AttributedText = placeHolder;
@@ -122,7 +123,7 @@ void CreatePlaceholderLabel()
 			);
 
 			_placeholderLabel.TranslatesAutoresizingMaskIntoConstraints = false;
-			_placeholderLabel.AttributedText = _placeholderLabel.AttributedText.AddCharacterSpacing(Element.Placeholder, Element.CharacterSpacing);
+			_placeholderLabel.AttributedText = _placeholderLabel.AttributedText.WithCharacterSpacing(Element.CharacterSpacing);
 
 			Control.AddConstraints(hConstraints);
 			Control.AddConstraints(vConstraints);

src/Compatibility/Core/src/iOS/Renderers/EntryRenderer.cs

@@ -7,6 +7,7 @@
 using UIKit;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using Specifics = Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific.Entry;
+using Microsoft.Maui.Platform.iOS;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -360,7 +361,7 @@ protected virtual void UpdatePlaceholder()
 				UpdateAttributedPlaceholder(formatted.ToAttributed(Element, color));
 			}
 
-			UpdateAttributedPlaceholder(Control.AttributedPlaceholder.AddCharacterSpacing(Element.Placeholder, Element.CharacterSpacing));
+			UpdateAttributedPlaceholder(Control.AttributedPlaceholder.WithCharacterSpacing(Element.CharacterSpacing));
 		}
 
 		protected virtual void UpdateAttributedPlaceholder(NSAttributedString nsAttributedString) =>
@@ -378,12 +379,12 @@ void UpdateText()
 		[PortHandler ("Partially ported ...")]
 		void UpdateCharacterSpacing()
 		{
-			var textAttr = Control.AttributedText.AddCharacterSpacing(Element.Text, Element.CharacterSpacing);
+			var textAttr = Control.AttributedText.WithCharacterSpacing(Element.CharacterSpacing);
 
 			if (textAttr != null)
 				Control.AttributedText = textAttr;
 
-			var placeHolder = Control.AttributedPlaceholder.AddCharacterSpacing(Element.Placeholder, Element.CharacterSpacing);
+			var placeHolder = Control.AttributedPlaceholder.WithCharacterSpacing(Element.CharacterSpacing);
 
 			if (placeHolder != null)
 				UpdateAttributedPlaceholder(placeHolder);

src/Compatibility/Core/src/iOS/Renderers/LabelRenderer.cs

@@ -5,6 +5,7 @@
 using Foundation;
 using System.Collections.Generic;
 using System.Diagnostics;
+using Microsoft.Maui.Platform.iOS;
 
 #if __MOBILE__
 using UIKit;
@@ -417,7 +418,7 @@ void UpdateCharacterSpacing()
 			if (string.IsNullOrEmpty(Element.Text))
 				return;
 #if __MOBILE__
-			var textAttr = Control.AttributedText.AddCharacterSpacing(Element.Text, Element.CharacterSpacing);
+			var textAttr = Control.AttributedText.WithCharacterSpacing(Element.CharacterSpacing);
 
 			if (textAttr != null)
 				Control.AttributedText = textAttr;

src/Compatibility/Core/src/iOS/Renderers/PickerRenderer.cs

@@ -8,6 +8,7 @@
 using UIKit;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using RectangleF = CoreGraphics.CGRect;
+using Microsoft.Maui.Platform.iOS;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -192,12 +193,12 @@ protected void UpdateCharacterSpacing()
 			if (Control == null)
 				return;
 
-			var textAttr = Control.AttributedText.AddCharacterSpacing(Control.Text, Element.CharacterSpacing);
+			var textAttr = Control.AttributedText.WithCharacterSpacing(Element.CharacterSpacing);
 
 			if (textAttr != null)
 				Control.AttributedText = textAttr;
 
-			var placeHolder = Control.AttributedPlaceholder.AddCharacterSpacing(Element.Title, Element.CharacterSpacing);
+			var placeHolder = Control.AttributedPlaceholder.WithCharacterSpacing(Element.CharacterSpacing);
 
 			if (placeHolder != null)
 				UpdateAttributedPlaceholder(placeHolder);
@@ -230,7 +231,7 @@ protected internal virtual void UpdatePlaceholder()
 				UpdateAttributedPlaceholder(formatted.ToAttributed(Element, color));
 			}
 
-			UpdateAttributedPlaceholder(Control.AttributedPlaceholder.AddCharacterSpacing(Element.Title, Element.CharacterSpacing));
+			UpdateAttributedPlaceholder(Control.AttributedPlaceholder.WithCharacterSpacing(Element.CharacterSpacing));
 		}
 
 		protected virtual void UpdateAttributedPlaceholder(NSAttributedString nsAttributedString) => 

src/Compatibility/Core/src/iOS/Renderers/SearchBarRenderer.cs

@@ -5,6 +5,7 @@
 using Foundation;
 using UIKit;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
+using Microsoft.Maui.Platform.iOS;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -233,8 +234,8 @@ void UpdateCharacterSpacing()
 			if (_textField == null)
 				return;
 
-			_textField.AttributedText = _textField.AttributedText.AddCharacterSpacing(Element.Text, Element.CharacterSpacing);
-			_textField.AttributedPlaceholder = _textField.AttributedPlaceholder.AddCharacterSpacing(Element.Placeholder, Element.CharacterSpacing);
+			_textField.AttributedText = _textField.AttributedText.WithCharacterSpacing(Element.CharacterSpacing);
+			_textField.AttributedPlaceholder = _textField.AttributedPlaceholder.WithCharacterSpacing(Element.CharacterSpacing);
 		}
 
 		[PortHandler]
@@ -325,14 +326,14 @@ void UpdatePlaceholder()
 					? targetColor : ColorExtensions.PlaceholderColor.ToColor();
 
 				_textField.AttributedPlaceholder = formatted.ToAttributed(Element, color);
-				_textField.AttributedPlaceholder.AddCharacterSpacing(Element.Placeholder, Element.CharacterSpacing);
+				_textField.AttributedPlaceholder.WithCharacterSpacing(Element.CharacterSpacing);
 
 			}
 			else
 			{
 				_textField.AttributedPlaceholder = formatted.ToAttributed(Element, targetColor.IsDefault 
 					? ColorExtensions.PlaceholderColor.ToColor() : targetColor);
-				_textField.AttributedPlaceholder.AddCharacterSpacing(Element.Placeholder, Element.CharacterSpacing);
+				_textField.AttributedPlaceholder.WithCharacterSpacing(Element.CharacterSpacing);
 			}
 		}
 

src/Compatibility/Core/src/iOS/Renderers/SearchHandlerAppearanceTracker.cs

@@ -1,6 +1,7 @@
 using System;
 using CoreGraphics;
 using Foundation;
+using Microsoft.Maui.Platform.iOS;
 using UIKit;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS

src/Compatibility/Core/src/iOS/Renderers/TimePickerRenderer.cs

@@ -6,6 +6,7 @@
 using UIKit;
 using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
 using RectangleF = CoreGraphics.CGRect;
+using Microsoft.Maui.Platform.iOS;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.iOS
 {
@@ -198,7 +199,7 @@ protected internal virtual void UpdateTextColor()
 		[PortHandler]
 		void UpdateCharacterSpacing()
 		{
-			var textAttr = Control.AttributedText.AddCharacterSpacing(Control.Text, Element.CharacterSpacing);
+			var textAttr = Control.AttributedText.WithCharacterSpacing(Element.CharacterSpacing);
 
 			if (textAttr != null)
 				Control.AttributedText = textAttr;