Fix material colors to match previous version better (#13666)

PureWeen · web-flow · commit 39f8e60d26ec · 2021-02-06T09:09:17.000-06:00
* Bump Google Material

* Bump material and set HintText to transparent on multi line controls

* Fix material colors to match previous version better

* - additional test cases

* - fix issue with button background color

* - push button to bottom of page

* Update VisualGallery.xaml.cs

* Update MaterialColors.cs
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml.cs
@@ -13,9 +13,6 @@ namespace Xamarin.Forms.Controls.Issues
 {
 	public partial class VisualControlsPage : TestShell
 	{
-		bool isVisible = false;
-		double percentage = 0.0;
-
 		public VisualControlsPage()
 		{
 #if APP
@@ -29,47 +26,6 @@ protected override void Init()
 			BindingContext = this;
 		}
 
-		public double PercentageCounter
-		{
-			get { return percentage; }
-			set
-			{
-				percentage = value;
-				OnPropertyChanged();
-				OnPropertyChanged(nameof(Counter));
-			}
-		}
-
-		public double Counter => percentage * 10;
-
-		protected override void OnAppearing()
-		{
-			isVisible = true;
-
-			base.OnAppearing();
-
-			Device.StartTimer(TimeSpan.FromSeconds(1), () =>
-			{
-				var progress = PercentageCounter + 0.1;
-				if (progress > 1)
-					progress = 0;
-
-				PercentageCounter = progress;
-
-				return isVisible;
-			});
-		}
-
-		protected override void OnDisappearing()
-		{
-			isVisible = false;
-
-			base.OnDisappearing();
-		}
-
-
-
-
 		[Preserve(AllMembers = true)]
 		[Issue(IssueTracker.Github, 4435, "Visual Gallery Loads",
 			PlatformAffected.iOS | PlatformAffected.Android)]
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualGallery.xaml b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualGallery.xaml
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualGallery.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualGallery.xaml.cs
@@ -0,0 +1,71 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace Xamarin.Forms.Controls.Issues
+{
+    public partial class VisualGallery : ContentPage
+	{
+		bool isVisible = false;
+		double percentage = 0.0;
+		public VisualGallery()
+        {
+#if APP
+			InitializeComponent();
+			Device.BeginInvokeOnMainThread(OnAppearing);
+			pushPage.Clicked += PushPage;
+#endif
+		}
+
+		async void PushPage(object sender, EventArgs e)
+		{
+			await Navigation.PushAsync(new VisualGallery());
+		}
+
+		public double PercentageCounter
+		{
+			get { return percentage; }
+			set
+			{
+				percentage = value;
+				OnPropertyChanged();
+				OnPropertyChanged(nameof(Counter));
+			}
+		}
+
+		public double Counter => percentage * 10;
+
+		protected override void OnAppearing()
+		{
+			if (!isVisible)
+				return;
+
+			isVisible = true;
+
+			base.OnAppearing();
+
+			Device.StartTimer(TimeSpan.FromSeconds(1), () =>
+			{
+				var progress = PercentageCounter + 0.1;
+				if (progress > 1)
+					progress = 0;
+
+				PercentageCounter = progress;
+
+				return isVisible;
+			});
+		}
+
+		protected override void OnDisappearing()
+		{
+			isVisible = false;
+
+			base.OnDisappearing();
+		}
+	}
+}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@ -900,6 +900,10 @@
     <Compile Include="$(MSBuildThisFileDirectory)Issue10699.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue11185.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue10307.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)VisualGallery.xaml.cs">
+      <DependentUpon>VisualGallery.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)_TemplateMarkup.xaml.cs">
       <DependentUpon>_TemplateMarkup.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -2654,4 +2658,10 @@
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)VisualGallery.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
diff --git a/Xamarin.Forms.Material.Android/MaterialButtonRenderer.cs b/Xamarin.Forms.Material.Android/MaterialButtonRenderer.cs
@@ -104,13 +104,27 @@ protected Button Element
 
 		public override void Draw(Canvas canvas)
 		{
-			_hasDrawnOnce = true;
 			if (Element.IsEnabled != Enabled)
 			{
+				_hasDrawnOnce = true;
 				Enabled = Element.IsEnabled;
 				return;
 			}
 
+			if(!_hasDrawnOnce)
+			{
+				_hasDrawnOnce = true;
+
+				// https://github.com/xamarin/Xamarin.Forms/issues/13416
+				// This forces a redraw the first time which works around
+				// an issue with setting background color and having an image set
+				if (Enabled && Element.ImageSource != null)
+				{
+					Enabled = false;
+					Enabled = true;
+				}
+			}
+
 			if (Element == null || Element.CornerRadius <= 0)
 			{
 				base.Draw(canvas);
diff --git a/Xamarin.Forms.Material.Android/MaterialColors.cs b/Xamarin.Forms.Material.Android/MaterialColors.cs
@@ -56,10 +56,6 @@ internal static class MaterialColors
 	const float kFilledTextFieldIndicatorLineAlpha = 0.42f;
 	const float kFilledTextFieldIconAlpha = 0.54f;
 
-	// the idea of this value is that I want Active to be the exact color the user specified
-	// and then all the other colors decrease according to the Material theme setup
-	static float kFilledPlaceHolderOffset = 1f - kFilledTextFieldActiveAlpha;
-
 	// State list from material-components-android
 	// https://github.com/material-components/material-components-android/blob/71694616056012fe1162adb9144be903d1e510d5/lib/java/com/google/android/material/textfield/res/values/colors.xml#L28
 	public static PlatformColor CreateEntryFilledInputBackgroundColor(Color backgroundColor, Color textColor)
@@ -77,24 +73,29 @@ public static PlatformColor CreateEntryFilledInputBackgroundColor(Color backgrou
 		return ToPlatformColor(backgroundColor);
 	}
 
-	public static (PlatformColor InlineColor, PlatformColor FloatingColor) GetPlaceHolderColor(Color placeholderColor, Color textColor)
+	public static (PlatformColor InlineColor, PlatformColor FloatingColor, PlatformColor DefaultColor) GetPlaceHolderColor(Color placeholderColor, Color textColor)
 	{
 		PlatformColor inlineColor;
 		PlatformColor floatingColor;
-		float inlineAlpha = kFilledTextFieldOnSurfaceAlpha + kFilledPlaceHolderOffset;
+		PlatformColor defaultColor;
 
 		if (placeholderColor == Color.Default)
 		{
-			inlineColor = WithAlpha(MaterialColors.Light.OnSurfaceColor, inlineAlpha);
+			inlineColor = WithAlpha(MaterialColors.Light.OnSurfaceColor, kFilledTextFieldDisabledAlpha);
+
+			defaultColor = WithAlpha(MaterialColors.Light.OnSurfaceColor, kFilledTextFieldOnSurfaceAlpha);
+
 			floatingColor = MaterialColors.Light.PrimaryColor;
+
 		}
 		else
 		{
-			inlineColor = WithAlpha(ToPlatformColor(placeholderColor), inlineAlpha);
+			inlineColor = ToPlatformColor(placeholderColor);
 			floatingColor = ToPlatformColor(placeholderColor);
+			defaultColor = ToPlatformColor(placeholderColor);
 		}
 
-		return (inlineColor, floatingColor);
+		return (inlineColor, floatingColor, defaultColor);
 	}
 
 	public static (PlatformColor FocusedColor, PlatformColor UnFocusedColor) GetUnderlineColor(Color placeholderColor)
@@ -138,7 +139,7 @@ public static PlatformColor GetCheckBoxColor(bool isChecked, bool isEnabled)
 		public static readonly int[][] ButtonTextStates =
 		{
 			new int[] { global::Android.Resource.Attribute.StateEnabled },
-			new int[] { ~global::Android.Resource.Attribute.StateEnabled },
+			new int[] { -global::Android.Resource.Attribute.StateEnabled },
 			new int[] { }
 		};
 
@@ -152,6 +153,9 @@ public static PlatformColor GetCheckBoxColor(bool isChecked, bool isEnabled)
 		{
 			new []{ global::Android.Resource.Attribute.StateFocused  },
 			new []{ -global::Android.Resource.Attribute.StateFocused  },
+			new int[] { global::Android.Resource.Attribute.StateEnabled },
+			new int[] { -global::Android.Resource.Attribute.StateEnabled },
+			new int[0] { }
 		};
 
 		// State list from material-components-android
@@ -174,7 +178,7 @@ public static ColorStateList CreateEntryFilledPlaceholderColors(PlatformColor in
 		{
 			int[][] States =
 			{
-				new []{ ~global::Android.Resource.Attribute.StateEnabled },
+				new []{ -global::Android.Resource.Attribute.StateEnabled },
 				new int[0] { }
 			};
 
@@ -184,7 +188,7 @@ public static ColorStateList CreateEntryFilledPlaceholderColors(PlatformColor in
 
 		public static ColorStateList CreateEntryUnderlineColors(PlatformColor focusedColor, PlatformColor unfocusedColor)
 		{
-			var colors = new int[] { focusedColor, unfocusedColor };
+			var colors = new int[] { focusedColor, unfocusedColor, focusedColor, focusedColor, unfocusedColor };
 			return new ColorStateList(EntryUnderlineStates, colors);
 		}
 
diff --git a/Xamarin.Forms.Material.Android/MaterialDatePickerRenderer.cs b/Xamarin.Forms.Material.Android/MaterialDatePickerRenderer.cs
@@ -39,13 +39,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<DatePicker> e)
 			UpdateBackgroundColor();
 		}
 
-		protected override void UpdateBackgroundColor()
-		{
-			if (_textInputLayout == null)
-				return;
-
-			_textInputLayout.BoxBackgroundColor = MaterialColors.CreateEntryFilledInputBackgroundColor(Element.BackgroundColor, Element.TextColor);
-		}
+		protected override void UpdateBackgroundColor() =>
+			_textInputLayout?.ApplyBackgroundColor(Element.BackgroundColor, Element.TextColor);
 
 		protected override void UpdateTextColor() => ApplyTheme();
 		void ApplyTheme() => _textInputLayout?.ApplyTheme(Element.TextColor, Color.Default);
diff --git a/Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs b/Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs
@@ -39,13 +39,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<Editor> e)
 			UpdateBackgroundColor();
 		}
 
-		protected override void UpdateBackgroundColor()
-		{
-			if (_disposed || _textInputLayout == null)
-				return;
-
-			_textInputLayout.BoxBackgroundColor = MaterialColors.CreateEntryFilledInputBackgroundColor(Element.BackgroundColor, Element.TextColor);
-		}
+		protected override void UpdateBackgroundColor() =>
+			_textInputLayout?.ApplyBackgroundColor(Element.BackgroundColor, Element.TextColor);
 
 		protected override void UpdatePlaceholderText()
 		{
diff --git a/Xamarin.Forms.Material.Android/MaterialEntryRenderer.cs b/Xamarin.Forms.Material.Android/MaterialEntryRenderer.cs
@@ -39,13 +39,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<Entry> e)
 
 		protected override void UpdateColor() => ApplyTheme();
 
-		protected override void UpdateBackgroundColor()
-		{
-			if (_textInputLayout == null)
-				return;
-
-			_textInputLayout.BoxBackgroundColor = MaterialColors.CreateEntryFilledInputBackgroundColor(Element.BackgroundColor, Element.TextColor);
-		}
+		protected override void UpdateBackgroundColor() =>
+			_textInputLayout?.ApplyBackgroundColor(Element.BackgroundColor, Element.TextColor);
 
 		protected override void UpdatePlaceHolderText() => _textInputLayout.SetHint(Element.Placeholder, Element);
 		protected override EditText EditText => _textInputEditText;
diff --git a/Xamarin.Forms.Material.Android/MaterialFormsTextInputLayoutBase.cs b/Xamarin.Forms.Material.Android/MaterialFormsTextInputLayoutBase.cs
@@ -18,7 +18,9 @@ public class MaterialFormsTextInputLayoutBase : TextInputLayout
 		Color _formsPlaceholderColor;
 		bool _isSetup = false;
 		ColorStateList _placeholderColorsList;
-
+		ColorStateList _placeholderDefaultColorList;
+		ColorStateList _underlineColorsList;
+		
 		static readonly int[][] s_colorStates = { new[] { global::Android.Resource.Attribute.StateEnabled }, new[] { -global::Android.Resource.Attribute.StateEnabled } };
 		bool _disposed = false;
 
@@ -46,12 +48,21 @@ void ResetTextColors(Color formsTextColor, Color formsPlaceHolderColor)
 			var underlineColors = MaterialColors.GetUnderlineColor(_formsPlaceholderColor);
 			var placeHolderColors = MaterialColors.GetPlaceHolderColor(_formsPlaceholderColor, _formsTextColor);
 			_placeholderColorsList = MaterialColors.CreateEntryFilledPlaceholderColors(placeHolderColors.InlineColor, placeHolderColors.FloatingColor);
-
-
+			_placeholderDefaultColorList = MaterialColors.CreateEntryFilledPlaceholderColors(placeHolderColors.InlineColor, placeHolderColors.DefaultColor);
+			_underlineColorsList = MaterialColors.CreateEntryUnderlineColors(underlineColors.FocusedColor, underlineColors.UnFocusedColor);
 			var textColor = MaterialColors.GetEntryTextColor(formsTextColor).ToArgb();
 			EditText.SetTextColor(new ColorStateList(s_colorStates, new[] { textColor, textColor }));
 		}
 
+		public virtual void ApplyBackgroundColor(Color backgroundColor, Color textColor)
+		{
+			if (!this.IsAlive() || !this.EditText.IsAlive())
+				return;
+
+			var bgColor = (int)MaterialColors.CreateEntryFilledInputBackgroundColor(backgroundColor, textColor);
+			this.SetBoxBackgroundColorStateList(new ColorStateList(s_colorStates, new[] { bgColor, bgColor }));
+		}
+
 		public virtual void ApplyTheme(Color formsTextColor, Color formsPlaceHolderColor)
 		{
 			if (_disposed)
@@ -67,9 +78,10 @@ public virtual void ApplyTheme(Color formsTextColor, Color formsPlaceHolderColor
 			{
 				ResetTextColors(formsTextColor, formsPlaceHolderColor);
 			}
-			this.DefaultHintTextColor = _placeholderColorsList;
-			this.HintTextColor = _placeholderColorsList.ToDefaultOnlyColorStateList();
-			this.BoxStrokeColor = _placeholderColorsList.DefaultColor;
+
+			this.DefaultHintTextColor = _placeholderDefaultColorList;
+			this.HintTextColor = _placeholderColorsList;
+			this.SetBoxStrokeColorStateList(_underlineColorsList);
 		}
 
 		void ApplyTheme() => ApplyTheme(_formsTextColor, _formsPlaceholderColor);
diff --git a/Xamarin.Forms.Material.Android/MaterialPickerRenderer.cs b/Xamarin.Forms.Material.Android/MaterialPickerRenderer.cs
@@ -38,13 +38,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<Picker> e)
 			UpdateBackgroundColor();
 		}
 
