Merge pull request #21 from paulcbetts/fix-android-resource-lookup

Try the passed in string without an extension on Android for resource loading
reactiveui · Oct 7, 2013 · c57020d · c57020d
2 parents dae033d + b3ae8bf
commit c57020d
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/Splat/Android/Bitmaps.cs b/Splat/Android/Bitmaps.cs
@@ -9,6 +9,8 @@
 using System.Collections.Generic;
 using System.Linq;
 
+using Path = System.IO.Path;
+
 namespace Splat
 {
     public class PlatformBitmapLoader : IBitmapLoader
@@ -55,6 +57,13 @@ public Task<IBitmap> LoadFromResource(string source, float? desiredWidth, float?
                 return Task.Run(() => (IBitmap)new DrawableBitmap(res.GetDrawable(drawableList[source])));
             }
 
+            // NB: On iOS, you have to pass the extension, but on Android it's 
+            // stripped - try stripping the extension to see if there's a Drawable.
+            var key = Path.GetFileNameWithoutExtension(source);
+            if (drawableList.ContainsKey(key)) {
+                return Task.Run(() => (IBitmap)new DrawableBitmap(res.GetDrawable(drawableList[key])));
+            }
+
             throw new ArgumentException("Either pass in an integer ID cast to a string, or the name of a drawable resource");
         }