From 84995a921221811d2e7047d54dcefde0c8063397 Mon Sep 17 00:00:00 2001 From: adrianknight89 Date: Thu, 3 Nov 2016 13:38:38 -0500 Subject: [Android] Allow path-based icons to be loaded as toolbar icons (#437) * Created a bitmap method to check for resource as well as path * Update platform and navigationrenderer to get images from two locations * CellAdapter could use path-based icon finding * sample app to test toolbaritem icons --- Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Xamarin.Forms.Platform.Android/AppCompat') diff --git a/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs index b77063ee..dc3c5666 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs @@ -709,8 +709,8 @@ namespace Xamarin.Forms.Platform.Android.AppCompat FileImageSource icon = item.Icon; if (!string.IsNullOrEmpty(icon)) { - Drawable iconBitmap = context.Resources.GetDrawable(icon); - if (iconBitmap != null) + var iconBitmap = new BitmapDrawable(context.Resources, ResourceManager.GetBitmap(context.Resources, icon)); + if (iconBitmap != null && iconBitmap.Bitmap != null) menuItem.SetIcon(iconBitmap); } menuItem.SetEnabled(controller.IsEnabled); -- cgit v1.2.3