Skip to content

Commit ff188c8

Browse files
David BritchDavid Britch
authored andcommitted
Made the mobile app use mock services by default.
1 parent 10586b9 commit ff188c8

2 files changed

Lines changed: 17 additions & 17 deletions

File tree

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/Settings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private static ISettings AppSettings
2727
private const string IdUrlBase = "url_base";
2828
private static readonly string AccessTokenDefault = string.Empty;
2929
private static readonly string IdTokenDefault = string.Empty;
30-
private static readonly bool UseMocksDefault = ViewModelLocator.UseMockService;
30+
private static readonly bool UseMocksDefault = true;
3131
private static readonly string UrlBaseDefault = GlobalSetting.Instance.BaseEndpoint;
3232

3333
#endregion

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/LoginView.xaml.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using eShopOnContainers.Core.Helpers;
2-
using eShopOnContainers.Core.ViewModels;
1+
using eShopOnContainers.Core.ViewModels;
32
using System;
43
using System.Diagnostics;
54
using System.Threading.Tasks;
@@ -22,14 +21,16 @@ protected override async void OnAppearing()
2221
this.Content = null;
2322
this.Content = content;
2423

25-
_animate = true;
26-
await AnimateIn();
27-
28-
var vm = BindingContext as LoginViewModel;
29-
30-
if(vm != null)
24+
var vm = BindingContext as LoginViewModel;
25+
if (vm != null)
3126
{
3227
vm.InvalidateMock();
28+
29+
if (!vm.IsMock)
30+
{
31+
_animate = true;
32+
await AnimateIn();
33+
}
3334
}
3435
}
3536

@@ -54,14 +55,13 @@ private async Task AnimateItem(View uiElement, uint duration)
5455
{
5556
while (_animate)
5657
{
57-
await uiElement.ScaleTo(1.05, duration, Easing.SinInOut);
58-
59-
await Task.WhenAll(
60-
uiElement.FadeTo(1, duration, Easing.SinInOut),
61-
uiElement.LayoutTo(new Rectangle(new Point(0, 0), new Size(uiElement.Width, uiElement.Height))),
62-
uiElement.FadeTo(.9, duration, Easing.SinInOut),
63-
uiElement.ScaleTo(1.15, duration, Easing.SinInOut)
64-
);
58+
await uiElement.ScaleTo(1.05, duration, Easing.SinInOut);
59+
await Task.WhenAll(
60+
uiElement.FadeTo(1, duration, Easing.SinInOut),
61+
uiElement.LayoutTo(new Rectangle(new Point(0, 0), new Size(uiElement.Width, uiElement.Height))),
62+
uiElement.FadeTo(.9, duration, Easing.SinInOut),
63+
uiElement.ScaleTo(1.15, duration, Easing.SinInOut)
64+
);
6565
}
6666
}
6767
catch (Exception ex)

0 commit comments

Comments
 (0)