From b7448a74226f712a0470a706114f668f5acd57cd Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Sat, 20 Aug 2016 01:52:21 -0400 Subject: [PATCH] selected icon loading optimizations --- .../Controls/ExtendedTabbedPageRenderer.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/Android/Controls/ExtendedTabbedPageRenderer.cs b/src/Android/Controls/ExtendedTabbedPageRenderer.cs index 67fe6cd3e..c8b8e173d 100644 --- a/src/Android/Controls/ExtendedTabbedPageRenderer.cs +++ b/src/Android/Controls/ExtendedTabbedPageRenderer.cs @@ -67,15 +67,18 @@ namespace Bit.Android.Controls return; } - var selectedResource = IdFromTitle(string.Format("{0}_selected", icon), ResourceManager.DrawableClass); - if(selected && selectedResource != 0) + if(selected) { - tab.SetIcon(selectedResource); - } - else - { - tab.SetIcon(IdFromTitle(icon, ResourceManager.DrawableClass)); + var selectedResource = IdFromTitle(string.Format("{0}_selected", icon), ResourceManager.DrawableClass); + if(selectedResource != 0) + { + tab.SetIcon(selectedResource); + return; + } } + + var resource = IdFromTitle(icon, ResourceManager.DrawableClass); + tab.SetIcon(resource); } private int IdFromTitle(string title, Type type)