-		protected override void UpdateBackgroundColor()
-		{
-			if (_textInputLayout == null)
-				return;
-
-			_textInputLayout.BoxBackgroundColor = MaterialColors.CreateEntryFilledInputBackgroundColor(Element.BackgroundColor, Element.TextColor);
-		}
+		protected override void UpdateBackgroundColor() =>
+			_textInputLayout?.ApplyBackgroundColor(Element.BackgroundColor, Element.TextColor);
 
 		protected override void UpdatePlaceHolderText()
 		{
diff --git a/Xamarin.Forms.Material.Android/MaterialTimePickerRenderer.cs b/Xamarin.Forms.Material.Android/MaterialTimePickerRenderer.cs
@@ -40,13 +40,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<TimePicker> e)
 			UpdateBackgroundColor();
 		}
 
-		protected override void UpdateBackgroundColor()
-		{
-			if (_textInputLayout == null)
-				return;
-
-			_textInputLayout.BoxBackgroundColor = MaterialColors.CreateEntryFilledInputBackgroundColor(Element.BackgroundColor, Element.TextColor);
-		}
+		protected override void UpdateBackgroundColor() =>
+			_textInputLayout?.ApplyBackgroundColor(Element.BackgroundColor, Element.TextColor);
 
 		protected override void UpdateTextColor() => ApplyTheme();
 
