Skip to content

Commit 00311b4

Browse files
David BritchDavid Britch
authored andcommitted
Replaced async void methods with async Task.
1 parent 561208c commit 00311b4

3 files changed

Lines changed: 17 additions & 21 deletions

File tree

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public decimal Total
5959
}
6060
}
6161

62-
public ICommand AddCommand => new Command<BasketItem>(AddItem);
62+
public ICommand AddCommand => new Command<BasketItem>(async (item) => await AddItemAsync(item));
6363

6464
public ICommand CheckoutCommand => new Command(async () => await CheckoutAsync());
6565

@@ -80,22 +80,22 @@ public override async Task InitializeAsync(object navigationData)
8080
foreach (var basketItem in basket.Items)
8181
{
8282
BadgeCount += basketItem.Quantity;
83-
AddBasketItem(basketItem);
83+
await AddBasketItemAsync(basketItem);
8484
}
8585
}
8686

8787
MessagingCenter.Unsubscribe<CatalogViewModel, CatalogItem>(this, MessengerKeys.AddProduct);
88-
MessagingCenter.Subscribe<CatalogViewModel, CatalogItem>(this, MessengerKeys.AddProduct, (sender, arg) =>
88+
MessagingCenter.Subscribe<CatalogViewModel, CatalogItem>(this, MessengerKeys.AddProduct, async (sender, arg) =>
8989
{
9090
BadgeCount++;
9191

92-
AddCatalogItem(arg);
92+
await AddCatalogItemAsync(arg);
9393
});
9494

9595
await base.InitializeAsync(navigationData);
9696
}
9797

98-
private void AddCatalogItem(CatalogItem item)
98+
private async Task AddCatalogItemAsync(CatalogItem item)
9999
{
100100
BasketItems.Add(new BasketItem
101101
{
@@ -106,26 +106,26 @@ private void AddCatalogItem(CatalogItem item)
106106
Quantity = 1
107107
});
108108

109-
ReCalculateTotal();
109+
await ReCalculateTotalAsync();
110110
}
111111

112-
private void AddItem(BasketItem item)
112+
private async Task AddItemAsync(BasketItem item)
113113
{
114114
BadgeCount++;
115115

116-
AddBasketItem(item);
116+
await AddBasketItemAsync(item);
117117

118118
RaisePropertyChanged(() => BasketItems);
119119
}
120120

121-
private void AddBasketItem(BasketItem item)
121+
private async Task AddBasketItemAsync(BasketItem item)
122122
{
123123
BasketItems.Add(item);
124124

125-
ReCalculateTotal();
125+
await ReCalculateTotalAsync();
126126
}
127127

128-
private async void ReCalculateTotal()
128+
private async Task ReCalculateTotalAsync()
129129
{
130130
Total = 0;
131131

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ public CatalogType Type
8888

8989
public ICommand AddCatalogItemCommand => new Command<CatalogItem>(AddCatalogItem);
9090

91-
public ICommand FilterCommand => new Command(Filter);
91+
public ICommand FilterCommand => new Command(async () => await FilterAsync());
9292

93-
public ICommand ClearFilterCommand => new Command(ClearFilter);
93+
public ICommand ClearFilterCommand => new Command(async () => await ClearFilterAsync());
9494

9595
public override async Task InitializeAsync(object navigationData)
9696
{
@@ -110,7 +110,7 @@ private void AddCatalogItem(CatalogItem catalogItem)
110110
MessagingCenter.Send(this, MessengerKeys.AddProduct, catalogItem);
111111
}
112112

113-
private async void Filter()
113+
private async Task FilterAsync()
114114
{
115115
if (Brand == null && Type == null)
116116
{
@@ -126,7 +126,7 @@ private async void Filter()
126126
IsBusy = false;
127127
}
128128

129-
private async void ClearFilter()
129+
private async Task ClearFilterAsync()
130130
{
131131
IsBusy = true;
132132

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@ namespace eShopOnContainers.Core.Views
88
{
99
public partial class CatalogView : ContentPage, IMenuContainerPage
1010
{
11-
private FiltersView _filterView;
11+
private FiltersView _filterView = new FiltersView();
1212

1313
public CatalogView()
1414
{
1515
InitializeComponent();
1616

17-
_filterView = new FiltersView();
18-
1917
SlideMenu = _filterView;
2018

2119
MessagingCenter.Subscribe<CatalogViewModel>(this, MessengerKeys.Filter, (sender) =>
@@ -42,13 +40,11 @@ public SlideMenuView SlideMenu
4240
set;
4341
}
4442

45-
4643
protected override void OnBindingContextChanged()
4744
{
4845
base.OnBindingContextChanged();
4946

50-
if (_filterView != null)
51-
_filterView.BindingContext = BindingContext;
47+
_filterView.BindingContext = BindingContext;
5248
}
5349

5450
private void OnFilterChanged(object sender, EventArgs e)

0 commit comments

Comments
 (0)