Skip to content

Commit 2850c91

Browse files
author
Carlos Cañizares Estévez
committed
2 parents f874d7b + 9201160 commit 2850c91

11 files changed

Lines changed: 77 additions & 5 deletions

File tree

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/Templates/ProductTemplate.xaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ContentView
33
xmlns="http://xamarin.com/schemas/2014/forms"
4-
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
5+
xmlns:ffimageloading="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
56
x:Class="eShopOnContainers.Core.Views.Templates.ProductTemplate">
67
<ContentView.Resources>
78
<ResourceDictionary>
@@ -68,7 +69,7 @@
6869
<RowDefinition Height="Auto" />
6970
<RowDefinition Height="Auto" />
7071
</Grid.RowDefinitions>
71-
<Image
72+
<ffimageloading:CachedImage
7273
Grid.Row="0"
7374
Source="{Binding Image}"
7475
Aspect="AspectFill"/>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,18 @@
136136
<HintPath>..\..\packages\Acr.UserDialogs.6.3.1\lib\portable-win+net45+wp8+win8+wpa81\Acr.UserDialogs.Interface.dll</HintPath>
137137
<Private>True</Private>
138138
</Reference>
139+
<Reference Include="FFImageLoading, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
140+
<HintPath>..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-232\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.dll</HintPath>
141+
<Private>True</Private>
142+
</Reference>
143+
<Reference Include="FFImageLoading.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
144+
<HintPath>..\..\packages\Xamarin.FFImageLoading.Forms.2.2.6-pre-232\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Forms.dll</HintPath>
145+
<Private>True</Private>
146+
</Reference>
147+
<Reference Include="FFImageLoading.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
148+
<HintPath>..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-232\lib\portable-net45+win8+wpa81+wp8\FFImageLoading.Platform.dll</HintPath>
149+
<Private>True</Private>
150+
</Reference>
139151
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
140152
<HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
141153
<Private>True</Private>

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<package id="Splat" version="1.6.2" targetFramework="portable45-net45+win8+wp8+wpa81" />
99
<package id="StyleCop.MSBuild" version="5.0.0-alpha01" targetFramework="portable45-net45+win8+wp8+wpa81" developmentDependency="true" />
1010
<package id="Unity" version="4.0.1" targetFramework="portable45-net45+win8+wp8+wpa81" />
11+
<package id="Xamarin.FFImageLoading" version="2.2.6-pre-232" targetFramework="portable45-net45+win8+wp8+wpa81" />
12+
<package id="Xamarin.FFImageLoading.Forms" version="2.2.6-pre-232" targetFramework="portable45-net45+win8+wp8+wpa81" />
1113
<package id="Xamarin.Forms" version="2.3.2.127" targetFramework="portable45-net45+win8+wp8+wpa81" />
1214
<package id="Xamarin.Forms.Pages" version="2.3.0.38-pre2" targetFramework="portable45-net45+win8+wp8+wpa81" />
1315
<package id="Xamarin.Forms.Theme.Base" version="1.0.0.43-pre1" targetFramework="portable45-net45+win8+wp8+wpa81" />

‎src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Activities/MainActivity.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Android.Content.PM;
44
using Android.Views;
55
using Xamarin.Forms.Platform.Android;
6+
using FFImageLoading.Forms.Droid;
67

