Change default value of focused properties (#29)

* focused

* border, back

* Restore properties to the styles

Co-authored-by: Agustin Bonilla <agustin.bonilla@horus.com.uy>

Author: agaldanaw2

example/ExampleMaterialDesignControls.iOS/ExampleMaterialDesignControls.iOS.csproj

@@ -172,6 +172,8 @@
     <ProjectReference Include="..\..\src\MaterialDesignControls.iOS\MaterialDesignControls.iOS.csproj">
       <Project>{2BFC48FE-5BE1-4482-8469-77DDA82D13C8}</Project>
       <Name>MaterialDesignControls.iOS</Name>
+      <IsAppExtension>false</IsAppExtension>
+      <IsWatchApp>false</IsWatchApp>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>

example/ExampleMaterialDesignControls.sln

@@ -77,7 +77,7 @@ public Color TextColor
         }
 
         public static readonly BindableProperty FocusedTextColorProperty =
-            BindableProperty.Create(nameof(FocusedTextColor), typeof(Color), typeof(BaseMaterialFieldControl), defaultValue: Color.Gray);
+            BindableProperty.Create(nameof(FocusedTextColor), typeof(Color), typeof(BaseMaterialFieldControl), defaultValue: Color.Transparent);
 
         public Color FocusedTextColor
         {
@@ -157,7 +157,7 @@ public Color LabelTextColor
         }
 
         public static readonly BindableProperty FocusedLabelTextColorProperty =
-            BindableProperty.Create(nameof(FocusedLabelTextColor), typeof(Color), typeof(BaseMaterialFieldControl), defaultValue: Color.Gray);
+            BindableProperty.Create(nameof(FocusedLabelTextColor), typeof(Color), typeof(BaseMaterialFieldControl), defaultValue: Color.Transparent);
 
         public Color FocusedLabelTextColor
         {
@@ -228,7 +228,7 @@ public Color BorderColor
         }
 
         public static readonly BindableProperty FocusedBorderColorProperty =
