diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs index 4887ef952..2d6a53b2c 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs @@ -78,7 +78,7 @@ namespace eShopOnContainers.Core.Helpers } } - public static void FixCatalogItemPictureUri(IEnumerable campaignItems) + public static void FixCampaignItemPictureUri(IEnumerable campaignItems) { if (campaignItems == null) { @@ -90,9 +90,9 @@ namespace eShopOnContainers.Core.Helpers if (!ViewModelLocator.UseMockService && Settings.UrlBase != GlobalSetting.DefaultEndpoint) { - foreach (var catalogItem in campaignItems) + foreach (var campaignItem in campaignItems) { - MatchCollection serverResult = IpRegex.Matches(catalogItem.PictureUri); + MatchCollection serverResult = IpRegex.Matches(campaignItem.PictureUri); MatchCollection localResult = IpRegex.Matches(Settings.UrlBase); if (serverResult.Count != -1 && localResult.Count != -1) @@ -100,7 +100,7 @@ namespace eShopOnContainers.Core.Helpers var serviceIp = serverResult[0].Value; var localIp = localResult[0].Value; - catalogItem.PictureUri = catalogItem.PictureUri.Replace(serviceIp, localIp); + campaignItem.PictureUri = campaignItem.PictureUri.Replace(serviceIp, localIp); } } } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Common/Common.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Common/Common.cs index 8b317cdac..93394f7a4 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Common/Common.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Common/Common.cs @@ -8,7 +8,7 @@ public static string MockCatalogItemId04 = "4"; public static string MockCatalogItemId05 = "5"; - public static int MockCampaignd01 = 1; - public static int MockCampaignd02 = 2; + public static int MockCampaignId01 = 1; + public static int MockCampaignId02 = 2; } } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs index ae8be5087..65490db45 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs @@ -13,7 +13,7 @@ { new CampaignItem { - Id = Common.Common.MockCampaignd01, + Id = Common.Common.MockCampaignId01, PictureUri = Device.RuntimePlatform != Device.Windows ? "fake_campaign_01.png" : "Assets/fake_campaign_01.png", @@ -25,7 +25,7 @@ new CampaignItem { - Id = Common.Common.MockCampaignd02, + Id = Common.Common.MockCampaignId02, PictureUri = Device.RuntimePlatform != Device.Windows ? "fake_campaign_02.png" : "Assets/fake_campaign_02.png", diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs index 6f3aa2157..3d3123c1c 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs @@ -30,7 +30,7 @@ if (campaign?.Data != null) { - ServicesHelper.FixCatalogItemPictureUri(campaign?.Data); + ServicesHelper.FixCampaignItemPictureUri(campaign?.Data); return campaign?.Data.ToObservableCollection(); } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignView.xaml b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignView.xaml index b611878a2..7faf088a0 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignView.xaml +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignView.xaml @@ -8,7 +8,7 @@ xmlns:triggers="clr-namespace:eShopOnContainers.Core.Triggers;assembly=eShopOnContainers.Core" xmlns:behaviors="clr-namespace:eShopOnContainers.Core.Behaviors;assembly=eShopOnContainers.Core" viewModelBase:ViewModelLocator.AutoWireViewModel="true" - Title="Catalog"> + Title="Campaigns">