Browse Source

Merge ab82af9d49 into 5f60b5a650

pull/119/merge
David Britch 7 years ago
committed by GitHub
parent
commit
6147474be8
7 changed files with 9 additions and 9 deletions
  1. +1
    -1
      src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/MessageKeys.cs
  2. +2
    -2
      src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs
  3. +2
    -2
      src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs
  4. +1
    -1
      src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/MainViewModel.cs
  5. +1
    -1
      src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CatalogView.xaml.cs
  6. +1
    -1
      src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml.cs
  7. +1
    -1
      src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj

src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/MessengerKeys.cs → src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/MessageKeys.cs View File

@ -1,6 +1,6 @@
namespace eShopOnContainers.Core.ViewModels.Base namespace eShopOnContainers.Core.ViewModels.Base
{ {
public class MessengerKeys
public class MessageKeys
{ {
// Add product to basket // Add product to basket
public const string AddProduct = "AddProduct"; public const string AddProduct = "AddProduct";

+ 2
- 2
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs View File

@ -86,8 +86,8 @@ namespace eShopOnContainers.Core.ViewModels
} }
} }
MessagingCenter.Unsubscribe<CatalogViewModel, CatalogItem>(this, MessengerKeys.AddProduct);
MessagingCenter.Subscribe<CatalogViewModel, CatalogItem>(this, MessengerKeys.AddProduct, (sender, arg) =>
MessagingCenter.Unsubscribe<CatalogViewModel, CatalogItem>(this, MessageKeys.AddProduct);
MessagingCenter.Subscribe<CatalogViewModel, CatalogItem>(this, MessageKeys.AddProduct, (sender, arg) =>
{ {
BadgeCount++; BadgeCount++;


+ 2
- 2
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs View File

@ -110,7 +110,7 @@ namespace eShopOnContainers.Core.ViewModels
private void AddCatalogItem(CatalogItem catalogItem) private void AddCatalogItem(CatalogItem catalogItem)
{ {
// Add new item to Basket // Add new item to Basket
MessagingCenter.Send(this, MessengerKeys.AddProduct, catalogItem);
MessagingCenter.Send(this, MessageKeys.AddProduct, catalogItem);
} }
private async void Filter() private async void Filter()
@ -123,7 +123,7 @@ namespace eShopOnContainers.Core.ViewModels
IsBusy = true; IsBusy = true;
// Filter catalog products // Filter catalog products
MessagingCenter.Send(this, MessengerKeys.Filter);
MessagingCenter.Send(this, MessageKeys.Filter);
Products = await _productsService.FilterAsync(Brand.Id, Type.Id); Products = await _productsService.FilterAsync(Brand.Id, Type.Id);
IsBusy = false; IsBusy = false;


+ 1
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/MainViewModel.cs View File

@ -19,7 +19,7 @@ namespace eShopOnContainers.Core.ViewModels
{ {
// Change selected application tab // Change selected application tab
var tabIndex = ((TabParameter)navigationData).TabIndex; var tabIndex = ((TabParameter)navigationData).TabIndex;
MessagingCenter.Send(this, MessengerKeys.ChangeTab, tabIndex);
MessagingCenter.Send(this, MessageKeys.ChangeTab, tabIndex);
} }
return base.InitializeAsync(navigationData); return base.InitializeAsync(navigationData);


+ 1
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CatalogView.xaml.cs View File

@ -18,7 +18,7 @@ namespace eShopOnContainers.Core.Views
SlideMenu = _filterView; SlideMenu = _filterView;
MessagingCenter.Subscribe<CatalogViewModel>(this, MessengerKeys.Filter, (sender) =>
MessagingCenter.Subscribe<CatalogViewModel>(this, MessageKeys.Filter, (sender) =>
{ {
Filter(); Filter();
}); });


+ 1
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/MainView.xaml.cs View File

@ -16,7 +16,7 @@ namespace eShopOnContainers.Core.Views
{ {
base.OnAppearing(); base.OnAppearing();
MessagingCenter.Subscribe<MainViewModel, int>(this, MessengerKeys.ChangeTab, (sender, arg) =>
MessagingCenter.Subscribe<MainViewModel, int>(this, MessageKeys.ChangeTab, (sender, arg) =>
{ {
switch(arg) switch(arg)
{ {


+ 1
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj View File

@ -111,7 +111,7 @@
<Compile Include="Validations\IValidity.cs" /> <Compile Include="Validations\IValidity.cs" />
<Compile Include="Validations\ValidatableObject.cs" /> <Compile Include="Validations\ValidatableObject.cs" />
<Compile Include="ViewModels\Base\ExtendedBindableObject.cs" /> <Compile Include="ViewModels\Base\ExtendedBindableObject.cs" />
<Compile Include="ViewModels\Base\MessengerKeys.cs" />
<Compile Include="ViewModels\Base\MessageKeys.cs" />
<Compile Include="ViewModels\Base\ViewModelBase.cs" /> <Compile Include="ViewModels\Base\ViewModelBase.cs" />
<Compile Include="ViewModels\Base\ViewModelLocator.cs" /> <Compile Include="ViewModels\Base\ViewModelLocator.cs" />
<Compile Include="ViewModels\BasketViewModel.cs" /> <Compile Include="ViewModels\BasketViewModel.cs" />


Loading…
Cancel
Save