ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename Campaings title and cleanup

Browse Source
This commit is contained in:
Christian Arenas 2017-07-31 15:09:28 +02:00
parent 8559cfaca8
commit a5104d3444
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs
View File

@ -78,7 +78,7 @@ namespace eShopOnContainers.Core.Helpers
} }
} }
public static void FixCatalogItemPictureUri(IEnumerable<CampaignItem> campaignItems) public static void FixCampaignItemPictureUri(IEnumerable<CampaignItem> campaignItems)
{ {
if (campaignItems == null) if (campaignItems == null)
{ {
@ -90,9 +90,9 @@ namespace eShopOnContainers.Core.Helpers
if (!ViewModelLocator.UseMockService if (!ViewModelLocator.UseMockService
&& Settings.UrlBase != GlobalSetting.DefaultEndpoint) && 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); MatchCollection localResult = IpRegex.Matches(Settings.UrlBase);
if (serverResult.Count != -1 && localResult.Count != -1) if (serverResult.Count != -1 && localResult.Count != -1)
@ -100,7 +100,7 @@ namespace eShopOnContainers.Core.Helpers
var serviceIp = serverResult[0].Value; var serviceIp = serverResult[0].Value;
var localIp = localResult[0].Value; var localIp = localResult[0].Value;
catalogItem.PictureUri = catalogItem.PictureUri.Replace(serviceIp, localIp); campaignItem.PictureUri = campaignItem.PictureUri.Replace(serviceIp, localIp);
} }
} }
} }

4
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Common/Common.cs
View File

@ -8,7 +8,7 @@
public static string MockCatalogItemId04 = "4"; public static string MockCatalogItemId04 = "4";
public static string MockCatalogItemId05 = "5"; public static string MockCatalogItemId05 = "5";
public static int MockCampaignd01 = 1; public static int MockCampaignId01 = 1;
public static int MockCampaignd02 = 2; public static int MockCampaignId02 = 2;
} }
} }

4
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs
View File

@ -13,7 +13,7 @@
{ {
new CampaignItem new CampaignItem
{ {
Id = Common.Common.MockCampaignd01, Id = Common.Common.MockCampaignId01,
PictureUri = Device.RuntimePlatform != Device.Windows PictureUri = Device.RuntimePlatform != Device.Windows
? "fake_campaign_01.png" ? "fake_campaign_01.png"
: "Assets/fake_campaign_01.png", : "Assets/fake_campaign_01.png",
@ -25,7 +25,7 @@
new CampaignItem new CampaignItem
{ {
Id = Common.Common.MockCampaignd02, Id = Common.Common.MockCampaignId02,
PictureUri = Device.RuntimePlatform != Device.Windows PictureUri = Device.RuntimePlatform != Device.Windows
? "fake_campaign_02.png" ? "fake_campaign_02.png"
: "Assets/fake_campaign_02.png", : "Assets/fake_campaign_02.png",

2
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs
View File

@ -30,7 +30,7 @@
if (campaign?.Data != null) if (campaign?.Data != null)
{ {
ServicesHelper.FixCatalogItemPictureUri(campaign?.Data); ServicesHelper.FixCampaignItemPictureUri(campaign?.Data);
return campaign?.Data.ToObservableCollection(); return campaign?.Data.ToObservableCollection();
} }

2
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/CampaignView.xaml
View File

@ -8,7 +8,7 @@
xmlns:triggers="clr-namespace:eShopOnContainers.Core.Triggers;assembly=eShopOnContainers.Core" xmlns:triggers="clr-namespace:eShopOnContainers.Core.Triggers;assembly=eShopOnContainers.Core"
xmlns:behaviors="clr-namespace:eShopOnContainers.Core.Behaviors;assembly=eShopOnContainers.Core" xmlns:behaviors="clr-namespace:eShopOnContainers.Core.Behaviors;assembly=eShopOnContainers.Core"
viewModelBase:ViewModelLocator.AutoWireViewModel="true" viewModelBase:ViewModelLocator.AutoWireViewModel="true"
Title="Catalog"> Title="Campaigns">
<ContentPage.Resources> <ContentPage.Resources>
<ResourceDictionary> <ResourceDictionary>