bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2025-12-16 00:03:22 +00:00
Code Issues Releases Wiki Activity

turn off uppercase for some android buttons

Browse Source
This commit is contained in:
Kyle Spearrin
2016-08-18 00:20:21 -04:00
parent a42c7a5198
commit 1ca4cceec8
4 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Android/Controls/ExtendedButtonRenderer.cs
View File

@@ -14,6 +14,7 @@ namespace Bit.Android.Controls
{ {
base.OnElementChanged(e); base.OnElementChanged(e);
SetPadding(); SetPadding();
SetUppercase();
} }
protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e) protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -23,6 +24,10 @@ namespace Bit.Android.Controls
{ {
SetPadding(); SetPadding();
} }
else if(e.PropertyName == ExtendedButton.UppercaseProperty.PropertyName)
{
SetUppercase();
}
} }
private void SetPadding() private void SetPadding()
@@ -37,5 +42,14 @@ namespace Bit.Android.Controls
(int)element.Padding.Bottom); (int)element.Padding.Bottom);
} }
} }
private void SetUppercase()
{
var element = Element as ExtendedButton;
if(element != null && !element.Uppercase)
{
Control.TransformationMethod = null;
}
}
} }
} }

9
src/App/Controls/ExtendedButton.cs
View File

@@ -8,11 +8,20 @@ namespace Bit.App.Controls
{ {
public static readonly BindableProperty PaddingProperty = public static readonly BindableProperty PaddingProperty =
BindableProperty.Create(nameof(Padding), typeof(Thickness), typeof(ExtendedButton), default(Thickness)); BindableProperty.Create(nameof(Padding), typeof(Thickness), typeof(ExtendedButton), default(Thickness));
public static readonly BindableProperty UppercaseProperty =
BindableProperty.Create(nameof(Padding), typeof(bool), typeof(ExtendedButton),
Device.OS == TargetPlatform.Android ? true : false);
public Thickness Padding public Thickness Padding
{ {
get { return (Thickness)GetValue(PaddingProperty); } get { return (Thickness)GetValue(PaddingProperty); }
set { SetValue(PaddingProperty, value); } set { SetValue(PaddingProperty, value); }
} }
public bool Uppercase
{
get { return (bool)GetValue(UppercaseProperty); }
set { SetValue(UppercaseProperty, value); }
}
} }
} }

6
src/App/Pages/LoginPage.cs
View File

@@ -90,12 +90,14 @@ namespace Bit.App.Pages
} }
}; };
var forgotPasswordButton = new Button var forgotPasswordButton = new ExtendedButton
{ {
Text = "Get your master password hint", Text = "Get your master password hint",
Style = (Style)Application.Current.Resources["btn-primaryAccent"], Style = (Style)Application.Current.Resources["btn-primaryAccent"],
Margin = new Thickness(15, 0, 15, 25), Margin = new Thickness(15, 0, 15, 25),
Command = new Command(async () => await ForgotPasswordAsync()) Command = new Command(async () => await ForgotPasswordAsync()),
Uppercase = false,
BackgroundColor = Color.Transparent
}; };
var layout = new StackLayout var layout = new StackLayout

14
src/iOS/Controls/ExtendedButtonRenderer.cs
View File

@@ -15,6 +15,7 @@ namespace Bit.iOS.Controls
{ {
base.OnElementChanged(e); base.OnElementChanged(e);
SetPadding(); SetPadding();
SetUppercase();
} }
protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e) protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -24,6 +25,10 @@ namespace Bit.iOS.Controls
{ {
SetPadding(); SetPadding();
} }
else if(e.PropertyName == ExtendedButton.UppercaseProperty.PropertyName)
{
SetUppercase();
}
} }
private void SetPadding() private void SetPadding()
@@ -38,5 +43,14 @@ namespace Bit.iOS.Controls
(int)element.Padding.Right); (int)element.Padding.Right);
} }
} }
private void SetUppercase()
{
var element = Element as ExtendedButton;
if(element != null && element.Uppercase)
{
Control.TitleLabel.Text = Control.TitleLabel.Text.ToUpper();
}
}
} }
} }