From 9a43b1b02bbee87b6bd57c88fea963f6ad54918c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez?= <javiersuarezruiz@hotmail.com>
Date: Thu, 1 Jul 2021 15:47:42 +0200
Subject: [PATCH] Implement PlaceholderColor property in SearchBarHandlers

---
 .../Android/Renderers/SearchBarRenderer.cs    |  1 +
 .../Core/src/WinUI/SearchBarRenderer.cs       |  1 +
 .../Pages/Controls/SearchBarPage.xaml         | 11 +++++++
 src/Core/src/Core/IEditor.cs                  |  9 +-----
 src/Core/src/Core/IPlaceholder.cs             |  9 +++++-
 .../SearchBar/SearchBarHandler.Android.cs     |  9 ++++--
 .../SearchBar/SearchBarHandler.Standard.cs    |  1 +
 .../SearchBar/SearchBarHandler.Windows.cs     | 15 +++++++++
 .../Handlers/SearchBar/SearchBarHandler.cs    |  1 +
 .../SearchBar/SearchBarHandler.iOS.cs         |  7 +++-
 .../Platform/Android/SearchViewExtensions.cs  | 28 ++++++++++++++--
 .../Platform/Windows/SearchBarExtensions.cs   | 14 ++++++++
 .../src/Platform/iOS/SearchBarExtensions.cs   | 20 ++++++++++--
 .../SearchBarHandlerTests.Android.cs          | 32 +++++++++++++++++--
 src/Core/tests/DeviceTests/Stubs/EntryStub.cs |  2 ++
 .../tests/DeviceTests/Stubs/SearchBarStub.cs  |  2 ++
 16 files changed, 143 insertions(+), 19 deletions(-)

diff --git a/src/Compatibility/Core/src/Android/Renderers/SearchBarRenderer.cs b/src/Compatibility/Core/src/Android/Renderers/SearchBarRenderer.cs
index 30c6aad454cc..6176969e3aea 100644
--- a/src/Compatibility/Core/src/Android/Renderers/SearchBarRenderer.cs
+++ b/src/Compatibility/Core/src/Android/Renderers/SearchBarRenderer.cs
@@ -248,6 +248,7 @@ void UpdatePlaceholder()
 			Control.SetQueryHint(Element.Placeholder);
 		}
 
+		[PortHandler]
 		void UpdatePlaceholderColor()
 		{
 			_hintColorSwitcher?.UpdateTextColor(_editText, Element.PlaceholderColor, _editText.SetHintTextColor);
diff --git a/src/Compatibility/Core/src/WinUI/SearchBarRenderer.cs b/src/Compatibility/Core/src/WinUI/SearchBarRenderer.cs
index 903154e3a687..25f99c48c0cc 100644
--- a/src/Compatibility/Core/src/WinUI/SearchBarRenderer.cs
+++ b/src/Compatibility/Core/src/WinUI/SearchBarRenderer.cs
@@ -238,6 +238,7 @@ void UpdatePlaceholder()
 			Control.PlaceholderText = Element.Placeholder ?? string.Empty;
 		}
 
