Merge pull request dotnet-architecture#84 from dotnet/xamarin

Ensured that calls to NavigationService.NavigateAsync are awaited.

Author: jsuarezruiz

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs

@@ -63,7 +63,7 @@ public decimal Total
 
         public ICommand AddCommand => new Command<BasketItem>(AddItem);
 
-        public ICommand CheckoutCommand => new Command(Checkout);
+        public ICommand CheckoutCommand => new Command(async () => await CheckoutAsync());
 
         public override async Task InitializeAsync(object navigationData)
         {
@@ -151,11 +151,11 @@ await _basketService.UpdateBasketAsync(new CustomerBasket
             }, authToken);
         }
 
-        private void Checkout()
+        private async Task CheckoutAsync()
         {
             if (BasketItems.Any())
             {
-                NavigationService.NavigateToAsync<CheckoutViewModel>(BasketItems);
+                await NavigationService.NavigateToAsync<CheckoutViewModel>(BasketItems);
             }
         }
     }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs

@@ -66,7 +66,7 @@ public Address ShippingAddress
             }
         }
 
-        public ICommand CheckoutCommand => new Command(Checkout);
+        public ICommand CheckoutCommand => new Command(async () => await CheckoutAsync());
 
         public override async Task InitializeAsync(object navigationData)
         {
@@ -125,7 +125,7 @@ public override async Task InitializeAsync(object navigationData)
             }
         }
 
-        private async void Checkout()
+        private async Task CheckoutAsync()
         {
             try
             {

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs

@@ -121,15 +121,15 @@ public string LoginUrl
             }
         }
 
-        public ICommand MockSignInCommand => new Command(MockSignInAsync);
+        public ICommand MockSignInCommand => new Command(async () => await MockSignInAsync());
 
         public ICommand SignInCommand => new Command(async () => await SignInAsync());
 
         public ICommand RegisterCommand => new Command(Register);
 
-        public ICommand NavigateCommand => new Command<string>(NavigateAsync);
+        public ICommand NavigateCommand => new Command<string>(async (url) => await NavigateAsync(url));
 
-        public ICommand SettingsCommand => new Command(SettingsAsync);
+        public ICommand SettingsCommand => new Command(async () => await SettingsAsync());
 
         public override Task InitializeAsync(object navigationData)
         {
@@ -146,7 +146,7 @@ public override Task InitializeAsync(object navigationData)
             return base.InitializeAsync(navigationData);
         }
 
-        private async void MockSignInAsync()
+        private async Task MockSignInAsync()
         {
             IsBusy = true;
             IsValid = true;
@@ -219,7 +219,7 @@ private void Logout()
             }
         }
 
-        private async void NavigateAsync(string url)
+        private async Task NavigateAsync(string url)
         {
             if (url.Equals(GlobalSetting.Instance.LogoutCallback))
             {
@@ -246,7 +246,7 @@ private async void NavigateAsync(string url)
             }
         }
 
-        private async void SettingsAsync()
+        private async Task SettingsAsync()
         {
             await NavigationService.NavigateToAsync<SettingsViewModel>();
         }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/MainViewModel.cs

@@ -9,7 +9,7 @@ namespace eShopOnContainers.Core.ViewModels
 {
     public class MainViewModel : ViewModelBase
     {
-        public ICommand SettingsCommand => new Command(Settings);
+        public ICommand SettingsCommand => new Command(async () => await SettingsAsync());
 
         public override Task InitializeAsync(object navigationData)
         {
@@ -25,9 +25,9 @@ public override Task InitializeAsync(object navigationData)
             return base.InitializeAsync(navigationData);
         }
 
-        private void Settings()
+        private async Task SettingsAsync()
         {
-            NavigationService.NavigateToAsync<SettingsViewModel>();
+            await NavigationService.NavigateToAsync<SettingsViewModel>();
         }
     }
 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/ProfileViewModel.cs

@@ -32,9 +32,9 @@ public ObservableCollection<Order> Orders
             }
         }
 
-        public ICommand LogoutCommand => new Command(LogoutAsync);
+        public ICommand LogoutCommand => new Command(async () => await LogoutAsync());
 
-        public ICommand OrderDetailCommand => new Command<Order>(OrderDetail);
+        public ICommand OrderDetailCommand => new Command<Order>(async (order) => await OrderDetailAsync(order));
 
         public override async Task InitializeAsync(object navigationData)
         {
@@ -48,7 +48,7 @@ public override async Task InitializeAsync(object navigationData)
             IsBusy = false;
         }
 
-        private async void LogoutAsync()
+        private async Task LogoutAsync()
         {
             IsBusy = true;
 
@@ -59,9 +59,9 @@ private async void LogoutAsync()
             IsBusy = false;
         }
 
-        private void OrderDetail(Order order)
+        private async Task OrderDetailAsync(Order order)
         {
-            NavigationService.NavigateToAsync<OrderDetailViewModel>(order);
+            await NavigationService.NavigateToAsync<OrderDetailViewModel>(order);
         }
     }
 }