78
namespace eShopOnContainers.Droid.Activities
89
{
@@ -27,6 +28,7 @@ protected override void OnCreate(Bundle bundle)
2728
SupportActionBar.SetDisplayShowTitleEnabled(false);
2829

2930
global::Xamarin.Forms.Forms.Init(this, bundle);
31+
CachedImageRenderer.Init();
3032
LoadApplication(new App());
3133

3234
var x = typeof(Xamarin.Forms.Themes.LightThemeResources);

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,22 @@
7373
<HintPath>..\..\packages\AndHUD.1.2.0\lib\MonoAndroid\AndHUD.dll</HintPath>
7474
<Private>True</Private>
7575
</Reference>
76+
<Reference Include="FFImageLoading, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
77+
<HintPath>..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-232\lib\MonoAndroid10\FFImageLoading.dll</HintPath>
78+
<Private>True</Private>
79+
</Reference>
80+
<Reference Include="FFImageLoading.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
81+
<HintPath>..\..\packages\Xamarin.FFImageLoading.Forms.2.2.6-pre-232\lib\MonoAndroid10\FFImageLoading.Forms.dll</HintPath>
82+
<Private>True</Private>
83+
</Reference>
84+
<Reference Include="FFImageLoading.Forms.Droid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
85+
<HintPath>..\..\packages\Xamarin.FFImageLoading.Forms.2.2.6-pre-232\lib\MonoAndroid10\FFImageLoading.Forms.Droid.dll</HintPath>
86+
<Private>True</Private>
87+
</Reference>
88+
<Reference Include="FFImageLoading.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
89+
<HintPath>..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-232\lib\MonoAndroid10\FFImageLoading.Platform.dll</HintPath>
90+
<Private>True</Private>
91+
</Reference>
7692
<Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
7793
<HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
7894
<Private>True</Private>

‎src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid70" />
1919
<package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid70" />
2020
<package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
21+
<package id="Xamarin.FFImageLoading" version="2.2.6-pre-232" targetFramework="monoandroid70" />
22+
<package id="Xamarin.FFImageLoading.Forms" version="2.2.6-pre-232" targetFramework="monoandroid70" />
2123
<package id="Xamarin.Forms" version="2.3.2.127" targetFramework="monoandroid70" />
2224
<package id="Xamarin.Forms.Pages" version="2.3.2.118-pre1" targetFramework="monoandroid70" />
2325
<package id="Xamarin.Forms.Theme.Base" version="1.0.0.43-pre1" targetFramework="monoandroid70" />

‎src/Mobile/eShopOnContainers/eShopOnContainers.Windows/App.xaml.cs‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
using System;
1+
using FFImageLoading.Forms;
2+
using FFImageLoading.Forms.WinUWP;
3+
using System;
4+
using System.Collections.Generic;
5+
using System.Reflection;
26
using Windows.ApplicationModel;
37
using Windows.ApplicationModel.Activation;
48
using Windows.UI.Xaml;
@@ -48,7 +52,13 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
4852

4953
rootFrame.NavigationFailed += OnNavigationFailed;
5054

51-
Xamarin.Forms.Forms.Init(e);
55+
var assembliesToInclude = new List<Assembly>()
56+
{
57+
typeof(CachedImage).GetTypeInfo().Assembly,
58+
typeof(CachedImageRenderer).GetTypeInfo().Assembly
59+
};
60+
61+
Xamarin.Forms.Forms.Init(e, assembliesToInclude);
5262

5363
if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
5464
{

‎src/Mobile/eShopOnContainers/eShopOnContainers.Windows/project.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
"SlideOverKit": "2.1.4",
66
"StyleCop.MSBuild": "5.0.0-alpha01",
77
"Unity": "4.0.1",
8+
"Xamarin.FFImageLoading": "2.2.6-pre-232",
9+
"Xamarin.FFImageLoading.Forms": "2.2.6-pre-232",
810
"Xamarin.Forms": "2.3.2.127",
911
"Xamarin.Forms.Theme.Base": "1.0.0.43-pre1",
1012
"Xamarin.Forms.Theme.Light": "1.0.0.43-pre1"

‎src/Mobile/eShopOnContainers/eShopOnContainers.iOS/AppDelegate.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Foundation;
1+
using FFImageLoading.Forms.Touch;
2+
using Foundation;
23
using UIKit;
34

45
namespace eShopOnContainers.iOS
@@ -21,6 +22,7 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
2122
global::Xamarin.Forms.Forms.Init();
2223
LoadApplication(new App());
2324
SlideOverKit.iOS.SlideOverKit.Init();
25+
CachedImageRenderer.Init();
2426

2527
var x = typeof(Xamarin.Forms.Themes.LightThemeResources);
2628
x = typeof(Xamarin.Forms.Themes.iOS.UnderlineEffect);

‎src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,22 @@
140140
<HintPath>..\..\packages\Acr.UserDialogs.6.3.1\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll</HintPath>
141141
<Private>True</Private>
142142
</Reference>
143+
<Reference Include="FFImageLoading, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
144+
<HintPath>..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-232\lib\Xamarin.iOS10\FFImageLoading.dll</HintPath>
145+
<Private>True</Private>
146+
</Reference>
147+
<Reference Include="FFImageLoading.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
148+
<HintPath>..\..\packages\Xamarin.FFImageLoading.Forms.2.2.6-pre-232\lib\Xamarin.iOS10\FFImageLoading.Forms.dll</HintPath>
149+
<Private>True</Private>
150+
</Reference>
151+
<Reference Include="FFImageLoading.Forms.Touch, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
152+
<HintPath>..\..\packages\Xamarin.FFImageLoading.Forms.2.2.6-pre-232\lib\Xamarin.iOS10\FFImageLoading.Forms.Touch.dll</HintPath>
153+
<Private>True</Private>
154+
</Reference>
155+
<Reference Include="FFImageLoading.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
156+
<HintPath>..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-232\lib\Xamarin.iOS10\FFImageLoading.Platform.dll</HintPath>
157+
<Private>True</Private>
158+
</Reference>
143159
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
144160
<HintPath>..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
145161
<Private>True</Private>
@@ -171,6 +187,10 @@
171187
<Reference Include="System" />
172188
<Reference Include="System.Xml" />
173189
<Reference Include="System.Core" />
190+
<Reference Include="WebP.Touch, Version=1.0.5923.35383, Culture=neutral, processorArchitecture=MSIL">
191+
<HintPath>..\..\packages\WebP.Touch.1.0.2\lib\Xamarin.iOS10\WebP.Touch.dll</HintPath>
192+
<Private>True</Private>
193+
</Reference>
174194
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
175195
<HintPath>..\..\packages\Xamarin.Forms.2.3.2.127\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
176196
<Private>True</Private>

0 commit comments

Comments
 (0)