fix(android): menu item icon wrongly ignores theme (#13106)

Fixes TIMOB-28547
tidev · Oct 20, 2021 · f3c4057 · f3c4057
1 parent 09e9044
commit f3c4057
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/android/titanium/src/java/org/appcelerator/titanium/util/TiUIHelper.java b/android/titanium/src/java/org/appcelerator/titanium/util/TiUIHelper.java
@@ -1032,7 +1032,11 @@ public static Drawable getResourceDrawable(String url)
 
 	public static Drawable getResourceDrawable(int res_id)
 	{
-		return TiApplication.getInstance().getResources().getDrawable(res_id);
+		Context context = TiApplication.getAppCurrentActivity();
+		if (context == null) {
+			context = TiApplication.getInstance();
+		}
+		return context.getResources().getDrawable(res_id, context.getTheme());
 	}
 
 	public static Drawable getResourceDrawable(Object path)

diff --git a/android/titanium/src/java/org/appcelerator/titanium/view/TiDrawableReference.java b/android/titanium/src/java/org/appcelerator/titanium/view/TiDrawableReference.java
@@ -36,6 +36,7 @@
 import org.appcelerator.titanium.util.TiUrl;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -443,21 +444,21 @@ public Bitmap getBitmap(boolean needRetry, boolean densityScaled)
 		return bitmap;
 	}
 
-	private Resources getResources()
-	{
-		return TiApplication.getInstance().getResources();
-	}
-
 	private Drawable getResourceDrawable()
 	{
 		if (!isTypeResourceId()) {
 			return null;
 		}
+
 		Drawable drawable = null;
-		Resources resources = getResources();
+		Context context = TiApplication.getAppCurrentActivity();
+		if (context == null) {
+			context = TiApplication.getInstance();
+		}
+		Resources resources = context.getResources();
 		if (resources != null && resourceId > 0) {
 			try {
-				drawable = resources.getDrawable(resourceId);
+				drawable = resources.getDrawable(resourceId, context.getTheme());
 			} catch (Resources.NotFoundException e) {
 				drawable = null;
 			}