diff --git a/Cargo.toml b/Cargo.toml index edcef36..4a8ad72 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,5 +9,6 @@ exclude = [ "examples/agdk-winit-wgpu", "examples/agdk-egui", "examples/na-mainloop", - "examples/na-winit-wgpu" + "examples/na-winit-wgpu", + "examples/na-subclass-jni" ] diff --git a/examples/na-subclass-jni/.gitignore b/examples/na-subclass-jni/.gitignore new file mode 100644 index 0000000..ebd37e1 --- /dev/null +++ b/examples/na-subclass-jni/.gitignore @@ -0,0 +1,21 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties +*.so + +# Added by cargo + +/target +Cargo.lock diff --git a/examples/na-subclass-jni/.idea/.gitignore b/examples/na-subclass-jni/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/examples/na-subclass-jni/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/examples/na-subclass-jni/.idea/compiler.xml b/examples/na-subclass-jni/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/examples/na-subclass-jni/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/examples/na-subclass-jni/.idea/gradle.xml b/examples/na-subclass-jni/.idea/gradle.xml new file mode 100644 index 0000000..526b4c2 --- /dev/null +++ b/examples/na-subclass-jni/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/examples/na-subclass-jni/.idea/misc.xml b/examples/na-subclass-jni/.idea/misc.xml new file mode 100644 index 0000000..c461621 --- /dev/null +++ b/examples/na-subclass-jni/.idea/misc.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/examples/na-subclass-jni/.idea/vcs.xml b/examples/na-subclass-jni/.idea/vcs.xml new file mode 100644 index 0000000..fdf1fc8 --- /dev/null +++ b/examples/na-subclass-jni/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/examples/na-subclass-jni/Cargo.toml b/examples/na-subclass-jni/Cargo.toml new file mode 100644 index 0000000..e5d6811 --- /dev/null +++ b/examples/na-subclass-jni/Cargo.toml @@ -0,0 +1,186 @@ +[package] +name = "na-subclass-jni" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +log = "0.4" +android_logger = "0.11.0" +native-activity = { path="../../native-activity" } +jni = "0.19" + +serde = { version = "1", features = ["derive"] } +serde_json = "1" + +[lib] +#name="na_subclass_jni" +crate_type=["cdylib"] + + +#################### +# cargo apk config # +#################### + +[package.metadata.android] +# Specifies the package property of the manifest. +package = "com.foo.bar" + +# Specifies the array of targets to build for. +build_targets = [ "aarch64-linux-android" ] + +# Path to your application's resources folder. +# If not specified, resources will not be included in the APK. +#resources = "path/to/resources_folder" + +# Path to the folder containing your application's assets. +# If not specified, assets will not be included in the APK. +#assets = "path/to/assets_folder" + +# Name for final APK file. +# Defaults to package name. +#apk_name = "myapp" + +# Folder containing extra shared libraries intended to be dynamically loaded at runtime. +# Files matching `libs_folder/${android_abi}/*.so` are added to the apk +# according to the specified build_targets. +#runtime_libs = "path/to/libs_folder" + +# See https://developer.android.com/guide/topics/manifest/uses-sdk-element +# +# Defaults to a `min_sdk_version` of 23 and `target_sdk_version` of 30 (or lower if the detected NDK doesn't support this). +[package.metadata.android.sdk] +min_sdk_version = 28 +target_sdk_version = 31 +#max_sdk_version = 31 + +# See https://developer.android.com/guide/topics/manifest/uses-feature-element +# +# Note: there can be multiple .uses_feature entries. +[[package.metadata.android.uses_feature]] +name = "android.hardware.vulkan.level" +required = true +version = 1 + +# See https://developer.android.com/guide/topics/manifest/uses-permission-element +# +# Note: there can be multiple .uses_permission entries. +#[[package.metadata.android.uses_permission]] +#name = "android.permission.WRITE_EXTERNAL_STORAGE" +#max_sdk_version = 18 + +# See https://developer.android.com/guide/topics/manifest/queries-element#provider +#[[package.metadata.android.queries.provider]] +#authorities = "org.khronos.openxr.runtime_broker;org.khronos.openxr.system_runtime_broker" +# Note: The `name` attribute is normally not required for a queries provider, but is non-optional +# as a workaround for aapt throwing errors about missing `android:name` attribute. +# This will be made optional if/when cargo-apk migrates to aapt2. +#name = "org.khronos.openxr" + +# See https://developer.android.com/guide/topics/manifest/queries-element#intent +#[[package.metadata.android.queries.intent]] +#actions = ["android.intent.action.SEND"] + +# See https://developer.android.com/guide/topics/manifest/queries-element#intent +# Note: there can be several .data entries. +#[[package.metadata.android.queries.intent.data]] +#mime_type = "image/jpeg" + +# See https://developer.android.com/guide/topics/manifest/queries-element#package +#[[package.metadata.android.queries.package]] +#name = "org.freedesktop.monado.openxr_runtime.in_process" + +# See https://developer.android.com/guide/topics/manifest/application-element +#[package.metadata.android.application] + +# See https://developer.android.com/guide/topics/manifest/application-element#debug +# +# Defaults to false. +#debuggable = false + +# See https://developer.android.com/guide/topics/manifest/application-element#theme +# +# Example shows setting the theme of an application to fullscreen. +#theme = "@android:style/Theme.DeviceDefault.NoActionBar.Fullscreen" + +# Virtual path your application's icon for any mipmap level. +# If not specified, an icon will not be included in the APK. +#icon = "@mipmap/ic_launcher" + +# See https://developer.android.com/guide/topics/manifest/application-element#label +# +# Defaults to the compiled artifact's name. +label = "Application Name" + +# See https://developer.android.com/guide/topics/manifest/meta-data-element +# +# Note: there can be several .meta_data entries. +# Note: the `resource` attribute is currently not supported. +#[[package.metadata.android.application.meta_data]] +#name = "com.samsung.android.vr.application.mode" +#value = "vr_only" + +# See https://developer.android.com/guide/topics/manifest/activity-element +[package.metadata.android.application.activity] + +# See https://developer.android.com/guide/topics/manifest/activity-element#nm +# +# The name of the class that implements the activity, a subclass of Activity +# +# Defaults to "android.app.NativeActivity" +# name = "android.app.MyActivity" + +# See https://developer.android.com/guide/topics/manifest/activity-element#config +# +# Defaults to "orientation|keyboardHidden|screenSize". +#config_changes = "orientation" + +# See https://developer.android.com/guide/topics/manifest/activity-element#label +# +# Defaults to the application's label. +#label = "Activity Name" + +# See https://developer.android.com/guide/topics/manifest/activity-element#lmode +# +# Defaults to "standard". +#launch_mode = "singleTop" + +# See https://developer.android.com/guide/topics/manifest/activity-element#screen +# +# Defaults to "unspecified". +#orientation = "landscape" + +# See https://developer.android.com/guide/topics/manifest/activity-element#exported +# +# Unset by default, or "true" when targeting Android >= 31 (S and up). +#exported = "true" + +# See https://developer.android.com/guide/topics/manifest/meta-data-element +# +# Note: there can be several .meta_data entries. +# Note: the `resource` attribute is currently not supported. +#[[package.metadata.android.application.activity.meta_data]] +#name = "com.oculus.vr.focusaware" +#value = "true" + +# See https://developer.android.com/guide/topics/manifest/intent-filter-element +# +# Note: there can be several .intent_filter entries. +#[[package.metadata.android.application.activity.intent_filter]] +# See https://developer.android.com/guide/topics/manifest/action-element +#actions = ["android.intent.action.VIEW", "android.intent.action.WEB_SEARCH"] +# See https://developer.android.com/guide/topics/manifest/category-element +#categories = ["android.intent.category.DEFAULT", "android.intent.category.BROWSABLE"] + +# See https://developer.android.com/guide/topics/manifest/data-element +# +# Note: there can be several .data entries. +# Note: not specifying an attribute excludes it from the final data specification. +#[[package.metadata.android.application.activity.intent_filter.data]] +#scheme = "https" +#host = "github.com" +#port = "8080" +#path = "/rust-windowing/android-ndk-rs/tree/master/cargo-apk" +#path_prefix = "/rust-windowing/" +#mime_type = "image/jpeg" \ No newline at end of file diff --git a/examples/na-subclass-jni/README.md b/examples/na-subclass-jni/README.md new file mode 100644 index 0000000..b87e604 --- /dev/null +++ b/examples/na-subclass-jni/README.md @@ -0,0 +1,21 @@ +This is a minimal test application similar to `na-mainloop` that +demonstrates running with a subclass of `NativeActivity` and overriding +the `onNewIntent` `Activity` method and notifying rust whenever it's called. + +Note: unlike the `na-mainloop` example, this one can't be built via +`cargo apk` since it needs to compile some Java code. + +# Gradle Build +``` +rustup target add aarch64-linux-android + +cargo install cargo-ndk + +export ANDROID_NDK_HOME="path/to/ndk" +cargo ndk -t arm64-v8a -o app/src/main/jniLibs/ build + +export ANDROID_HOME="path/to/sdk" +./gradlew build +./gradlew installDebug +adb shell am start -n co.realfit.nasubclassjni/.MainActivity +``` diff --git a/examples/na-subclass-jni/app/.gitignore b/examples/na-subclass-jni/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/examples/na-subclass-jni/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/examples/na-subclass-jni/app/build.gradle b/examples/na-subclass-jni/app/build.gradle new file mode 100644 index 0000000..2533720 --- /dev/null +++ b/examples/na-subclass-jni/app/build.gradle @@ -0,0 +1,41 @@ +plugins { + id 'com.android.application' +} + +android { + compileSdk 31 + + defaultConfig { + applicationId "co.realfit.nasubclassjni" + minSdk 28 + targetSdk 31 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + debug { + minifyEnabled false + //packagingOptions { + // doNotStrip '**/*.so' + //} + //debuggable true + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +dependencies { + + +} + diff --git a/examples/na-subclass-jni/app/proguard-rules.pro b/examples/na-subclass-jni/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/examples/na-subclass-jni/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/examples/na-subclass-jni/app/src/main/AndroidManifest.xml b/examples/na-subclass-jni/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..c672c1e --- /dev/null +++ b/examples/na-subclass-jni/app/src/main/AndroidManifest.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/examples/na-subclass-jni/app/src/main/java/co/realfit/nasubclassjni/MainActivity.java b/examples/na-subclass-jni/app/src/main/java/co/realfit/nasubclassjni/MainActivity.java new file mode 100644 index 0000000..a99504e --- /dev/null +++ b/examples/na-subclass-jni/app/src/main/java/co/realfit/nasubclassjni/MainActivity.java @@ -0,0 +1,27 @@ +package co.realfit.nasubclassjni; + +import android.app.NativeActivity; +import android.content.Intent; +import android.os.Bundle; + +public class MainActivity extends NativeActivity { + + static { + System.loadLibrary("na_subclass_jni"); + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + } + + @Override + protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); + + notifyOnNewIntent(); + } + + private native void notifyOnNewIntent(); +} diff --git a/examples/na-subclass-jni/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/examples/na-subclass-jni/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/examples/na-subclass-jni/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/examples/na-subclass-jni/app/src/main/res/drawable/ic_launcher_background.xml b/examples/na-subclass-jni/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/examples/na-subclass-jni/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/na-subclass-jni/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/examples/na-subclass-jni/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/examples/na-subclass-jni/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/examples/na-subclass-jni/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/examples/na-subclass-jni/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/examples/na-subclass-jni/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/examples/na-subclass-jni/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/examples/na-subclass-jni/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/examples/na-subclass-jni/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/examples/na-subclass-jni/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/examples/na-subclass-jni/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/examples/na-subclass-jni/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/examples/na-subclass-jni/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/examples/na-subclass-jni/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/examples/na-subclass-jni/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/examples/na-subclass-jni/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/examples/na-subclass-jni/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/examples/na-subclass-jni/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/examples/na-subclass-jni/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/examples/na-subclass-jni/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/examples/na-subclass-jni/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/examples/na-subclass-jni/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/examples/na-subclass-jni/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/examples/na-subclass-jni/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/examples/na-subclass-jni/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/examples/na-subclass-jni/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/examples/na-subclass-jni/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/examples/na-subclass-jni/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/examples/na-subclass-jni/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/examples/na-subclass-jni/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/examples/na-subclass-jni/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/examples/na-subclass-jni/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/examples/na-subclass-jni/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/examples/na-subclass-jni/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/examples/na-subclass-jni/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/examples/na-subclass-jni/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/examples/na-subclass-jni/build.gradle b/examples/na-subclass-jni/build.gradle new file mode 100644 index 0000000..dfdcb16 --- /dev/null +++ b/examples/na-subclass-jni/build.gradle @@ -0,0 +1,10 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.1.2' apply false + id 'com.android.library' version '7.1.2' apply false +} + +task clean(type: Delete) { + delete rootProject.buildDir +} + diff --git a/examples/na-subclass-jni/gradle.properties b/examples/na-subclass-jni/gradle.properties new file mode 100644 index 0000000..dab7c28 --- /dev/null +++ b/examples/na-subclass-jni/gradle.properties @@ -0,0 +1,21 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app"s APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/examples/na-subclass-jni/gradle/wrapper/gradle-wrapper.jar b/examples/na-subclass-jni/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/examples/na-subclass-jni/gradle/wrapper/gradle-wrapper.jar differ diff --git a/examples/na-subclass-jni/gradle/wrapper/gradle-wrapper.properties b/examples/na-subclass-jni/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..b53fece --- /dev/null +++ b/examples/na-subclass-jni/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon May 02 15:39:12 BST 2022 +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/examples/na-subclass-jni/gradlew b/examples/na-subclass-jni/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/examples/na-subclass-jni/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/examples/na-subclass-jni/gradlew.bat b/examples/na-subclass-jni/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/examples/na-subclass-jni/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/examples/na-subclass-jni/settings.gradle b/examples/na-subclass-jni/settings.gradle new file mode 100644 index 0000000..78d4714 --- /dev/null +++ b/examples/na-subclass-jni/settings.gradle @@ -0,0 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} +//rootProject.name = "Rust Template" +include ':app' diff --git a/examples/na-subclass-jni/src/lib.rs b/examples/na-subclass-jni/src/lib.rs new file mode 100644 index 0000000..5ffcbf6 --- /dev/null +++ b/examples/na-subclass-jni/src/lib.rs @@ -0,0 +1,96 @@ + +use native_activity::{PollEvent, MainEvent}; +use log::Level; +use log::{trace, info}; +use std::time::Duration; +use serde::{Serialize, Deserialize}; + +#[derive(Debug, Serialize, Deserialize)] +struct AppState { + uri: String, +} + +#[no_mangle] +extern "C" fn android_main() { + + android_logger::init_once( + android_logger::Config::default().with_min_level(Level::Info) + ); + + let mut quit = false; + let mut redraw_pending = true; + let mut render_state: Option<()> = Default::default(); + + let app = native_activity::android_app(); + while !quit { + app.poll_events(Some(Duration::from_millis(500)) /* timeout */, |event| { + match event { + PollEvent::Wake => { trace!("Early wake up"); }, + PollEvent::Timeout => { + trace!("Timed out"); + // Real app would probably rely on vblank sync via graphics API... + redraw_pending = true; + }, + PollEvent::Main(main_event) => { + info!("Main event: {:?}", main_event); + match main_event { + MainEvent::SaveState { saver, .. } => { + let state = serde_json::to_vec(&AppState { uri: format!("foo://bar") }).unwrap(); + saver.store(&state); + }, + MainEvent::Pause => {}, + MainEvent::Resume { loader, .. } => { + if let Some(state) = loader.load() { + let state: AppState = serde_json::from_slice(&state).unwrap(); + info!("Resumed with saved state = {state:#?}"); + } + }, + MainEvent::InitWindow { .. } => { + render_state = Some(()); + redraw_pending = true; + }, + MainEvent::TerminateWindow { .. } => { + render_state = None; + } + MainEvent::WindowResized { .. } => { redraw_pending = true; }, + MainEvent::RedrawNeeded { ..} => { redraw_pending = true; }, + MainEvent::LowMemory => {}, + + MainEvent::Destroy => { quit = true }, + _ => { /* ... */} + } + }, + _ => {} + } + + if redraw_pending { + info!("Checking input: START"); + if let Some(_rs) = render_state { + redraw_pending = false; + + // Handle input + app.input_events(|event| { + info!("Input Event: {event:?}"); + + }); + + // Render... + } + info!("Checking input: DONE"); + } else { + info!("No redraw pending"); + } + }); + } +} + + +#[allow(non_snake_case)] +#[no_mangle] +pub extern "C" fn Java_co_realfit_nasubclassjni_MainActivity_notifyOnNewIntent( + _env: jni::JNIEnv, + _class: jni::objects::JObject, // This is the JClass, not the instance, + _activity: jni::objects::JObject, +) { + info!("onNewIntent was called!"); +} \ No newline at end of file