diff --git a/src/App/Pages/BaseContentPage.cs b/src/App/Pages/BaseContentPage.cs index be09802e3..6fbc01825 100644 --- a/src/App/Pages/BaseContentPage.cs +++ b/src/App/Pages/BaseContentPage.cs @@ -7,6 +7,7 @@ namespace Bit.App.Pages public class BaseContentPage : ContentPage { protected int AndroidShowModalAnimationDelay = 400; + protected int AndroidShowPageAnimationDelay = 100; protected void SetActivityIndicator() { @@ -28,14 +29,14 @@ namespace Bit.App.Pages Content = viewToSet; } } - if(!fromModal || Device.RuntimePlatform == Device.iOS) + if(Device.RuntimePlatform == Device.iOS) { await DoWorkAsync(); return; } await Task.Run(async () => { - await Task.Delay(AndroidShowModalAnimationDelay); + await Task.Delay(fromModal ? AndroidShowModalAnimationDelay : AndroidShowPageAnimationDelay); Device.BeginInvokeOnMainThread(async () => await DoWorkAsync()); }); } diff --git a/src/App/Styles/Base.xaml b/src/App/Styles/Base.xaml index 63ea7a5f7..935fe0612 100644 --- a/src/App/Styles/Base.xaml +++ b/src/App/Styles/Base.xaml @@ -12,7 +12,8 @@ Value="{StaticResource TextColor}" /> @@ -22,7 +23,8 @@ Value="{StaticResource MutedColor}" /> @@ -84,6 +86,8 @@