diff --git a/Xamarin.Forms.Material.iOS/MaterialTextManager.cs b/Xamarin.Forms.Material.iOS/MaterialTextManager.cs

Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,6 @@ internal static class MaterialColors`
`56`	`56`	`const float kFilledTextFieldIndicatorLineAlpha = 0.42f;`
`57`	`57`	`const float kFilledTextFieldIconAlpha = 0.54f;`
`58`	`58`
`59`		`- // the idea of this value is that I want Active to be the exact color the user specified`
`60`		`- // and then all the other colors decrease according to the Material theme setup`
`61`		`- static float kFilledPlaceHolderOffset = 1f - kFilledTextFieldActiveAlpha;`
`62`		`-`
`63`	`59`	`// State list from material-components-android`
`64`	`60`	`// https://github.com/material-components/material-components-android/blob/71694616056012fe1162adb9144be903d1e510d5/lib/java/com/google/android/material/textfield/res/values/colors.xml#L28`
`65`	`61`	`public static PlatformColor CreateEntryFilledInputBackgroundColor(Color backgroundColor, Color textColor)`
`@@ -77,24 +73,29 @@ public static PlatformColor CreateEntryFilledInputBackgroundColor(Color backgrou`
`77`	`73`	`return ToPlatformColor(backgroundColor);`
`78`	`74`	`}`
`79`	`75`
`80`		`- public static (PlatformColor InlineColor, PlatformColor FloatingColor) GetPlaceHolderColor(Color placeholderColor, Color textColor)`
	`76`	`+ public static (PlatformColor InlineColor, PlatformColor FloatingColor, PlatformColor DefaultColor) GetPlaceHolderColor(Color placeholderColor, Color textColor)`
