Upstream/bitwarden-mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile.git synced 2025-02-18 01:31:42 +01:00
Code Issues Projects Releases Wiki Activity

bottom border on picker and no padding on editor

Browse Source
This commit is contained in:
Kyle Spearrin 2019-06-21 16:36:23 -04:00
parent d44950d46c
commit 39284b475d
5 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/App/Styles/iOS.xaml
View File

@ -9,6 +9,11 @@
<Setter Property="Margin" <Setter Property="Margin"
Value="0, 5, 0, 12" /> Value="0, 5, 0, 12" />
</Style> </Style>
<Style TargetType="Picker"
ApplyToDerivedTypes="True">
<Setter Property="Margin"
Value="0, 5, 0, 12" />
</Style>
<Style TargetType="Editor" <Style TargetType="Editor"
ApplyToDerivedTypes="True"> ApplyToDerivedTypes="True">
<Setter Property="PlaceholderColor" <Setter Property="PlaceholderColor"

3
src/iOS/Renderers/CustomEditorRenderer.cs
View File

@ -15,6 +15,9 @@ namespace Bit.iOS.Renderers
{ {
var descriptor = UIFontDescriptor.PreferredBody; var descriptor = UIFontDescriptor.PreferredBody;
Control.Font = UIFont.FromDescriptor(descriptor, descriptor.PointSize); Control.Font = UIFont.FromDescriptor(descriptor, descriptor.PointSize);
// Remove padding
Control.TextContainerInset = new UIEdgeInsets(0, 0, 0, 0);
Control.TextContainer.LineFragmentPadding = 0;
} }
} }
} }

23
src/iOS/Renderers/CustomEntryRenderer.cs
View File

@ -17,7 +17,7 @@ namespace Bit.iOS.Renderers
{ {
Control.ClearButtonMode = UITextFieldViewMode.WhileEditing; Control.ClearButtonMode = UITextFieldViewMode.WhileEditing;
UpdateFontSize(); UpdateFontSize();
SetBottomBorder(); iOSHelpers.SetBottomBorder(Control);
} }
} }
@ -47,26 +47,5 @@ namespace Bit.iOS.Renderers
} }
} }
} }
private void SetBottomBorder()
{
Control.BorderStyle = UITextBorderStyle.None;
var borderLine = new UIView
{
BackgroundColor = ((Color)Xamarin.Forms.Application.Current.Resources["BoxBorderColor"]).ToUIColor(),
TranslatesAutoresizingMaskIntoConstraints = false
};
Control.AddSubview(borderLine);
Control.AddConstraints(new NSLayoutConstraint[]
{
NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Height, NSLayoutRelation.Equal, 1, 1f),
NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Leading, NSLayoutRelation.Equal,
Control, NSLayoutAttribute.Leading, 1, 0),
NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Trailing, NSLayoutRelation.Equal,
Control, NSLayoutAttribute.Trailing, 1, 0),
NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Top, NSLayoutRelation.Equal,
Control, NSLayoutAttribute.Bottom, 1, 10f),
});
}
} }
} }

2
src/iOS/Renderers/CustomPickerRenderer.cs
View File

@ -1,4 +1,5 @@
using Bit.iOS.Renderers; using Bit.iOS.Renderers;
using Bit.iOS.Utilities;
using UIKit; using UIKit;
using Xamarin.Forms; using Xamarin.Forms;
using Xamarin.Forms.Platform.iOS; using Xamarin.Forms.Platform.iOS;
@ -15,6 +16,7 @@ namespace Bit.iOS.Renderers
{ {
var descriptor = UIFontDescriptor.PreferredBody; var descriptor = UIFontDescriptor.PreferredBody;
Control.Font = UIFont.FromDescriptor(descriptor, descriptor.PointSize); Control.Font = UIFont.FromDescriptor(descriptor, descriptor.PointSize);
iOSHelpers.SetBottomBorder(Control);
} }
} }
} }

32
src/iOS/Utilities/iOSHelpers.cs
View File

@ -1,5 +1,6 @@
using UIKit; using UIKit;
using Xamarin.Forms; using Xamarin.Forms;
using Xamarin.Forms.Platform.iOS;
namespace Bit.iOS.Utilities namespace Bit.iOS.Utilities
{ {
@ -27,5 +28,36 @@ namespace Bit.iOS.Utilities
} }
return pointSize; return pointSize;
} }
public static void SetBottomBorder(UITextField control)
{
control.BorderStyle = UITextBorderStyle.None;
SetBottomBorder(control as UIView);
}
public static void SetBottomBorder(UITextView control)
{
SetBottomBorder(control as UIView);
}
private static void SetBottomBorder(UIView control)
{
var borderLine = new UIView
{
BackgroundColor = ((Color)Xamarin.Forms.Application.Current.Resources["BoxBorderColor"]).ToUIColor(),
TranslatesAutoresizingMaskIntoConstraints = false
};
control.AddSubview(borderLine);
control.AddConstraints(new NSLayoutConstraint[]
{
NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Height, NSLayoutRelation.Equal, 1, 1f),
NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Leading, NSLayoutRelation.Equal,
control, NSLayoutAttribute.Leading, 1, 0),
NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Trailing, NSLayoutRelation.Equal,
control, NSLayoutAttribute.Trailing, 1, 0),
NSLayoutConstraint.Create(borderLine, NSLayoutAttribute.Top, NSLayoutRelation.Equal,
control, NSLayoutAttribute.Bottom, 1, 10f),
});
}
} }
} }