[Android] Implemented material3 support for Editor

src/Controls/src/Core/Editor/Editor.Android.cs

@@ -18,5 +18,22 @@ public static void MapText(IEditorHandler handler, Editor editor)
 
 			Platform.EditTextExtensions.UpdateText(handler.PlatformView, editor);
 		}
+
+		// TODO: Material3 - make it public in .net 11
+		internal static void MapText(EditorHandler2 handler, Editor editor)
+		{
+			if (handler.PlatformView is null)
+			{
+				return;
+			}
+
+			if (handler.DataFlowDirection == DataFlowDirection.FromPlatform)
+			{
+				Platform.EditTextExtensions.UpdateTextFromPlatform(handler.PlatformView, editor);
+				return;
+			}
+
+			Platform.EditTextExtensions.UpdateText(handler.PlatformView, editor);
+		}
 	}
 }

src/Controls/src/Core/Editor/Editor.Mapper.cs

@@ -15,6 +15,16 @@ public partial class Editor
 			EditorHandler.Mapper.ReplaceMapping<Editor, IEditorHandler>(nameof(Text), MapText);
 			EditorHandler.Mapper.ReplaceMapping<Editor, IEditorHandler>(nameof(TextTransform), MapText);
 
+#if ANDROID
+			if (RuntimeFeature.IsMaterial3Enabled)
+			{
+				EditorHandler2.Mapper.ReplaceMapping<Editor, EditorHandler2>(nameof(Text), MapText);
+				EditorHandler2.Mapper.ReplaceMapping<Editor, EditorHandler2>(nameof(TextTransform), MapText);
+				EditorHandler2.Mapper.AppendToMapping<Editor, EditorHandler2>(nameof(VisualElement.IsFocused), InputView.MapIsFocused);
+				EditorHandler2.CommandMapper.PrependToMapping<Editor, EditorHandler2>(nameof(IEditor.Focus), InputView.MapFocus);
+			}
+#endif
+
 #if IOS || ANDROID
 			EditorHandler.Mapper.AppendToMapping(nameof(VisualElement.IsFocused), InputView.MapIsFocused);
 			EditorHandler.Mapper.AppendToMapping(nameof(VisualElement.IsVisible), InputView.MapIsVisible);

src/Controls/src/Core/Hosting/AppHostBuilderExtensions.cs

