From 5dc4357078ce0dd7e491791db159f25f3d548754 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 7 May 2019 23:22:25 -0400
Subject: [PATCH] padding/margins for entry/picker

---
 .../Renderers/CustomEntryBarRenderer.cs       | 25 +++++++++++++++++++
 .../Renderers/CustomPickerBarRenderer.cs      | 25 +++++++++++++++++++
 src/App/Styles/Android.xaml                   |  7 +++++-
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 src/Android/Renderers/CustomEntryBarRenderer.cs
 create mode 100644 src/Android/Renderers/CustomPickerBarRenderer.cs

diff --git a/src/Android/Renderers/CustomEntryBarRenderer.cs b/src/Android/Renderers/CustomEntryBarRenderer.cs
new file mode 100644
index 000000000..d93d53b09
--- /dev/null
+++ b/src/Android/Renderers/CustomEntryBarRenderer.cs
@@ -0,0 +1,25 @@
+using Android.Content;
+using Bit.Droid.Renderers.BoxedView;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(Entry), typeof(CustomEntryBarRenderer))]
+namespace Bit.Droid.Renderers.BoxedView
+{
+    public class CustomEntryBarRenderer : EntryRenderer
+    {
+        public CustomEntryBarRenderer(Context context)
+            : base(context)
+        { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<Entry> e)
+        {
+            base.OnElementChanged(e);
+            if(Control != null && e.NewElement != null)
+            {
+                Control.SetPadding(Control.PaddingLeft, Control.PaddingTop - 10, Control.PaddingRight,
+                    Control.PaddingBottom + 20);
+            }
+        }
+    }
+}
diff --git a/src/Android/Renderers/CustomPickerBarRenderer.cs b/src/Android/Renderers/CustomPickerBarRenderer.cs
new file mode 100644
index 000000000..eda4c131f
--- /dev/null
+++ b/src/Android/Renderers/CustomPickerBarRenderer.cs
@@ -0,0 +1,25 @@
+using Android.Content;
+using Bit.Droid.Renderers.BoxedView;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Android;
+
+[assembly: ExportRenderer(typeof(Picker), typeof(CustomPickerBarRenderer))]
+namespace Bit.Droid.Renderers.BoxedView
+{
+    public class CustomPickerBarRenderer : PickerRenderer
+    {
+        public CustomPickerBarRenderer(Context context)
+            : base(context)
+        { }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<Picker> e)
+        {
+            base.OnElementChanged(e);
+            if(Control != null && e.NewElement != null)
+            {
+                Control.SetPadding(Control.PaddingLeft, Control.PaddingTop - 10, Control.PaddingRight,
+                    Control.PaddingBottom + 20);
+            }
+        }
+    }
+}
diff --git a/src/App/Styles/Android.xaml b/src/App/Styles/Android.xaml
index 8fd5a4006..b5de864ac 100644
--- a/src/App/Styles/Android.xaml
+++ b/src/App/Styles/Android.xaml
@@ -5,7 +5,12 @@
     <Style TargetType="Entry"
            ApplyToDerivedTypes="True">
         <Setter Property="Margin"
-                Value="-4, 0" />
+                Value="-4, 0, -4, -4" />
+    </Style>
+    <Style TargetType="Picker"
+           ApplyToDerivedTypes="True">
+        <Setter Property="Margin"
+                Value="-4, 0, -4, -4" />
     </Style>
     
     <!-- Buttons -->