feat(TextBox): iOS selection and placeholder color

jeromelaban · Sep 16, 2022 · e1494e2 · e1494e2
1 parent 14854a7
commit e1494e2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/ITextBoxView.iOSmacOS.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/ITextBoxView.iOSmacOS.cs
@@ -25,6 +25,7 @@ public interface ITextBoxView : ITextInput
 #if __IOS__
 		bool IsFirstResponder { get; }
 		void UpdateTextAlignment();
+		UIColor TintColor { get; set; }
 #endif
 
 		Brush Foreground { get; set; }

diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/MultilineTextBoxView.iOS.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/MultilineTextBoxView.iOS.cs
@@ -221,7 +221,6 @@ public void OnForegroundChanged(Brush oldValue, Brush newValue)
 					void ApplyColor()
 					{
 						this.TextColor = scb.Color;
-						this.TintColor = scb.Color;
 					}
 				}
 			}

diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.Android.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.Android.cs
@@ -362,24 +362,11 @@ private void UpdateInputScope(InputScope inputScope)
 			}
 		}
 
-		partial void OnSelectionHighlightColorChangedPartial(Color? selectionHighlightColor)
+		partial void OnSelectionHighlightColorChangedPartial(Color color)
 		{
 			if (_textBoxView != null)
 			{
-				if (selectionHighlightColor != null)
-				{
-					var windowsColor = selectionHighlightColor.Value;
-					_textBoxView.SetHighlightColor(new Android.Graphics.Color(windowsColor.R, windowsColor.G, windowsColor.B, windowsColor.A));
-				}
-				else
-				{
-					int[] attrs = { Android.Resource.Attribute.TextColorHighlight };
-					TypedArray ta = ContextHelper.Current.ObtainStyledAttributes(attrs);
-					int colorInt = ta.GetResourceId(0, Android.Resource.Color.Black);
-					ta.Recycle();
-					var color = new Android.Graphics.Color(colorInt);
-					_textBoxView.SetHighlightColor(color);
-				}
+				_textBoxView.SetHighlightColor(new Android.Graphics.Color(color.R, color.G, color.B, color.A));
 			}
 		}
 

diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.cs
@@ -421,11 +421,13 @@ public SolidColorBrush SelectionHighlightColor
 
 		private void OnSelectionHighlightColorChanged(DependencyPropertyChangedEventArgs e)
 		{
-			var value = e.NewValue as SolidColorBrush;
-			OnSelectionHighlightColorChangedPartial(value?.ColorWithOpacity);
+			if (e.NewValue is SolidColorBrush brush)
+			{			
+				OnSelectionHighlightColorChangedPartial(brush.ColorWithOpacity);
+			}
 		}
 
-		partial void OnSelectionHighlightColorChangedPartial(Color? e);
+		partial void OnSelectionHighlightColorChangedPartial(Color color);
 
 		#endregion
 

diff --git a/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.iOS.cs b/src/Uno.UI/UI/Xaml/Controls/TextBox/TextBox.iOS.cs
@@ -172,6 +172,14 @@ partial void OnIsReadonlyChangedPartial(DependencyPropertyChangedEventArgs e)
 			//support by MultilineTextBoxDelegate and SinglelineTextBoxDelegate
 		}
 
+		partial void OnSelectionHighlightColorChangedPartial(Color color)
+		{
+			if (_textBoxView != null)
+			{
+				_textBoxView.TintColor = UIColor.FromRGBA(color.R, color.G, color.B, color.A);
+			}
+		}
+
 		partial void OnIsSpellCheckEnabledChangedPartial(DependencyPropertyChangedEventArgs e)
 		{
 			if (_textBoxView != null)