Merge branch 'master' of https://github.com/dotnet/eShopOnContainers

Author: PLAINCONCEPTS\ccanizares

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

@@ -0,0 +1,36 @@
+using eShopOnContainers.Core.Models.Catalog;
+using eShopOnContainers.ViewModels.Base;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace eShopOnContainers.Core.Helpers
+{
+    public static class ServicesHelper
+    {
+        public static void FixCatalogItemPictureUri(IEnumerable<CatalogItem> catalogItems)
+        {
+            if(catalogItems == null)
+            {
+                return;
+            }
+
+            if (!ViewModelLocator.Instance.UseMockService 
+                && Settings.UrlBase != GlobalSetting.DefaultEndpoint)
+            {
+                foreach (var catalogItem in catalogItems)
+                {
+                    Regex ip = new Regex(@"\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b");
+                    MatchCollection serverResult = ip.Matches(catalogItem.PictureUri);
+                    MatchCollection localResult = ip.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);
+                    }
+                }
+            }
+        }
+    }
+}

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs

@@ -5,11 +5,7 @@
 using eShopOnContainers.Core.Services.RequestProvider;
 using eShopOnContainers.Core.Extensions;
 using System.Collections.Generic;
-using eShopOnContainers.ViewModels.Base;
 using eShopOnContainers.Core.Helpers;
-using Xamarin.Forms;
-using eShopOnContainers.Core.Services.IPAddress;
-using System.Text.RegularExpressions;
 
 namespace eShopOnContainers.Core.Services.Catalog
 {
@@ -61,22 +57,7 @@ public async Task<ObservableCollection<CatalogItem>> GetCatalogAsync()
 
                 if (catalog?.Data != null)
                 {
-                    // TODO: Experimental
-                    if (!ViewModelLocator.Instance.UseMockService && Settings.UrlBase != GlobalSetting.DefaultEndpoint)
-                    {
-                        foreach (var catalogItem in catalog?.Data)
-                        {
-                            //string ipaddress = DependencyService.Get<IIPAddressService>().GetIPAddress();
-                            Regex ip = new Regex(@"\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b");
-                            MatchCollection result = ip.Matches(catalogItem.PictureUri);
-
-                            if (result.Count != -1)
-                            {
-                                var serviceIp = result[0].Value;
-                                catalogItem.PictureUri = catalogItem.PictureUri.Replace(serviceIp, Settings.UrlBase);
-                            }
-                        }
-                    }
+                    ServicesHelper.FixCatalogItemPictureUri(catalog?.Data);
 
                     return catalog?.Data.ToObservableCollection();
                 }

src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/IPAddress/IIPAddressService.cs

@@ -66,6 +66,7 @@
     <Compile Include="Extensions\ObservableExtension.cs" />
     <Compile Include="GlobalSettings.cs" />
     <Compile Include="Helpers\EasingHelper.cs" />
+    <Compile Include="Helpers\ServicesHelper.cs" />
     <Compile Include="Helpers\Settings.cs" />
     <Compile Include="Models\Basket\BasketItem.cs" />
     <Compile Include="Models\Basket\CustomerBasket.cs" />
@@ -94,7 +95,6 @@
     <Compile Include="Services\Dialog\IDialogService.cs" />
     <Compile Include="Services\Identity\IdentityService.cs" />
     <Compile Include="Services\Identity\IIdentityService.cs" />
-    <Compile Include="Services\IPAddress\IIPAddressService.cs" />
     <Compile Include="Services\Navigation\INavigationService.cs" />
     <Compile Include="Services\Navigation\NavigationService.cs" />
     <Compile Include="Services\OpenUrl\IOpenUrlService.cs" />

src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj

@@ -231,7 +231,6 @@
     <Compile Include="Renderers\SlideDownMenuPageRenderer.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\IPAddress\IPAddressService.cs" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="..\CommonResources\Fonts\Montserrat-Bold.ttf">

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Services/IPAddress/IPAddressService.cs

@@ -178,9 +178,7 @@
       <Name>eShopOnContainers.Core</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Services\IPAddress\" />
-  </ItemGroup>
+  <ItemGroup />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj

@@ -429,9 +429,7 @@
       <Name>eShopOnContainers.Core</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Services\IPAddress\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>