`81`	`77`	`{`
`82`	`78`	`PlatformColor inlineColor;`
`83`	`79`	`PlatformColor floatingColor;`
`84`		`- float inlineAlpha = kFilledTextFieldOnSurfaceAlpha + kFilledPlaceHolderOffset;`
	`80`	`+ PlatformColor defaultColor;`
`85`	`81`
`86`	`82`	`if (placeholderColor == Color.Default)`
`87`	`83`	`{`
`88`		`- inlineColor = WithAlpha(MaterialColors.Light.OnSurfaceColor, inlineAlpha);`
	`84`	`+ inlineColor = WithAlpha(MaterialColors.Light.OnSurfaceColor, kFilledTextFieldDisabledAlpha);`
	`85`	`+`
	`86`	`+ defaultColor = WithAlpha(MaterialColors.Light.OnSurfaceColor, kFilledTextFieldOnSurfaceAlpha);`
	`87`	`+`
`89`	`88`	`floatingColor = MaterialColors.Light.PrimaryColor;`
	`89`	`+`
`90`	`90`	`}`
`91`	`91`	`else`
`92`	`92`	`{`
`93`		`- inlineColor = WithAlpha(ToPlatformColor(placeholderColor), inlineAlpha);`
	`93`	`+ inlineColor = ToPlatformColor(placeholderColor);`
