kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix HAS_ICON logic on Android.

Browse Source 
If an icon already exists, we still want `HAS_ICON` to be true, but we also want to avoid adding even more icons.
This commit is contained in:
Joseph Cloutier
2024-01-14 12:18:42 -05:00
parent d0e5eab1c5
commit 09724f4bca
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tools/platforms/AndroidPlatform.hx
View File

@@ -543,36 +543,38 @@ class AndroidPlatform extends PlatformTarget
}
}
var iconTypes = ["ldpi", "mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi"];
var iconSizes = [36, 48, 72, 96, 144, 192];
var icons = project.icons;
if (icons.length == 0)
for (attribute in context.ANDROID_APPLICATION)
{
icons = [new Icon(System.findTemplate(project.templatePaths, "default/icon.svg"))];
}
for (i in 0...iconTypes.length)
{
if (IconHelper.createIcon(icons, iconSizes[i], iconSizes[i], sourceSet + "/res/drawable-" + iconTypes[i] + "/icon.png") && context.HAS_ICON == null)
if (attribute.key == "android:icon")
{
for (attribute in context.ANDROID_APPLICATION)
{
if (attribute.key == "android:icon")
{
context.HAS_ICON = false;
break;
}
}
context.HAS_ICON = true;
break;
}
}
if (context.HAS_ICON == null)
if (context.HAS_ICON == null)
{
var iconTypes = ["ldpi", "mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi"];
var iconSizes = [36, 48, 72, 96, 144, 192];
var icons = project.icons;
if (icons.length == 0)
{
icons = [new Icon(System.findTemplate(project.templatePaths, "default/icon.svg"))];
}
for (i in 0...iconTypes.length)
{
// create multiple icons, only set "android:icon" once
if (IconHelper.createIcon(icons, iconSizes[i], iconSizes[i], sourceSet + "/res/drawable-" + iconTypes[i] + "/icon.png")
&& !context.HAS_ICON)
{
context.HAS_ICON = true;
context.ANDROID_APPLICATION.push({ key: "android:icon", value: "@drawable/icon" });
}
}
}
IconHelper.createIcon(icons, 732, 412, sourceSet + "/res/drawable-xhdpi/ouya_icon.png");
IconHelper.createIcon(icons, 732, 412, sourceSet + "/res/drawable-xhdpi/ouya_icon.png");
}
var packageDirectory = project.meta.packageName;
packageDirectory = sourceSet + "/java/" + packageDirectory.split(".").join("/");