-            BindableProperty.Create(nameof(FocusedBorderColor), typeof(Color), typeof(BaseMaterialFieldControl), defaultValue: Color.LightGray);
+            BindableProperty.Create(nameof(FocusedBorderColor), typeof(Color), typeof(BaseMaterialFieldControl), defaultValue: Color.Transparent);
 
         public Color FocusedBorderColor
         {
@@ -387,7 +387,7 @@ private static bool OnAssistiveTextValidate(BindableObject bindable, object valu
         protected void SetLabelTextColor(Label lblLabel)
         {
             if (IsControlEnabled)
-                lblLabel.TextColor = IsControlFocused ? FocusedLabelTextColor : LabelTextColor;
+                lblLabel.TextColor = IsControlFocused && FocusedLabelTextColor != Color.Transparent ? FocusedLabelTextColor : LabelTextColor;
             else
                 lblLabel.TextColor = DisabledLabelTextColor;
         }
@@ -399,12 +399,12 @@ private void SetBorderAndBackgroundColors(Frame frmContainer, BoxView bxvLine)
                 case FieldTypes.Outlined:
                 case FieldTypes.Filled:
                     if (IsControlEnabled)
-                        frmContainer.BackgroundColor = IsControlFocused ? FocusedBackgroundColor : BackgroundColorControl;
+                        frmContainer.BackgroundColor = IsControlFocused && FocusedBackgroundColor != Color.Transparent ? FocusedBackgroundColor : BackgroundColorControl;
                     else
                         frmContainer.BackgroundColor = DisabledBackgroundColor;
 
                     if (IsControlEnabled)
-                        frmContainer.BorderColor = IsControlFocused ? FocusedBorderColor : BorderColor;
+                        frmContainer.BorderColor = IsControlFocused && FocusedBorderColor != Color.Transparent ? FocusedBorderColor : BorderColor;
                     else
                         frmContainer.BorderColor = DisabledBorderColor;
 
@@ -416,7 +416,7 @@ private void SetBorderAndBackgroundColors(Frame frmContainer, BoxView bxvLine)
                     bxvLine.IsVisible = true;
 
                     if (IsControlEnabled)
-                        bxvLine.Color = IsControlFocused ? FocusedBorderColor : BorderColor;
+                        bxvLine.Color = IsControlFocused && FocusedBorderColor != Color.Transparent ? FocusedBorderColor : BorderColor;
                     else
                         bxvLine.Color = DisabledBorderColor;
                     break;

src/MaterialDesignControls/Controls/BaseMaterialFieldControl.cs

@@ -393,7 +393,7 @@ protected override void SetTextColor()
                 foreach (var lblCode in lblCodes)
                 {
                     if (IsControlEnabled)
-                        lblCode.TextColor = IsControlFocused ? FocusedTextColor : TextColor;
+                        lblCode.TextColor = IsControlFocused && FocusedTextColor != Color.Transparent ? FocusedTextColor : TextColor;
                     else
                         lblCode.TextColor = DisabledTextColor;
                 }
@@ -444,12 +444,12 @@ private void SetTypeBackgroundAndBorderColor()
                         foreach (var frmContainer in frmContainers)
                         {
                             if (IsControlEnabled)
-                                frmContainer.BackgroundColor = IsControlFocused ? FocusedBackgroundColor : BackgroundColorControl;
+                                frmContainer.BackgroundColor = IsControlFocused && FocusedBackgroundColor != Color.Transparent ? FocusedBackgroundColor : BackgroundColorControl;
                             else
                                 frmContainer.BackgroundColor = DisabledBackgroundColor;
 
                             if (IsControlEnabled)
-                                frmContainer.BorderColor = IsControlFocused ? FocusedBorderColor : BorderColor;
+                                frmContainer.BorderColor = IsControlFocused && FocusedBorderColor != Color.Transparent ? FocusedBorderColor : BorderColor;
                             else
                                 frmContainer.BorderColor = DisabledBorderColor;
                         }
@@ -469,7 +469,7 @@ private void SetTypeBackgroundAndBorderColor()
                     bxvLine.IsVisible = true;
 
                     if (IsControlEnabled)
-                        bxvLine.Color = IsControlFocused ? FocusedBorderColor : BorderColor;
+                        bxvLine.Color = IsControlFocused &&  FocusedBorderColor != Color.Transparent ? FocusedBorderColor : BorderColor;
                     else
                         bxvLine.Color = DisabledBorderColor;
 

src/MaterialDesignControls/Controls/MaterialCodeEntry.xaml.cs

@@ -177,7 +177,7 @@ protected override void SetPadding()
         protected override void SetTextColor()
         {
             if (IsControlEnabled)
-                pckDate.TextColor = IsControlFocused ? FocusedTextColor : TextColor;
+                pckDate.TextColor = IsControlFocused && FocusedTextColor != Color.Transparent ? FocusedTextColor : TextColor;
             else
                 pckDate.TextColor = DisabledTextColor;
         }

src/MaterialDesignControls/Controls/MaterialDatePicker.xaml.cs

@@ -304,7 +304,7 @@ protected override void SetPadding()
         protected override void SetTextColor()
         {
             if (IsControlEnabled)
-                pckOptions.TextColor = IsControlFocused ? FocusedTextColor : TextColor;
+                pckOptions.TextColor = IsControlFocused && FocusedTextColor != Color.Transparent ? FocusedTextColor : TextColor;
             else
                 pckOptions.TextColor = DisabledTextColor;
         }

src/MaterialDesignControls/Controls/MaterialDoublePicker.xaml.cs

@@ -273,7 +273,7 @@ protected override void SetPadding()
         protected override void SetTextColor()
         {
             if (IsControlEnabled)
-                txtEditor.TextColor = IsControlFocused ? FocusedTextColor : TextColor;
+                txtEditor.TextColor = IsControlFocused && FocusedTextColor != Color.Transparent ? FocusedTextColor : TextColor;
             else
                 txtEditor.TextColor = DisabledTextColor;
         }

src/MaterialDesignControls/Controls/MaterialEditor.xaml.cs

@@ -433,7 +433,7 @@ protected override void SetPadding()
         protected override void SetTextColor()
         {
             if (IsControlEnabled)
-                txtEntry.TextColor = IsControlFocused ? FocusedTextColor : TextColor;
+                txtEntry.TextColor = IsControlFocused && FocusedTextColor != Color.Transparent ? FocusedTextColor : TextColor;
             else
                 txtEntry.TextColor = DisabledTextColor;
         }

src/MaterialDesignControls/Controls/MaterialEntry.xaml.cs

@@ -258,7 +258,7 @@ protected override void SetPadding()
         protected override void SetTextColor()
         {
             if (IsControlEnabled)
-                pckOptions.TextColor = IsControlFocused ? FocusedTextColor : TextColor;
+                pckOptions.TextColor = IsControlFocused && FocusedTextColor != Color.Transparent ? FocusedTextColor : TextColor;
             else
                 pckOptions.TextColor = DisabledTextColor;
         }

src/MaterialDesignControls/Controls/MaterialPicker.xaml.cs

@@ -153,7 +153,7 @@ protected override void SetPadding()
         protected override void SetTextColor()
         {
             if (IsControlEnabled)
-                pckTime.TextColor = IsControlFocused ? FocusedTextColor : TextColor;
+                pckTime.TextColor = IsControlFocused && FocusedTextColor != Color.Transparent ? FocusedTextColor : TextColor;
             else
                 pckTime.TextColor = DisabledTextColor;
         }