mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-20 16:21:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Implemented specific entry padding for android api 21.

Browse source
This commit is contained in:
Kyle Spearrin 2016-08-23 23:15:28 -04:00
parent 043a4122b4
commit a7ba21f2f9
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/App/Controls/FormEntryCell.cs
View file

@ -1,5 +1,7 @@
using System; using Bit.App.Abstractions;
using System;
using Xamarin.Forms; using Xamarin.Forms;
using XLabs.Ioc;
namespace Bit.App.Controls namespace Bit.App.Controls
{ {
@ -79,11 +81,26 @@ namespace Bit.App.Controls
if(Device.OS == TargetPlatform.Android) if(Device.OS == TargetPlatform.Android)
{ {
if(!useLabelAsPlaceholder) var deviceInfo = Resolver.Resolve<IDeviceInfoService>();
if(useLabelAsPlaceholder)
{
if(deviceInfo.Version == 21)
{
Entry.Margin = new Thickness(0, 4, 0, -4);
}
}
else
{
if(deviceInfo.Version == 21)
{
Entry.Margin = new Thickness(-4, -2, -4, -11);
}
else
{ {
Entry.Margin = new Thickness(-4, -7, -4, -11); Entry.Margin = new Thickness(-4, -7, -4, -11);
} }
} }
}
if(!useLabelAsPlaceholder) if(!useLabelAsPlaceholder)
{ {

5
src/App/Controls/PinControl.cs
View file

@ -23,6 +23,11 @@ namespace Bit.App.Controls
Margin = new Thickness(0, int.MaxValue, 0, 0) Margin = new Thickness(0, int.MaxValue, 0, 0)
}; };
Entry.TextChanged += Entry_TextChanged; Entry.TextChanged += Entry_TextChanged;
if(Device.OS == TargetPlatform.Android)
{
Label.TextColor = Color.Black;
}
} }
private void Entry_TextChanged(object sender, TextChangedEventArgs e) private void Entry_TextChanged(object sender, TextChangedEventArgs e)