`94`	`94`	`floatingColor = ToPlatformColor(placeholderColor);`
	`95`	`+ defaultColor = ToPlatformColor(placeholderColor);`
`95`	`96`	`}`
`96`	`97`
`97`		`- return (inlineColor, floatingColor);`
	`98`	`+ return (inlineColor, floatingColor, defaultColor);`
`98`	`99`	`}`
`99`	`100`
`100`	`101`	`public static (PlatformColor FocusedColor, PlatformColor UnFocusedColor) GetUnderlineColor(Color placeholderColor)`
`@@ -138,7 +139,7 @@ public static PlatformColor GetCheckBoxColor(bool isChecked, bool isEnabled)`
`138`	`139`	`public static readonly int[][] ButtonTextStates =`
`139`	`140`	`{`
`140`	`141`	`new int[] { global::Android.Resource.Attribute.StateEnabled },`
`141`		`- new int[] { ~global::Android.Resource.Attribute.StateEnabled },`
	`142`	`+ new int[] { -global::Android.Resource.Attribute.StateEnabled },`
`142`	`143`	`new int[] { }`
`143`	`144`	`};`
`144`	`145`
`@@ -152,6 +153,9 @@ public static PlatformColor GetCheckBoxColor(bool isChecked, bool isEnabled)`
`152`	`153`	`{`
`153`	`154`	`new []{ global::Android.Resource.Attribute.StateFocused },`
`154`	`155`	`new []{ -global::Android.Resource.Attribute.StateFocused },`
	`156`	`+ new int[] { global::Android.Resource.Attribute.StateEnabled },`
	`157`	`+ new int[] { -global::Android.Resource.Attribute.StateEnabled },`
	`158`	`+ new int[0] { }`
