mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-10-31 23:25:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

style stweaks

Browse source
This commit is contained in:
Kyle Spearrin 2019-05-02 12:46:08 -04:00
parent 2ca066327a
commit 9195bdcf95
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/App/Pages/BaseContentPage.cs
View file

@ -7,6 +7,7 @@ namespace Bit.App.Pages
public class BaseContentPage : ContentPage public class BaseContentPage : ContentPage
{ {
protected int AndroidShowModalAnimationDelay = 400; protected int AndroidShowModalAnimationDelay = 400;
protected int AndroidShowPageAnimationDelay = 100;
protected void SetActivityIndicator() protected void SetActivityIndicator()
{ {
@ -28,14 +29,14 @@ namespace Bit.App.Pages
Content = viewToSet; Content = viewToSet;
} }
} }
if(!fromModal || Device.RuntimePlatform == Device.iOS) if(Device.RuntimePlatform == Device.iOS)
{ {
await DoWorkAsync(); await DoWorkAsync();
return; return;
} }
await Task.Run(async () => await Task.Run(async () =>
{ {
await Task.Delay(AndroidShowModalAnimationDelay); await Task.Delay(fromModal ? AndroidShowModalAnimationDelay : AndroidShowPageAnimationDelay);
Device.BeginInvokeOnMainThread(async () => await DoWorkAsync()); Device.BeginInvokeOnMainThread(async () => await DoWorkAsync());
}); });
} }

10
src/App/Styles/Base.xaml
View file

@ -12,7 +12,8 @@
Value="{StaticResource TextColor}" /> Value="{StaticResource TextColor}" />
</Style> </Style>
<Style TargetType="Label" <Style TargetType="Label"
Class="text-default"> Class="text-default"
x:Key="text-default">
<Setter Property="TextColor" <Setter Property="TextColor"
Value="{StaticResource TextColor}" /> Value="{StaticResource TextColor}" />
</Style> </Style>
@ -22,7 +23,8 @@
Value="{StaticResource MutedColor}" /> Value="{StaticResource MutedColor}" />
</Style> </Style>
<Style TargetType="Label" <Style TargetType="Label"
Class="text-danger"> Class="text-danger"
x:Key="text-danger">
<Setter Property="TextColor" <Setter Property="TextColor"
Value="{StaticResource DangerColor}" /> Value="{StaticResource DangerColor}" />
</Style> </Style>
@ -84,6 +86,8 @@
</Style> </Style>
<Style TargetType="Label" <Style TargetType="Label"
Class="list-header-sub"> Class="list-header-sub">
<Setter Property="FontSize"
Value="Small" />
<Setter Property="HorizontalTextAlignment" <Setter Property="HorizontalTextAlignment"
Value="End" /> Value="End" />
<Setter Property="VerticalTextAlignment" <Setter Property="VerticalTextAlignment"
@ -110,6 +114,8 @@
</Style> </Style>
<Style TargetType="Label" <Style TargetType="Label"
Class="list-sub"> Class="list-sub">
<Setter Property="FontSize"
Value="Small" />
<Setter Property="TextColor" <Setter Property="TextColor"
Value="{StaticResource MutedColor}" /> Value="{StaticResource MutedColor}" />
</Style> </Style>