Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added android:appCategory. #1724

Closed
wants to merge 9 commits into from
Closed

Added android:appCategory. #1724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4327c7f
Adding the `ANDROID_IS_GAME` to the tools.
MAJigsaw77 Nov 20, 2023
7d28f02
Adding `android:isGame` to the template
MAJigsaw77 Nov 20, 2023
53bfef2
Merge branch 'openfl:develop' into patch-1
MAJigsaw77 Dec 1, 2023
9e437ef
`android:appCategory`
MAJigsaw77 Dec 1, 2023
2c4dc77
Update AndroidPlatform.hx
MAJigsaw77 Dec 1, 2023
1b3bd27
Update AndroidManifest.xml
MAJigsaw77 Dec 1, 2023
dd8f112
Merge branch 'openfl:develop' into patch-1
MAJigsaw77 Dec 1, 2023
c1d568a
My bad
MAJigsaw77 Dec 1, 2023
3887275
Rearrange `AndroidPlatform.update()`.
player-03 Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/android/template/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
::if (ANDROID_PERMISSIONS != null)::::foreach ANDROID_PERMISSIONS::<uses-permission android:name="::__current__::" />
::end::::end::

<application android:label="::APP_TITLE::" ::if (HAS_ICON):: android:icon="@drawable/icon"::end:: android:allowBackup="true" android:theme="@android:style/Theme.NoTitleBar::if (WIN_FULLSCREEN)::.Fullscreen::end::" android:hardwareAccelerated="true" ::if (ANDROID_TARGET_SDK_VERSION>=30):: android:allowNativeHeapPointerTagging="false" ::end::>
<application android:label="::APP_TITLE::" ::if (HAS_ICON):: android:icon="@drawable/icon"::end:: ::if (ANDROID_APP_CATEGORY != null):: android:appCategory="::ANDROID_APP_CATEGORY::" ::end:: android:allowBackup="true" android:theme="@android:style/Theme.NoTitleBar::if (WIN_FULLSCREEN)::.Fullscreen::end::" android:hardwareAccelerated="true" ::if (ANDROID_TARGET_SDK_VERSION>=30):: android:allowNativeHeapPointerTagging="false" ::end::>

::if (WIN_ORIENTATION=="portrait")::
<meta-data android:name="SDL_ENV.SDL_IOS_ORIENTATIONS" android:value= "Portrait PortraitUpsideDown" />
Expand Down
8 changes: 6 additions & 2 deletions tools/platforms/AndroidPlatform.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,8 +464,6 @@ class AndroidPlatform extends PlatformTarget
context.ANDROID_USE_ANDROIDX = project.config.getString("android.useAndroidX", "true");
context.ANDROID_ENABLE_JETIFIER = project.config.getString("android.enableJetifier", "false");

context.ANDROID_LIBRARY_PROJECTS = [];

if (!project.environment.exists("ANDROID_SDK") || !project.environment.exists("ANDROID_NDK_ROOT"))
{
var command = #if lime "lime" #else "hxp" #end;
Expand All @@ -476,6 +474,11 @@ class AndroidPlatform extends PlatformTarget
Sys.exit(1);
}

if (project.config.exists("android.appCategory"))
{
context.ANDROID_APP_CATEGORY = project.config.getString("android.appCategory");
}

if (project.config.exists("android.gradle-build-directory"))
{
context.ANDROID_GRADLE_BUILD_DIRECTORY = project.config.getString("android.gradle-build-directory");
Expand All @@ -500,6 +503,7 @@ class AndroidPlatform extends PlatformTarget
"KEY_STORE_ALIAS_PASSWORD")) context.KEY_STORE_ALIAS_PASSWORD = StringTools.replace(context.KEY_STORE_ALIAS_PASSWORD, "\\", "\\\\");

var index = 1;
context.ANDROID_LIBRARY_PROJECTS = [];

for (dependency in project.dependencies)
{
Expand Down