@@ -70,6 +70,18 @@ internal static IMauiHandlersCollection AddControlsHandlers(this IMauiHandlersCo
 		handlersCollection.AddHandler<CollectionView, CollectionViewHandler>();
 		handlersCollection.AddHandler<CarouselView, CarouselViewHandler>();
 #endif
+#if ANDROID
+		if (RuntimeFeature.IsMaterial3Enabled)
+		{
+			handlersCollection.AddHandler<Editor, EditorHandler2>();
+		}
+		else
+		{
+			handlersCollection.AddHandler<Editor, EditorHandler>();
+		}
+#else
+		handlersCollection.AddHandler<Editor, EditorHandler>();
+#endif
 #if ANDROID
 		if (RuntimeFeature.IsMaterial3Enabled)
 		{
@@ -111,7 +123,6 @@ internal static IMauiHandlersCollection AddControlsHandlers(this IMauiHandlersCo
 		handlersCollection.AddHandler<BoxView, BoxViewHandler>();
 		handlersCollection.AddHandler<Button, ButtonHandler>();
 		handlersCollection.AddHandler<DatePicker, DatePickerHandler>();
-		handlersCollection.AddHandler<Editor, EditorHandler>();
 		handlersCollection.AddHandler<Entry, EntryHandler>();
 		handlersCollection.AddHandler<GraphicsView, GraphicsViewHandler>();
 		handlersCollection.AddHandler<Image, ImageHandler>();

src/Controls/tests/TestCases.HostApp/CoreViews/CorePageView.cs

@@ -105,6 +105,7 @@ public override string ToString()
 			new GalleryPageFactory(() => new ScrollViewControlPage(), "ScrollView Feature Matrix"),
 			new GalleryPageFactory(() => new GraphicsViewControlPage(), "GraphicsView Feature Matrix"),
 			new GalleryPageFactory(() => new EditorControlPage(), "Editor Feature Matrix"),
+			new GalleryPageFactory(() => new Material3_EditorControlPage(), "Editor Material3 Feature Matrix"),
 			new GalleryPageFactory(() => new ToolbarFeaturePage(), "Toolbar Feature Matrix"),
 			new GalleryPageFactory(() => new StackLayoutControlPage(), "StackLayout Feature Matrix"),
 			new GalleryPageFactory(() => new AbsoluteLayoutControlPage(), "AbsoluteLayout Feature Matrix"),

src/Controls/tests/TestCases.HostApp/FeatureMatrix/EditorMaterial3/Material3_EditorControlPage.xaml

@@ -0,0 +1,110 @@
+<ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+	xmlns:local="clr-namespace:Maui.Controls.Sample"
+	x:DataType="local:EditorViewModel"
+	x:Class="Maui.Controls.Sample.Material3_EditorControlMainPage">
+	<VerticalStackLayout Padding="20"
+		Spacing="8">
+		<Label Text="Editor Control"
+			FontSize="20"
+			Margin="0,0,0,50"
+			HorizontalOptions="Center"/>
+
+		<Grid x:Name="EditorGrid"
+			VerticalOptions="Start">
+			<Editor x:Name="EditorControl"
+				Text="{Binding Text}"
+				Placeholder="{Binding Placeholder}"
+				PlaceholderColor="{Binding PlaceholderColor}"
+				TextColor="{Binding TextColor}"
+				HorizontalTextAlignment="{Binding HorizontalTextAlignment}"
+				VerticalTextAlignment="{Binding VerticalTextAlignment}"
+				FontSize="{Binding FontSize}"
+				CharacterSpacing="{Binding CharacterSpacing}"
+				IsReadOnly="{Binding IsReadOnly}"
+				IsTextPredictionEnabled="{Binding IsTextPredictionEnabled}"
+				IsSpellCheckEnabled="{Binding IsSpellCheckEnabled}"
+				Shadow="{Binding EditorShadow}"
+				MaxLength="{Binding MaxLength}"
+				SelectionLength="{Binding SelectionLength}"
+				CursorPosition="{Binding CursorPosition, Mode=TwoWay}"
+				Keyboard="{Binding Keyboard}"
+				FontFamily="{Binding FontFamily}"
+				IsVisible="{Binding IsVisible}"
+				IsEnabled="{Binding IsEnabled}"
+				FlowDirection="{Binding FlowDirection}"
+				HeightRequest="{Binding HeightRequest}"
+				FontAttributes="{Binding FontAttributes}"
+				TextTransform="{Binding TextTransform}"
+				AutoSize="{Binding AutoSizeOption}"
+				TextChanged="EditorControl_TextChanged"
+				Completed="EditorControl_Completed"
+				Focused="EditorControl_Focused"
+				Unfocused="EditorControl_Unfocused"
+				AutomationId="TestEditor"/>
+		</Grid>
+
+		<Grid HeightRequest="130"/>
+
+		<Button Text="Options"
+			FontSize="11"
+			Clicked="NavigateToOptionsPage_Clicked"
+			AutomationId="OptionsButton"
+			Margin="0,10,0,0"/>
+
+		<Grid ColumnSpacing="10"
+			Margin="0,10,0,10">
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto"/>
+				<RowDefinition Height="Auto"/>
+			</Grid.RowDefinitions>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="*"/>
+				<ColumnDefinition Width="*"/>
+			</Grid.ColumnDefinitions>
+			<Label Text="Selection Length:"
+				FontSize="11"
+				Grid.Row="0"
+				Grid.Column="0"/>
+			<Label Text="Cursor position:"
+				FontSize="11"
+				Grid.Row="0"
+				Grid.Column="1"/>
+			<Entry x:Name="SelectionLengthEntry"
+				Text="{Binding SelectionLength}"
+				AutomationId="SelectionLengthEntry"
+				TextChanged="SelectionLength_Clicked"
+				Grid.Row="1"
+				Grid.Column="0"/>
+			<Entry x:Name="CursorPositionEntry"
+				Text="{Binding CursorPosition}"
+				AutomationId="CursorPositionEntry"
+				Grid.Row="1"
+				Grid.Column="1"/>
+		</Grid>
+
+		<Button Text="Update Cursor Selection"
+			FontSize="11"
+			Clicked="OnUpdateCursorAndSelectionClicked"
+			AutomationId="UpdateCursorAndSelectionButton"/>
+
+		<Label Text="Events:"
+			FontSize="11"/>
+		<Label x:Name="TextChangedLabel"
+			Text="{Binding TextChangedText}"
+			AutomationId="TextChangedLabel"
+			FontSize="11"/>
+		<Label x:Name="CompletedLabel"
+			Text="{Binding CompletedText}"
+			AutomationId="CompletedLabel"
+			FontSize="11"/>
+		<Label x:Name="FocusedLabel"
+			Text="{Binding FocusedText}"
+			AutomationId="FocusedLabel"
+			FontSize="11"/>
+		<Label x:Name="UnfocusedLabel"
+			Text="{Binding UnfocusedText}"
+			AutomationId="UnfocusedLabel"
+			FontSize="11"/>
+	</VerticalStackLayout>
+</ContentPage>

src/Controls/tests/TestCases.HostApp/FeatureMatrix/EditorMaterial3/Material3_EditorControlPage.xaml.cs

@@ -0,0 +1,189 @@
+using System.ComponentModel;
+using Microsoft.Maui.Controls;
+
+namespace Maui.Controls.Sample;
+
+public class Material3_EditorControlPage : NavigationPage
+{
+	EditorViewModel _viewModel;
+
+	public Material3_EditorControlPage()
+	{
+		_viewModel = new EditorViewModel();
+		PushAsync(new Material3_EditorControlMainPage(_viewModel));
+	}
+}
+
+public partial class Material3_EditorControlMainPage : ContentPage
+{
+	EditorViewModel _viewModel;
+	Editor _editorControl;
+
+	public Material3_EditorControlMainPage(EditorViewModel viewModel)
+	{
+		InitializeComponent();
+		_viewModel = viewModel;
+		BindingContext = _viewModel;
+		_editorControl = EditorControl;
+		_editorControl.PropertyChanged += UpdateEditorControl;
+	}
+
+	async void NavigateToOptionsPage_Clicked(object sender, EventArgs e)
+	{
+		BindingContext = _viewModel = new EditorViewModel();
+		_viewModel.Text = "Test Editor";
+		_viewModel.Placeholder = "Enter text here";
+		_viewModel.VerticalTextAlignment = TextAlignment.End;
+		_viewModel.CursorPosition = 0;
+		_viewModel.SelectionLength = 0;
+		_viewModel.HeightRequest = -1;
+		ReInitializeEditor();
+		await Navigation.PushAsync(new EditorOptionsPage(_viewModel));
+	}
+
+	void ReInitializeEditor()
+	{
+		_editorControl.TextChanged -= EditorControl_TextChanged;
+		_editorControl.Completed -= EditorControl_Completed;
+		_editorControl.Focused -= EditorControl_Focused;
+		_editorControl.Unfocused -= EditorControl_Unfocused;
+		_editorControl.PropertyChanged -= UpdateEditorControl;
+
+		EditorGrid.Children.Clear();
+
+		var editor = new Editor
+		{
+			AutomationId = "TestEditor",
+		};
+
+		editor.SetBinding(Editor.TextProperty, nameof(EditorViewModel.Text));
+		editor.SetBinding(Editor.PlaceholderProperty, nameof(EditorViewModel.Placeholder));
+		editor.SetBinding(Editor.PlaceholderColorProperty, nameof(EditorViewModel.PlaceholderColor));
+		editor.SetBinding(Editor.TextColorProperty, nameof(EditorViewModel.TextColor));
+		editor.SetBinding(Editor.HorizontalTextAlignmentProperty, nameof(EditorViewModel.HorizontalTextAlignment));
+		editor.SetBinding(Editor.VerticalTextAlignmentProperty, nameof(EditorViewModel.VerticalTextAlignment));
+		editor.SetBinding(Editor.FontSizeProperty, nameof(EditorViewModel.FontSize));
+		editor.SetBinding(Editor.CharacterSpacingProperty, nameof(EditorViewModel.CharacterSpacing));
+		editor.SetBinding(Editor.IsReadOnlyProperty, nameof(EditorViewModel.IsReadOnly));
+		editor.SetBinding(Editor.IsTextPredictionEnabledProperty, nameof(EditorViewModel.IsTextPredictionEnabled));
+		editor.SetBinding(Editor.IsSpellCheckEnabledProperty, nameof(EditorViewModel.IsSpellCheckEnabled));
+		editor.SetBinding(Editor.ShadowProperty, nameof(EditorViewModel.EditorShadow));
+		editor.SetBinding(Editor.MaxLengthProperty, nameof(EditorViewModel.MaxLength));
+		editor.SetBinding(Editor.SelectionLengthProperty, nameof(EditorViewModel.SelectionLength));
+		editor.SetBinding(Editor.CursorPositionProperty, nameof(EditorViewModel.CursorPosition), BindingMode.TwoWay);
+		editor.SetBinding(Editor.KeyboardProperty, nameof(EditorViewModel.Keyboard));
+		editor.SetBinding(Editor.FontFamilyProperty, nameof(EditorViewModel.FontFamily));
+		editor.SetBinding(Editor.IsVisibleProperty, nameof(EditorViewModel.IsVisible));
+		editor.SetBinding(Editor.IsEnabledProperty, nameof(EditorViewModel.IsEnabled));
+		editor.SetBinding(Editor.FlowDirectionProperty, nameof(EditorViewModel.FlowDirection));
+		editor.SetBinding(Editor.HeightRequestProperty, nameof(EditorViewModel.HeightRequest));
+		editor.SetBinding(Editor.FontAttributesProperty, nameof(EditorViewModel.FontAttributes));
+		editor.SetBinding(Editor.TextTransformProperty, nameof(EditorViewModel.TextTransform));
+		editor.SetBinding(Editor.AutoSizeProperty, nameof(EditorViewModel.AutoSizeOption));
+
+		editor.PropertyChanged += UpdateEditorControl;
+
+		_editorControl = editor;
+		EditorGrid.Children.Add(editor);
+
+		editor.TextChanged += EditorControl_TextChanged;
+		editor.Completed += EditorControl_Completed;
+		editor.Focused += EditorControl_Focused;
+		editor.Unfocused += EditorControl_Unfocused;
+	}
+
+	void CursorPositionButton_Clicked(object sender, EventArgs e)
+	{
+		if (int.TryParse(CursorPositionEntry.Text, out int cursorPosition))
+		{
+			_viewModel.CursorPosition = cursorPosition;
+		}
+	}
+
+	void SelectionLength_Clicked(object sender, EventArgs e)
+	{
+		if (int.TryParse(SelectionLengthEntry.Text, out int selectionLength))
+		{
+			_viewModel.SelectionLength = selectionLength;
+		}
+	}
+
+	void OnUpdateCursorAndSelectionClicked(object sender, EventArgs e)
+	{
+		if (int.TryParse(CursorPositionEntry.Text, out int cursorPosition))
+		{
+			_editorControl.Focus();
+			_editorControl.CursorPosition = cursorPosition;
+
+			if (BindingContext is EditorViewModel vm)
+			{
+				vm.CursorPosition = cursorPosition;
+			}
+		}
+
+		if (int.TryParse(SelectionLengthEntry.Text, out int selectionLength))
+		{
+			_editorControl.Focus();
+			_editorControl.SelectionLength = selectionLength;
+
+			if (BindingContext is EditorViewModel vm)
+			{
+				vm.SelectionLength = selectionLength;
+			}
+		}
+		CursorPositionEntry.Text = _editorControl.CursorPosition.ToString();
+		SelectionLengthEntry.Text = _editorControl.SelectionLength.ToString();
+	}
+
+	void UpdateEditorControl(object sender, PropertyChangedEventArgs args)
+	{
+		if (args.PropertyName == Editor.CursorPositionProperty.PropertyName)
+		{
+			CursorPositionEntry.Text = _editorControl.CursorPosition.ToString();
+		}
+		else if (args.PropertyName == Editor.SelectionLengthProperty.PropertyName)
+		{
+			SelectionLengthEntry.Text = _editorControl.SelectionLength.ToString();
+		}
+	}
+
+	void EditorControl_TextChanged(object sender, TextChangedEventArgs e)
+	{
+		string eventInfo = $"TextChanged: Old='{e.OldTextValue}', New='{e.NewTextValue}'";
+
+		if (BindingContext is EditorViewModel vm)
+		{
+			vm.TextChangedText = eventInfo;
+		}
+	}
+
+	void EditorControl_Completed(object sender, EventArgs e)
+	{
+		string eventInfo = $"Completed: Event Triggered";
+
+		if (BindingContext is EditorViewModel vm)
+		{
+			vm.CompletedText = eventInfo;
+		}
+	}
+
+	void EditorControl_Focused(object sender, FocusEventArgs e)
+	{
+		string eventInfo = $"Focused: Event Triggered";
+
+		if (BindingContext is EditorViewModel vm)
+		{
+			vm.FocusedText = eventInfo;
+		}
+	}
+
+	private void EditorControl_Unfocused(object sender, FocusEventArgs e)
+	{
+		string eventInfo = $"Unfocused: Event Triggered";
+
+		if (BindingContext is EditorViewModel vm)
+		{
+			vm.UnfocusedText = eventInfo;
+		}
+	}
+}