Rename Campaings title and cleanup

Author: christian147

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs

@@ -78,7 +78,7 @@ public static void FixBasketItemPictureUri(IEnumerable<BasketItem> basketItems)
             }
         }
 
-        public static void FixCatalogItemPictureUri(IEnumerable<CampaignItem> campaignItems)
+        public static void FixCampaignItemPictureUri(IEnumerable<CampaignItem> campaignItems)
         {
             if (campaignItems == null)
             {
@@ -90,17 +90,17 @@ public static void FixCatalogItemPictureUri(IEnumerable<CampaignItem> campaignIt
                 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)
                         {
                             var serviceIp = serverResult[0].Value;
                             var localIp = localResult[0].Value;
 
-                            catalogItem.PictureUri = catalogItem.PictureUri.Replace(serviceIp, localIp);
+                            campaignItem.PictureUri = campaignItem.PictureUri.Replace(serviceIp, localIp);
                         }
                     }
                 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Common/Common.cs

@@ -8,7 +8,7 @@ public static class Common
         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;
     }
 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs

@@ -13,7 +13,7 @@ public class CampaignMockService : ICampaignService
         {
             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 @@ public class CampaignMockService : ICampaignService
 
             new CampaignItem
             {
-                Id = Common.Common.MockCampaignd02,
+                Id = Common.Common.MockCampaignId02,
                 PictureUri = Device.RuntimePlatform != Device.Windows
                     ? "fake_campaign_02.png"
                     : "Assets/fake_campaign_02.png",

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignService.cs

@@ -30,7 +30,7 @@ public async Task<ObservableCollection<CampaignItem>> GetAllCampaignsAsync(strin
 
             if (campaign?.Data != null)
             {
-                ServicesHelper.FixCatalogItemPictureUri(campaign?.Data);
+                ServicesHelper.FixCampaignItemPictureUri(campaign?.Data);
 
                 return campaign?.Data.ToObservableCollection();
             }

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">
     <ContentPage.Resources>
         <ResourceDictionary>