From 77b64d537066648f397563d8ed4559d9cabed780 Mon Sep 17 00:00:00 2001
From: David Britch <davidbritch@Davids-MBP.lan>
Date: Wed, 8 Mar 2017 10:28:52 +0000
Subject: [PATCH] Replaced async void methods with async Task methods, where
 appropriate.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also removed AnimationExtensions as it’s not used.
---
 .../Extensions/AnimationExtension.cs          | 18 -------------
 .../ViewModels/BasketViewModel.cs             | 25 ++++++++-----------
 .../ViewModels/CatalogViewModel.cs            |  8 +++---
 .../eShopOnContainers.Core.csproj             |  1 -
 4 files changed, 15 insertions(+), 37 deletions(-)
 delete mode 100644 src/Mobile/eShopOnContainers/eShopOnContainers.Core/Extensions/AnimationExtension.cs

diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Extensions/AnimationExtension.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Extensions/AnimationExtension.cs
deleted file mode 100644
index edc9b07ab..000000000
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Extensions/AnimationExtension.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using eShopOnContainers.Core.Animations.Base;
-using System;
-using Xamarin.Forms;
-
-namespace eShopOnContainers.Core.Extensions
-{
-    public static class AnimationExtension
-    {
-        public static async void Animate(this VisualElement visualElement, AnimationBase animation, Action onFinishedCallback = null)
-        {
-            animation.Target = visualElement;
-
-            await animation.Begin();
-
-            onFinishedCallback?.Invoke();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs
index fe1949f0f..41cd481d7 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs
@@ -59,7 +59,7 @@ namespace eShopOnContainers.Core.ViewModels
             }
         }
 
-        public ICommand AddCommand => new Command<BasketItem>(AddItem);
+        public ICommand AddCommand => new Command<BasketItem>(async (item) => await AddItemAsync(item));
 
         public ICommand CheckoutCommand => new Command(async () => await CheckoutAsync());
 
@@ -80,22 +80,22 @@ namespace eShopOnContainers.Core.ViewModels
                 foreach (var basketItem in basket.Items)
                 {
                     BadgeCount += basketItem.Quantity;
-                    AddBasketItem(basketItem);
+                    await AddBasketItemAsync(basketItem);
                 }
             }
 
             MessagingCenter.Unsubscribe<CatalogViewModel, CatalogItem>(this, MessengerKeys.AddProduct);
-            MessagingCenter.Subscribe<CatalogViewModel, CatalogItem>(this, MessengerKeys.AddProduct, (sender, arg) =>
+            MessagingCenter.Subscribe<CatalogViewModel, CatalogItem>(this, MessengerKeys.AddProduct, async (sender, arg) =>
             {
                 BadgeCount++;
 
-                AddCatalogItem(arg);
+                await AddCatalogItemAsync(arg);
             });
             
             await base.InitializeAsync(navigationData);
         }
 
-        private void AddCatalogItem(CatalogItem item)
+        private async Task AddCatalogItemAsync(CatalogItem item)
         {
             BasketItems.Add(new BasketItem
             {
@@ -106,26 +106,23 @@ namespace eShopOnContainers.Core.ViewModels
                 Quantity = 1
             });
 
-            ReCalculateTotal();
+            await ReCalculateTotal();
         }
 
-        private void AddItem(BasketItem item)
+        private async Task AddItemAsync(BasketItem item)
         {
             BadgeCount++;
-
-            AddBasketItem(item);
-
+            await AddBasketItemAsync(item);
             RaisePropertyChanged(() => BasketItems);
         }
 
-        private void AddBasketItem(BasketItem item)
+        private async Task AddBasketItemAsync(BasketItem item)
         {
             BasketItems.Add(item);
-
-            ReCalculateTotal();
+            await ReCalculateTotal();
         }
 
-        private async void ReCalculateTotal()
+        private async Task ReCalculateTotal()
         {
             Total = 0;
 
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs
index 7863a0790..82767e9d7 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs
@@ -88,9 +88,9 @@ namespace eShopOnContainers.Core.ViewModels
 
         public ICommand AddCatalogItemCommand => new Command<CatalogItem>(AddCatalogItem);
 
-        public ICommand FilterCommand => new Command(Filter);
+        public ICommand FilterCommand => new Command(async () => await FilterAsync());
 
-        public ICommand ClearFilterCommand => new Command(ClearFilter);
+		public ICommand ClearFilterCommand => new Command(async () => await ClearFilterAsync());
 
         public override async Task InitializeAsync(object navigationData)
         {
@@ -110,7 +110,7 @@ namespace eShopOnContainers.Core.ViewModels
             MessagingCenter.Send(this, MessengerKeys.AddProduct, catalogItem);
         }
 
-        private async void Filter()
+        private async Task FilterAsync()
         {
             if (Brand == null && Type == null)
             {
@@ -126,7 +126,7 @@ namespace eShopOnContainers.Core.ViewModels
             IsBusy = false;
         }
 
-        private async void ClearFilter()
+        private async Task ClearFilterAsync()
         {
             IsBusy = true;
 
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
index c38f528ec..4a898b528 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
@@ -60,7 +60,6 @@
     <Compile Include="Converters\ToUpperConverter.cs" />
     <Compile Include="Effects\LineColorEffect.cs" />
     <Compile Include="Exceptions\ServiceAuthenticationException.cs" />
-    <Compile Include="Extensions\AnimationExtension.cs" />
     <Compile Include="Extensions\ObservableExtension.cs" />
     <Compile Include="GlobalSettings.cs" />
     <Compile Include="Helpers\EasingHelper.cs" />