summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.ControlGallery.WindowsUniversal
diff options
context:
space:
mode:
authorE.Z. Hart <hartez@users.noreply.github.com>2016-07-18 23:16:47 (GMT)
committerJason Smith <jason.smith@xamarin.com>2016-07-18 23:16:47 (GMT)
commit272033723ea275ceb8a288fa605eafd035c79f2d (patch)
treeabc639d0f5627f3877f9e237e473bda168e9e030 /Xamarin.Forms.ControlGallery.WindowsUniversal
parentc9da550ce4987e01c1bbce9d0a17b860e1d300b3 (diff)
downloadxamarin-forms-272033723ea275ceb8a288fa605eafd035c79f2d.zip
xamarin-forms-272033723ea275ceb8a288fa605eafd035c79f2d.tar.gz
xamarin-forms-272033723ea275ceb8a288fa605eafd035c79f2d.tar.bz2
Windows image loader error handling (#260)
* Repros for various image issues * Log image loading errors * Better repro instructions and user interface * Image loading tests now running on WinRT/UWP phone/tablet/desktop * Move FailImageSource into shared project * Move FailImageSource into shared project * Update docs
Diffstat (limited to 'Xamarin.Forms.ControlGallery.WindowsUniversal')
-rw-r--r--Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/AssemblyInfo.cs9
-rw-r--r--Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj4
-rw-r--r--Xamarin.Forms.ControlGallery.WindowsUniversal/invalidimage.jpg1
3 files changed, 13 insertions, 1 deletions
diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/AssemblyInfo.cs b/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/AssemblyInfo.cs
index 405b6c6..b83ca10 100644
--- a/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/AssemblyInfo.cs
+++ b/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/AssemblyInfo.cs
@@ -1,6 +1,10 @@
´╗┐using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using Xamarin.Forms;
+using Xamarin.Forms.ControlGallery.WindowsUniversal;
+using Xamarin.Forms.Controls;
+using Xamarin.Forms.Platform.UWP;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
@@ -26,4 +30,7 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)] \ No newline at end of file
+[assembly: ComVisible(false)]
+
+// Deliberately broken image source and handler so we can test handling of image loading errors
+[assembly: ExportImageSourceHandler(typeof(FailImageSource), typeof(BrokenImageSourceHandler))] \ No newline at end of file
diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj b/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj
index e2cb27d..d5339b7 100644
--- a/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj
+++ b/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj
@@ -117,6 +117,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="coffee.png" />
+ <Content Include="invalidimage.jpg" />
<Content Include="toolbar_close.png" />
<None Include="project.json" />
<Content Include="..\Xamarin.Forms.ControlGallery.WP8\bank.png">
@@ -150,6 +151,9 @@
<Link>seth.png</Link>
</Content>
<Content Include="Properties\default.rd.xml" />
+ <Compile Include="..\Xamarin.Forms.ControlGallery.Windows\BrokenImageSourceHandler.cs">
+ <Link>BrokenImageSourceHandler.cs</Link>
+ </Compile>
<Compile Include="..\Xamarin.Forms.ControlGallery.Windows\StringProvider.cs">
<Link>StringProvider.cs</Link>
</Compile>
diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/invalidimage.jpg b/Xamarin.Forms.ControlGallery.WindowsUniversal/invalidimage.jpg
new file mode 100644
index 0000000..6c7ebbb
--- /dev/null
+++ b/Xamarin.Forms.ControlGallery.WindowsUniversal/invalidimage.jpg
@@ -0,0 +1 @@
+This is certainly not a real JPEG. \ No newline at end of file