Entry keyboard handler

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

@@ -3,6 +3,7 @@
 using Android.Text;
 using Android.Text.Method;
 using Android.Views;
+using Microsoft.Maui.Platform.Android;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
 {

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/PopupManager.cs

@@ -7,6 +7,7 @@
 using Android.Views;
 using Android.Widget;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Platform.Android;
 using AppCompatActivity = AndroidX.AppCompat.App.AppCompatActivity;
 using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
 

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

@@ -9,6 +9,7 @@
 using Android.Views.InputMethods;
 using Android.Widget;
 using Java.Lang;
+using Microsoft.Maui.Platform.Android;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
 {

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

@@ -12,6 +12,7 @@
 using AndroidX.Core.Content;
 using Java.Lang;
 using Microsoft.Maui.Controls.PlatformConfiguration.AndroidSpecific;
+using Microsoft.Maui.Platform.Android;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
 {
@@ -318,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/Android/Renderers/SearchBarRenderer.cs

@@ -8,6 +8,7 @@
 using Android.Util;
 using Android.Views;
 using Android.Widget;
+using Microsoft.Maui.Platform.Android;
 
 namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
 {

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

@@ -12,6 +12,7 @@
 using Android.Views;
 using Android.Widget;
 using Microsoft.Maui.Controls.Internals;
+using Microsoft.Maui.Platform.Android;
 using AImageButton = Android.Widget.ImageButton;
 using AView = Android.Views.View;
 

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)
@@ -110,28 +42,6 @@ internal static UISearchBarStyle ToNativeSearchBarStyle(this PlatformConfigurati
 					throw new ArgumentOutOfRangeException(nameof(style));
 			}
 		}
-
-		internal static UIReturnKeyType ToUIReturnKeyType(this ReturnType returnType)
-		{
-			switch (returnType)
-			{
-				case ReturnType.Go:
-					return UIReturnKeyType.Go;
-				case ReturnType.Next:
-					return UIReturnKeyType.Next;
-				case ReturnType.Send:
-					return UIReturnKeyType.Send;
-				case ReturnType.Search:
-					return UIReturnKeyType.Search;
-				case ReturnType.Done:
-					return UIReturnKeyType.Done;
-				case ReturnType.Default:
-					return UIReturnKeyType.Default;
-				default:
-					throw new System.NotImplementedException($"ReturnType {returnType} not supported");
-			}
-		}
-
 		internal static DeviceOrientation ToDeviceOrientation(this UIDeviceOrientation orientation)
 		{
 			switch (orientation)
@@ -149,64 +59,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

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;
 

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;
 

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
 {

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;

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
 {

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
 {

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
 {

src/Controls/samples/Controls.Sample/Pages/MainPage.cs

@@ -64,6 +64,12 @@ void SetupMauiLayout()
 			verticalStack.Add(underlineLabel);
 
 
+			var passwordEntry = new Entry() { IsPassword = true };
+			var numericEntry = new Entry() { Keyboard = Keyboard.Numeric, Placeholder = "Numeric Entry" };
+
+			verticalStack.Add(passwordEntry);
+			verticalStack.Add(numericEntry);
+
 			var button = new Button() { Text = _viewModel.Text, WidthRequest = 200 };
 			var button2 = new Button()
 			{

src/Controls/src/Core/Entry.cs

@@ -22,6 +22,7 @@ public partial class Entry : InputView, IFontElement, ITextAlignmentElement, IEn
 		public new static readonly BindableProperty TextProperty = InputView.TextProperty;
 
 		public new static readonly BindableProperty TextColorProperty = InputView.TextColorProperty;
+		public new static readonly BindableProperty KeyboardProperty = InputView.KeyboardProperty;
 
 		public new static readonly BindableProperty CharacterSpacingProperty = InputView.CharacterSpacingProperty;
 

src/Core/src/Core/ITextInput.cs

@@ -14,5 +14,10 @@ public interface ITextInput : IText, IPlaceholder
 		/// Gets a value indicating whether or not the view is read-only.
 		/// </summary>
 		bool IsReadOnly { get; }
+
+		/// <summary>
+		/// Gets the keyboard input type.
+		/// </summary>
+		Keyboard Keyboard { get; }
 	}
 }

src/Core/src/Handlers/Entry/EntryHandler.Android.cs

@@ -74,6 +74,11 @@ public static void MapIsReadOnly(EntryHandler handler, IEntry entry)
 			handler.TypedNativeView?.UpdateIsReadOnly(entry);
 		}
 
+		public static void MapKeyboard(EntryHandler handler, IEntry entry)
+		{
+			handler.TypedNativeView?.UpdateKeyboard(entry);
+		}
+
 		void OnTextChanged(string? text)
 		{
 			if (VirtualView == null || TypedNativeView == null)

src/Core/src/Handlers/Entry/EntryHandler.Standard.cs

@@ -12,6 +12,7 @@ public static void MapIsPassword(IViewHandler handler, IEntry entry) { }
 		public static void MapIsTextPredictionEnabled(IViewHandler handler, IEntry entry) { }
 		public static void MapPlaceholder(IViewHandler handler, IEntry entry) { }
 		public static void MapIsReadOnly(IViewHandler handler, IEntry entry) { }
+		public static void MapKeyboard(IViewHandler handler, IEntry entry) { }
 		public static void MapFont(IViewHandler handler, IEntry entry) { }
 	}
 }

src/Core/src/Handlers/Entry/EntryHandler.cs

@@ -4,6 +4,7 @@ public partial class EntryHandler
 	{
 		public static PropertyMapper<IEntry, EntryHandler> EntryMapper = new PropertyMapper<IEntry, EntryHandler>(ViewHandler.ViewMapper)
 		{
+			[nameof(IEntry.Keyboard)] = MapKeyboard,
 			[nameof(IEntry.Text)] = MapText,
 			[nameof(IEntry.TextColor)] = MapTextColor,
 			[nameof(IEntry.IsPassword)] = MapIsPassword,