`155`	`159`	`};`
`156`	`160`
`157`	`161`	`// State list from material-components-android`
`@@ -174,7 +178,7 @@ public static ColorStateList CreateEntryFilledPlaceholderColors(PlatformColor in`
`174`	`178`	`{`
`175`	`179`	`int[][] States =`
`176`	`180`	`{`
`177`		`- new []{ ~global::Android.Resource.Attribute.StateEnabled },`
	`181`	`+ new []{ -global::Android.Resource.Attribute.StateEnabled },`
`178`	`182`	`new int[0] { }`
`179`	`183`	`};`
`180`	`184`
`@@ -184,7 +188,7 @@ public static ColorStateList CreateEntryFilledPlaceholderColors(PlatformColor in`
`184`	`188`
`185`	`189`	`public static ColorStateList CreateEntryUnderlineColors(PlatformColor focusedColor, PlatformColor unfocusedColor)`
`186`	`190`	`{`
`187`		`- var colors = new int[] { focusedColor, unfocusedColor };`
	`191`	`+ var colors = new int[] { focusedColor, unfocusedColor, focusedColor, focusedColor, unfocusedColor };`
`188`	`192`	`return new ColorStateList(EntryUnderlineStates, colors);`
`189`	`193`	`}`
`190`	`194`
Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,8 @@ protected override void OnElementChanged(ElementChangedEventArgs<Editor> e)`
`39`	`39`	`UpdateBackgroundColor();`
`40`	`40`	`}`
`41`	`41`
`42`		`- protected override void UpdateBackgroundColor()`
`43`		`- {`
`44`		`- if (_disposed \|\| _textInputLayout == null)`
`45`		`- return;`
`46`		`-`
`47`		`- _textInputLayout.BoxBackgroundColor = MaterialColors.CreateEntryFilledInputBackgroundColor(Element.BackgroundColor, Element.TextColor);`
`48`		`- }`
	`42`	`+ protected override void UpdateBackgroundColor() =>`
	`43`	`+ _textInputLayout?.ApplyBackgroundColor(Element.BackgroundColor, Element.TextColor);`
`49`	`44`
`50`	`45`	`protected override void UpdatePlaceholderText()`
`51`	`46`	`{`