Merge remote-tracking branch 'origin/develop'

Author: michaelstonis

AuroraControls.TestApp/StyledInputLayoutTestPage.xaml

@@ -46,8 +46,8 @@
                     <aurora:StyledInputLayout
 
                         PlaceholderColor="Black"
-                        ActiveColor="Red"
-                        InactiveColor="Green"
+                        ActiveColor="Transparent"
+                        InactiveColor="Transparent"
                         VerticalOptions="Start"
                         BorderStyle="RoundedRectanglePlaceholderThrough">
                         <Entry Placeholder="VerticalOptions=Start" />

AuroraControlsMaui/PlatformUnderlayDrawable.cs

@@ -560,10 +560,7 @@ private void DrawUnderlay(IUnderlayDrawable underlayDrawable, View element, Rect
             var internalMargin = underlayDrawable.InternalMargin;
 
             float placeholderFontSize = underlayDrawable.ActivePlaceholderFontSize * scale;
-            var placeholderColor =
-                underlayDrawable.PlaceholderColor != default(Color)
-                    ? underlayDrawable.PlaceholderColor
-                    : HavePlaceholderElement.DefaultPlaceholderColor;
+            var placeholderColor = underlayDrawable.PlaceholderColor;
 
             float fontSize = (float)underlayDrawable.FontSize * scale;
 
@@ -722,26 +719,31 @@ private void DrawUnderlay(IUnderlayDrawable underlayDrawable, View element, Rect
             }
             else if (!string.IsNullOrEmpty(placeholder))
             {
-                _placeholderPaint.Color =
-                    placeholderColor
-                        .Lerp(
-                            underlayDrawable.ActiveColor,
-                            focusAnimationPercentage > 0d ? focusAnimationPercentage : hasValueAnimationPercentage)
-                        .ToSKColor();
-
                 if (placeholderFontSize > 0d)
                 {
-                    double placeholderY = controlYCenter.Lerp(focusedPlaceholderCenterY, hasValueAnimationPercentage);
+                    var currentColor = isFocused ? underlayDrawable.ActiveColor : underlayDrawable.InactiveColor;
+
+                    if (currentColor.Alpha > 0.0f)
+                    {
+                        _placeholderPaint.Color =
+                            placeholderColor
+                                .Lerp(
+                                    currentColor,
+                                    focusAnimationPercentage > 0d ? focusAnimationPercentage : hasValueAnimationPercentage)
+                                .ToSKColor();
 
-                    _placeholderPaint.TextSize = fontSize.Lerp(placeholderFontSize, (float)hasValueAnimationPercentage);
-                    _placeholderPaint.Color = _placeholderPaint.Color.WithAlpha((float)hasValueAnimationPercentage);
+                        double placeholderY = controlYCenter.Lerp(focusedPlaceholderCenterY, hasValueAnimationPercentage);
 
-                    _placeholderPaint.EnsureHasValidFont(placeholder);
+                        _placeholderPaint.TextSize = fontSize.Lerp(placeholderFontSize, (float)hasValueAnimationPercentage);
+                        _placeholderPaint.Color = _placeholderPaint.Color.WithAlpha((float)hasValueAnimationPercentage);
 
-                    canvas.DrawTextCenteredVertically(placeholder, new SKPoint((float)controlXLeft, (float)placeholderY), _placeholderPaint);
+                        _placeholderPaint.EnsureHasValidFont(placeholder);
+
+                        canvas.DrawTextCenteredVertically(placeholder, new SKPoint((float)controlXLeft, (float)placeholderY), _placeholderPaint);
+                    }
                 }
 
-                _placeholderPaint.Color = placeholderColor.ToSKColor().WithAlpha(1f - (float)hasValueAnimationPercentage);
+                _placeholderPaint.Color = (placeholderColor?.ToSKColor() ?? SKColors.Transparent).WithAlpha(1f - (float)hasValueAnimationPercentage);
                 _placeholderPaint.TextSize = fontSize;
 
                 canvas.DrawTextCenteredVertically(placeholder, new SKPoint((float)controlXLeft, (float)controlYCenter), _placeholderPaint);

AuroraControlsMaui/UnderlayDrawableElement.cs

@@ -132,7 +132,7 @@ public static class HavePlaceholderElement
         BindableProperty.Create(nameof(IHavePlaceholder.Placeholder), typeof(bool), typeof(IHavePlaceholder), true);
 
     public static readonly BindableProperty PlaceholderColorProperty =
-        BindableProperty.Create(nameof(IHavePlaceholder.PlaceholderColor), typeof(Microsoft.Maui.Graphics.Color), typeof(IHavePlaceholder), default(Microsoft.Maui.Graphics.Color));
+        BindableProperty.Create(nameof(IHavePlaceholder.PlaceholderColor), typeof(Microsoft.Maui.Graphics.Color), typeof(IHavePlaceholder), DefaultPlaceholderColor);
 
     public static readonly BindableProperty PlaceholderOffsetProperty =
         BindableProperty.Create(nameof(IHavePlaceholder.PlaceholderOffset), typeof(Point), typeof(IHavePlaceholder), default(Point));