+		[PortHandler]
 		void UpdatePlaceholderColor()
 		{
 			if (_queryTextBox == null)
diff --git a/src/Controls/samples/Controls.Sample/Pages/Controls/SearchBarPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Controls/SearchBarPage.xaml
index d96f684ae3cd..200cb08644bd 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Controls/SearchBarPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Controls/SearchBarPage.xaml
@@ -21,6 +21,17 @@
                 Style="{StaticResource Headline}"/>
             <SearchBar
                 TextColor="Green"/>
+            <Label
+                Text="With Placeholder"
+                Style="{StaticResource Headline}" />
+            <SearchBar 
+                Placeholder="Placeholder"/>
+            <Label
+                Text="Using PlaceholderColor"
+                Style="{StaticResource Headline}" />
+            <SearchBar 
+                PlaceholderColor="Pink"
+                Placeholder="Placeholder"/>
             <Label
                 Text="Fonts"
                 Style="{StaticResource Headline}"/>
diff --git a/src/Core/src/Core/IEditor.cs b/src/Core/src/Core/IEditor.cs
index 9c33fcdc5674..ceb9dc603df9 100644
--- a/src/Core/src/Core/IEditor.cs
+++ b/src/Core/src/Core/IEditor.cs
@@ -1,17 +1,10 @@
-using Microsoft.Maui.Graphics;
-
-namespace Microsoft.Maui
+namespace Microsoft.Maui
 {
 	/// <summary>
 	/// Represents a View used to accept multi-line input.
 	/// </summary>
 	public interface IEditor : IView, ITextInput, ITextStyle
 	{
-		/// <summary>
-		/// Gets or sets the placeholder text color.
-		/// </summary>
-		Color PlaceholderColor { get; set; }
-
 		/// <summary>
 		/// Occurs when the user finalizes the text in an editor with the return key.
 		/// </summary>
diff --git a/src/Core/src/Core/IPlaceholder.cs b/src/Core/src/Core/IPlaceholder.cs
index 89f9c4c3b08f..59ba4b119e03 100644
--- a/src/Core/src/Core/IPlaceholder.cs
+++ b/src/Core/src/Core/IPlaceholder.cs
@@ -1,4 +1,6 @@
-namespace Microsoft.Maui
+using Microsoft.Maui.Graphics;
+
+namespace Microsoft.Maui
 {
 	/// <summary>
 	/// Provides functionality to be able to use a Placeholder.
@@ -9,5 +11,10 @@ public interface IPlaceholder
 		/// Gets the placeholder or hint text.
 		/// </summary>
 		string Placeholder { get; }
+
+		/// <summary>
+		/// Gets or sets the placeholder text color.
+		/// </summary>
+		Color PlaceholderColor { get; set; }
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Android.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Android.cs
index ef6e6c2298f8..b16e161c4422 100644
--- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Android.cs
+++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Android.cs
@@ -1,7 +1,6 @@
-using System;
+using Android.Content.Res;
 using Android.Graphics.Drawables;
 using Android.Widget;
-using Microsoft.Extensions.DependencyInjection;
 using SearchView = AndroidX.AppCompat.Widget.SearchView;
 
 namespace Microsoft.Maui.Handlers
@@ -9,6 +8,7 @@ namespace Microsoft.Maui.Handlers
 	public partial class SearchBarHandler : ViewHandler<ISearchBar, SearchView>
 	{
 		static Drawable? DefaultBackground;
+		static ColorStateList? DefaultPlaceholderTextColors { get; set; }
 
 		EditText? _editText;
 		public EditText? QueryEditor => _editText;
@@ -45,6 +45,11 @@ public static void MapPlaceholder(SearchBarHandler handler, ISearchBar searchBar
 			handler.NativeView?.UpdatePlaceholder(searchBar);
 		}
 
+		public static void MapPlaceholderColor(SearchBarHandler handler, ISearchBar searchBar)
+		{
+			handler.NativeView?.UpdatePlaceholderColor(searchBar, DefaultPlaceholderTextColors, handler._editText);
+		}
+
 		public static void MapFont(SearchBarHandler handler, ISearchBar searchBar)
 		{
 			var fontManager = handler.GetRequiredService<IFontManager>();
diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Standard.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Standard.cs
index 576373010020..79fd9cfd3c8a 100644
--- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Standard.cs
+++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Standard.cs
@@ -8,6 +8,7 @@ public partial class SearchBarHandler : ViewHandler<ISearchBar, object>
 
 		public static void MapText(IViewHandler handler, ISearchBar searchBar) { }
 		public static void MapPlaceholder(IViewHandler handler, ISearchBar searchBar) { }
+		public static void MapPlaceholderColor(IViewHandler handler, ISearchBar searchBar) { }
 		public static void MapFont(IViewHandler handler, ISearchBar searchBar) { }
 		public static void MapHorizontalTextAlignment(IViewHandler handler, ISearchBar searchBar) { }
 		public static void MapCharacterSpacing(IViewHandler handler, ISearchBar searchBar) { }
diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs
index abc69b532a65..6e622a4fe494 100644
--- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs
+++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.Windows.cs
@@ -6,6 +6,9 @@ namespace Microsoft.Maui.Handlers
 {
 	public partial class SearchBarHandler : ViewHandler<ISearchBar, AutoSuggestBox>
 	{
+		Brush? _defaultPlaceholderColorBrush;
+		Brush? _defaultPlaceholderColorFocusBrush;
+
 		Brush? _defaultDeleteButtonForegroundColorBrush;
 		Brush? _defaultDeleteButtonBackgroundColorBrush;
 
@@ -43,6 +46,11 @@ public static void MapPlaceholder(SearchBarHandler handler, ISearchBar searchBar
 			handler.NativeView?.UpdatePlaceholder(searchBar);
 		}
 
+		public static void MapPlaceholderColor(SearchBarHandler handler, ISearchBar searchBar)
+		{
+			handler.NativeView?.UpdatePlaceholderColor(searchBar, handler._defaultPlaceholderColorBrush, handler._defaultPlaceholderColorFocusBrush, handler._queryTextBox);
+		}
+
 		public static void MapHorizontalTextAlignment(SearchBarHandler handler, ISearchBar searchBar)
 		{
 			handler.NativeView?.UpdateHorizontalTextAlignment(searchBar, handler._queryTextBox);
@@ -82,6 +90,13 @@ public static void MapCancelButtonColor(SearchBarHandler handler, ISearchBar sea
 		void OnLoaded(object sender, UI.Xaml.RoutedEventArgs e)
 		{
 			_queryTextBox = NativeView?.GetFirstDescendant<MauiTextBox>();
+
+			if(_queryTextBox != null)
+			{
+				_defaultPlaceholderColorBrush = _queryTextBox.PlaceholderForegroundBrush;
+				_defaultPlaceholderColorFocusBrush = _queryTextBox.PlaceholderForegroundFocusBrush;
+			}
+
 			_cancelButton = _queryTextBox?.GetFirstDescendant<MauiCancelButton>();
 
 			if (_cancelButton != null)
diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs
index acdfea483883..f684d2286e0a 100644
--- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs
+++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.cs
@@ -15,6 +15,7 @@ public partial class SearchBarHandler
 			[nameof(ISearchBar.IsTextPredictionEnabled)] = MapIsTextPredictionEnabled,
 			[nameof(ISearchBar.MaxLength)] = MapMaxLength,
 			[nameof(ISearchBar.Placeholder)] = MapPlaceholder,
+			[nameof(ISearchBar.PlaceholderColor)] = MapPlaceholderColor,
 			[nameof(ISearchBar.Text)] = MapText,
 			[nameof(ISearchBar.TextColor)] = MapTextColor,
 			[nameof(ISearchBar.CancelButtonColor)] = MapCancelButtonColor
diff --git a/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs b/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs
index 018b1fb6042f..dce542cd6bf4 100644
--- a/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs
+++ b/src/Core/src/Handlers/SearchBar/SearchBarHandler.iOS.cs
@@ -73,7 +73,12 @@ public static void MapText(SearchBarHandler handler, ISearchBar searchBar)
 
 		public static void MapPlaceholder(SearchBarHandler handler, ISearchBar searchBar)
 		{
-			handler.NativeView?.UpdatePlaceholder(searchBar);
+			handler.NativeView?.UpdatePlaceholder(searchBar, handler._editor);
+		}
+
+		public static void MapPlaceholderColor(SearchBarHandler handler, ISearchBar searchBar)
+		{
+			handler.NativeView?.UpdatePlaceholder(searchBar, handler._editor);
 		}
 
 		public static void MapFont(SearchBarHandler handler, ISearchBar searchBar)
diff --git a/src/Core/src/Platform/Android/SearchViewExtensions.cs b/src/Core/src/Platform/Android/SearchViewExtensions.cs
index 70ce5a57d8e8..66c2257003ad 100644
--- a/src/Core/src/Platform/Android/SearchViewExtensions.cs
+++ b/src/Core/src/Platform/Android/SearchViewExtensions.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using Android.Text;
+using Android.Content.Res;
 using Android.Widget;
 using SearchView = AndroidX.AppCompat.Widget.SearchView;
 
@@ -17,6 +16,31 @@ public static void UpdatePlaceholder(this SearchView searchView, ISearchBar sear
 			searchView.QueryHint = searchBar.Placeholder;
 		}
 
+		public static void UpdatePlaceholderColor(this SearchView searchView, ISearchBar searchBar, ColorStateList? defaultPlaceholderColor, EditText? editText = null)
+		{
+			editText ??= searchView.GetFirstChildOfType<EditText>();
+
+			if (editText == null)
+				return;
+
+			var placeholderTextColor = searchBar.PlaceholderColor;
+
+			if (placeholderTextColor == null)
+			{
+				editText.SetHintTextColor(defaultPlaceholderColor);
+			}
+			else
+			{
+				var androidColor = placeholderTextColor.ToNative();
+
+				if (!editText.HintTextColors.IsOneColor(ColorExtensions.States, androidColor))
+				{
+					var acolor = androidColor.ToArgb();
+					editText.SetHintTextColor(new ColorStateList(ColorExtensions.States, new[] { acolor, acolor }));
+				}
+			}
+		}
+
 		public static void UpdateFont(this SearchView searchView, ISearchBar searchBar, IFontManager fontManager, EditText? editText = null)
 		{
 			editText ??= searchView.GetFirstChildOfType<EditText>();
diff --git a/src/Core/src/Platform/Windows/SearchBarExtensions.cs b/src/Core/src/Platform/Windows/SearchBarExtensions.cs
index b27368283d1b..6c46182974d7 100644
--- a/src/Core/src/Platform/Windows/SearchBarExtensions.cs
+++ b/src/Core/src/Platform/Windows/SearchBarExtensions.cs
@@ -16,6 +16,20 @@ public static void UpdatePlaceholder(this AutoSuggestBox nativeControl, ISearchB
 			nativeControl.PlaceholderText = searchBar.Placeholder ?? string.Empty;
 		}
 
+		public static void UpdatePlaceholderColor(this AutoSuggestBox nativeControl, ISearchBar searchBar, Brush? defaultPlaceholderColorBrush, Brush? defaultPlaceholderColorFocusBrush, MauiTextBox? queryTextBox)
+		{
+			if (queryTextBox == null)
+				return;
+
+			Color placeholderColor = searchBar.PlaceholderColor;
+
+			BrushHelpers.UpdateColor(placeholderColor, ref defaultPlaceholderColorBrush,
+				() => queryTextBox.PlaceholderForegroundBrush, brush => queryTextBox.PlaceholderForegroundBrush = brush);
+
+			BrushHelpers.UpdateColor(placeholderColor, ref defaultPlaceholderColorFocusBrush,
+				() => queryTextBox.PlaceholderForegroundFocusBrush, brush => queryTextBox.PlaceholderForegroundFocusBrush = brush);
+		}
+
 		public static void UpdateText(this AutoSuggestBox nativeControl, ISearchBar searchBar)
 		{
 			nativeControl.Text = searchBar.Text;
diff --git a/src/Core/src/Platform/iOS/SearchBarExtensions.cs b/src/Core/src/Platform/iOS/SearchBarExtensions.cs
index 0b2cd6d6ad08..3be8a54b7d94 100644
--- a/src/Core/src/Platform/iOS/SearchBarExtensions.cs
+++ b/src/Core/src/Platform/iOS/SearchBarExtensions.cs
@@ -1,4 +1,5 @@
-using UIKit;
+using Foundation;
+using UIKit;
 
 namespace Microsoft.Maui
 {
@@ -9,9 +10,22 @@ public static void UpdateText(this UISearchBar uiSearchBar, ISearchBar searchBar
 			uiSearchBar.Text = searchBar.Text;
 		}
 
-		public static void UpdatePlaceholder(this UISearchBar uiSearchBar, ISearchBar searchBar)
+		public static void UpdatePlaceholder(this UISearchBar uiSearchBar, ISearchBar searchBar, UITextField? textField)
 		{
-			uiSearchBar.Placeholder = searchBar.Placeholder;
+			textField ??= uiSearchBar.FindDescendantView<UITextField>();
+
+			if (textField == null)
+				return;
+
+			var placeholder = searchBar.Placeholder ?? string.Empty;
+			var placeholderColor = searchBar.PlaceholderColor;
+			var foregroundColor = placeholderColor ?? ColorExtensions.PlaceholderColor.ToColor();
+
+			textField.AttributedPlaceholder = foregroundColor == null
+				? new NSAttributedString(placeholder)
+				: new NSAttributedString(str: placeholder, foregroundColor: foregroundColor.ToNative());
+
+			textField.AttributedPlaceholder.WithCharacterSpacing(searchBar.CharacterSpacing);
 		}
 
 		public static void UpdateFont(this UISearchBar uiSearchBar, ITextStyle textStyle, IFontManager fontManager)
diff --git a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Android.cs
index be7f1f71594c..d9b126d54414 100644
--- a/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Android.cs
+++ b/src/Core/tests/DeviceTests/Handlers/SearchBar/SearchBarHandlerTests.Android.cs
@@ -6,13 +6,25 @@
 using Microsoft.Maui.Graphics;
 using Microsoft.Maui.Handlers;
 using Xunit;
-using AColor = global::Android.Graphics.Color;
+using AColor = Android.Graphics.Color;
 using SearchView = AndroidX.AppCompat.Widget.SearchView;
 
 namespace Microsoft.Maui.DeviceTests
 {
 	public partial class SearchBarHandlerTests
 	{
+		[Fact(DisplayName = "PlaceholderColor Initializes Correctly")]
+		public async Task PlaceholderColorInitializesCorrectly()
+		{
+			var searchBar = new SearchBarStub()
+			{
+				Placeholder = "Test",
+				PlaceholderColor = Colors.Yellow
+			};
+
+			await ValidatePropertyInitValue(searchBar, () => searchBar.PlaceholderColor, GetNativePlaceholderColor, searchBar.PlaceholderColor);
+		}
+
 		[Fact(DisplayName = "Horizontal TextAlignment Initializes Correctly")]
 		public async Task HorizontalTextAlignmentInitializesCorrectly()
 		{
@@ -79,7 +91,7 @@ await InvokeOnMainThreadAsync(() =>
 		}
 
 		SearchView GetNativeSearchBar(SearchBarHandler searchBarHandler) =>
-			(SearchView)searchBarHandler.NativeView;
+			searchBarHandler.NativeView;
 
 		string GetNativeText(SearchBarHandler searchBarHandler) =>
 			GetNativeSearchBar(searchBarHandler).Query;
@@ -102,6 +114,22 @@ Color GetNativeTextColor(SearchBarHandler searchBarHandler)
 		string GetNativePlaceholder(SearchBarHandler searchBarHandler) =>
 			GetNativeSearchBar(searchBarHandler).QueryHint;
 
+		Color GetNativePlaceholderColor(SearchBarHandler searchBarHandler)
+
+		{
+			var searchView = GetNativeSearchBar(searchBarHandler);
+			var editText = searchView.GetChildrenOfType<EditText>().FirstOrDefault();
+
+			if (editText != null)
+			{
+				int currentHintTextColor = editText.CurrentHintTextColor;
+				AColor currentPlaceholderColorr = new AColor(currentHintTextColor);
+				return currentPlaceholderColorr.ToColor();
+			}
+
+			return Colors.Transparent;
+		}
+
 		double GetNativeCharacterSpacing(SearchBarHandler searchBarHandler)
 		{
 			var searchView = GetNativeSearchBar(searchBarHandler);
diff --git a/src/Core/tests/DeviceTests/Stubs/EntryStub.cs b/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
index b450b8ff670e..7212712eed88 100644
--- a/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/EntryStub.cs
@@ -23,6 +23,8 @@ public string Text
 
 		public string Placeholder { get; set; }
 
+		public Color PlaceholderColor { get; set; }
+
 		public bool IsReadOnly { get; set; }
 
 		public Font Font { get; set; }
diff --git a/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs b/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs
index d476c2fddb6d..e49d0130d25f 100644
--- a/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs
+++ b/src/Core/tests/DeviceTests/Stubs/SearchBarStub.cs
@@ -9,6 +9,8 @@ public partial class SearchBarStub : StubBase, ISearchBar
 		public string Text { get => _text; set => SetProperty(ref _text, value); }
 
 		public string Placeholder { get; set; }
+		
+		public Color PlaceholderColor { get; set; }
 
 		public Color TextColor { get; set; }