Fixed Skins

MultiPad-Project · Aug 12, 2023 · 87f94f0 · 87f94f0
1 parent 9316bfe
commit 87f94f0
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/app/src/main/java/com/xayup/multipad/SkinTheme.java b/app/src/main/java/com/xayup/multipad/SkinTheme.java
@@ -68,14 +68,19 @@ private static boolean setResources(Activity context) {
 			} catch (Resources.NotFoundException nfr) {
 				bgDrawable = skinRes.getDrawable(skinRes.getIdentifier("playbg", "drawable", packageName));
 			}
+			int tmp_res_id;
 			setDrawables(
-				skinRes.getDrawable(skinRes.getIdentifier("phantom_", "drawable", packageName)),	//phantomCenter
-				skinRes.getDrawable(skinRes.getIdentifier("phantom", "drawable", packageName)),	//phantom
-				skinRes.getDrawable(skinRes.getIdentifier("chainled", "drawable", packageName)),	//chain
-				skinRes.getDrawable(skinRes.getIdentifier("btn", "drawable", packageName)),	//btn
-				skinRes.getDrawable(skinRes.getIdentifier("btn_", "drawable", packageName)),	//btn_
+				skinRes.getDrawable(skinRes.getIdentifier("phantom_", "drawable", packageName), null),	//phantomCenter
+				skinRes.getDrawable(skinRes.getIdentifier("phantom", "drawable", packageName), null),	//phantom
+				skinRes.getDrawable(skinRes.getIdentifier("chainled", "drawable", packageName), null),	//chain
+				skinRes.getDrawable(skinRes.getIdentifier("btn", "drawable", packageName), null),	//btn
+				skinRes.getDrawable(skinRes.getIdentifier("btn_", "drawable", packageName), null),	//btn_
 				bgDrawable,						 //playbg
-				skinRes.getDrawable(skinRes.getIdentifier("logo", "drawable", packageName)));   //logo
+						(tmp_res_id = skinRes.getIdentifier("logo", "drawable", packageName)) == 0
+								? (tmp_res_id = skinRes.getIdentifier("custom_logo", "drawable", packageName)) == 0
+									? context.getDrawable(R.drawable.customlogo)
+									: skinRes.getDrawable(tmp_res_id, null)
+								: skinRes.getDrawable(tmp_res_id, null));   //logo
 			return true;
 		} catch (PackageManager.NameNotFoundException nnfe) {
 			return false;