Merge pull request #140 from enisn/2.0-inputfield-spacing

Made inputfield spacings fixed for all
enisn · Nov 25, 2022 · 1e5eab4 · 1e5eab4
2 parents 945d977 + 9c7e9a3
commit 1e5eab4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/src/UraniumUI.Material/Controls/InputField.cs b/src/UraniumUI.Material/Controls/InputField.cs
@@ -50,7 +50,7 @@ public virtual View Content
             VerticalOptions = LayoutOptions.Center,
             WidthRequest = 20,
             HeightRequest = 20,
-            Margin = new Thickness(10,0),
+            Margin = new Thickness(10, 0, 0, 0),
         };
     });
 
@@ -100,6 +100,7 @@ public InputField()
 
         InitializeValidation();
     }
+
     ~InputField()
     {
         ReleaseEvents();
@@ -112,18 +113,18 @@ protected override async void OnSizeAllocated(double width, double height)
         InitializeBorder();
     }
 
-	// TODO: Remove this member hiding after android unfocus fixed.
-	public new void Unfocus()
-	{
-		base.Unfocus();
+    // TODO: Remove this member hiding after android unfocus fixed.
+    public new void Unfocus()
+    {
+        base.Unfocus();
 #if ANDROID
         var view = Content.Handler.PlatformView as Android.Views.View;
 
         view?.ClearFocus();
 #endif
-	}
+    }
 
-	private void InitializeBorder()
+    private void InitializeBorder()
     {
         var perimeter = (this.Width + this.Height) * 2;
         var calculatedFirstDash = FirstDash + CornerRadius.Clamp(FirstDash, double.MaxValue);
@@ -212,13 +213,13 @@ protected virtual void RegisterForEvents()
         }
     }
 
-	protected virtual void ReleaseEvents()
-	{
-		Content.Focused -= Content_Focused;
-		Content.Unfocused -= Content_Unfocused;
-	}
+    protected virtual void ReleaseEvents()
+    {
+        Content.Focused -= Content_Focused;
+        Content.Unfocused -= Content_Unfocused;
+    }
 
-	private void Content_Unfocused(object sender, FocusEventArgs e)
+    private void Content_Unfocused(object sender, FocusEventArgs e)
     {
         border.Stroke = BorderColor;
         labelTitle.TextColor = TitleColor;
@@ -256,6 +257,10 @@ protected virtual void OnIconChanged()
         {
             rootGrid.Add(imageIcon.Value, column: 0);
         }
+
+        var leftMargin = Icon != null ? 5 : 10;
+        this.Content.Margin = new Thickness(leftMargin, 0, 0, 0);
+
     }
     protected virtual void OnCornerRadiusChanged()
     {

diff --git a/src/UraniumUI.Material/Controls/PickerField.cs b/src/UraniumUI.Material/Controls/PickerField.cs
@@ -15,7 +15,7 @@ public class PickerField : InputField
 	public override View Content { get; set; } = new PickerView
 	{
 		VerticalOptions = LayoutOptions.Center,
-		Margin = new Thickness(10, 0),
+		Margin = new Thickness(15,0),
 #if WINDOWS
 		Opacity = 0,
 #endif
@@ -27,7 +27,7 @@ public class PickerField : InputField
 		InputTransparent = true,
 		HorizontalOptions = LayoutOptions.Start,
 		VerticalOptions = LayoutOptions.Center,
-        Margin = new Thickness(10,0),
+        Margin = new Thickness(15,0),
 		TextColor = ColorResource.GetColor("OnBackground", "OnBackgroundDark", Colors.Gray)
 	};
 #endif

diff --git a/src/UraniumUI.Material/Controls/TextField.cs b/src/UraniumUI.Material/Controls/TextField.cs
@@ -12,11 +12,7 @@ public partial class TextField : InputField
 
     public override View Content { get; set; } = new EntryView
     {
-#if WINDOWS
-        Margin = new Thickness(0, 1),
-#else
-        Margin = new Thickness(5, 1),
-#endif
+        Margin = new Thickness(10, 0),
         BackgroundColor = Colors.Transparent,
         VerticalOptions = LayoutOptions.Center
     };