Update na-subclass-jni

- updates gradle / AGP
- updates icons
- removes crates.io patches
- updates Cargo.lock

Author: rib

na-subclass-jni/Cargo.lock

@@ -8,8 +8,7 @@ edition = "2021"
 [dependencies]
 log = "0.4"
 android_logger = "0.11.0"
-android-activity = { version = "0.6", features = [ "native-activity" ] }
-#ndk-context = "0.1"
+android-activity = { version = "0.6", features = ["native-activity"] }
 ndk = "0.9"
 ndk-sys = "0.6"
 jni = "0.22"
@@ -19,176 +18,4 @@ 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"
-
-[patch.crates-io]
-jni = { git = "https://github.com/jni-rs/jni-rs.git", branch = "release-0.22" }
-android-activity = { git = "https://github.com/rust-mobile/android-activity.git", branch = "rib/stack/jni-0.22" }
-#android-activity = { path = "../../../android-activity/jni-next/android-activity" }
+crate-type = ["cdylib"]

na-subclass-jni/Cargo.toml

@@ -3,39 +3,37 @@ plugins {
 }
 
 android {
-    ndkVersion "25.2.9519653"
-    compileSdk 35
+    compileSdk = 35
 
     defaultConfig {
-        applicationId "com.github.rust_mobile.nasubclassjni"
-        minSdk 31
-        targetSdk 35
-        versionCode 1
-        versionName "1.0"
+        applicationId = "com.github.rust_mobile.nasubclassjni"
+        minSdk = 31
+        targetSdk = 35
+        versionCode = 1
+        versionName = "1.0"
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled = false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
         debug {
-            minifyEnabled false
+            minifyEnabled = false
             //packagingOptions {
             //    doNotStrip '**/*.so'
             //}
             //debuggable true
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_10
-        targetCompatibility JavaVersion.VERSION_1_10
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
-    namespace 'com.github.rust_mobile.nasubclassjni'
+    namespace = 'com.github.rust_mobile.nasubclassjni'
 }
 
 dependencies {
 
-
 }
 

na-subclass-jni/app/build.gradle

@@ -0,0 +1,29 @@
+package com.github.rust_mobile.nasubclassjni;
+
+import android.app.NativeActivity;
+import android.os.Bundle;
+import android.util.Log;
+import android.content.Intent;
+
+public class MainActivity extends NativeActivity {
+
+    private static final String TAG = "MainActivity";
+    static {
+        System.loadLibrary("na_subclass_jni");
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Log.i(TAG, "onCreate");
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        Log.i(TAG, "onNewIntent: " + intent.toString());
+        notifyOnNewIntent(intent.toString());
+    }
+
+    private static native void notifyOnNewIntent(String message);
+}