Gradle: Fix build script, Examples: Added Kotlin example

Google-Developers-Sohag · May 5, 2022 · e20f678 · e20f678
1 parent d07a6fb
commit e20f678
Show file tree

Hide file tree

Showing 39 changed files with 566 additions and 58 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
+    ext.kotlin_version = '1.6.20'
     repositories {
         google()
         jcenter()
         mavenCentral()
+        mavenLocal()
     }
     dependencies {
         classpath "com.android.tools.build:gradle:4.1.2"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,6 +21,7 @@ allprojects {
         google()
         jcenter()
         mavenCentral()
+        mavenLocal()
     }
 }
 

diff --git a/helloandroidharness/build.gradle b/helloandroidharness/build.gradle
@@ -3,13 +3,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.jme3.helloandroidharness"
         minSdkVersion 22
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 

diff --git a/helloandroidharness/src/main/java/com/jme3/helloandroidharness/MainActivity.java b/helloandroidharness/src/main/java/com/jme3/helloandroidharness/MainActivity.java
@@ -1,5 +1,12 @@
 package com.jme3.helloandroidharness;
 
+import android.content.pm.ActivityInfo;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.view.Menu;
+
+import androidx.annotation.Nullable;
+
 import com.jme3.app.AndroidHarness;
 
 import java.util.Objects;
@@ -24,4 +31,10 @@ public MainActivity() {
         /*get the jme class dir*/
         appClass = Objects.requireNonNull(MyGame.class.getName());
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        System.err.println("OnDestroy invoked");
+    }
 }
diff --git a/helloandroidui/build.gradle b/helloandroidui/build.gradle
@@ -3,13 +3,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.jme3.helloandroidui"
         minSdkVersion 22
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 
@@ -32,12 +31,12 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     /*add the JMonkeyEngine Dependencies*/
     implementation "org.jmonkeyengine:jme3-core:3.5.1-stable"
     implementation "org.jmonkeyengine:jme3-effects:3.5.1-stable"
-    implementation "org.jmonkeyengine:jme3-android-native:3.5.1-stable"
+    implementation "org.jmonkeyengine:jme3-android-native:3.4.0-SNAPSHOT"
 }
diff --git a/helloandroidui/src/main/java/com/jme3/helloandroidui/MainActivity.java b/helloandroidui/src/main/java/com/jme3/helloandroidui/MainActivity.java
@@ -8,16 +8,16 @@
 import android.widget.RelativeLayout;
 import android.widget.Toast;
 
-import com.jme3.app.LegacyApplication;
-import com.jme3.app.jmeSurfaceView.JmeSurfaceView;
-import com.jme3.app.jmeSurfaceView.OnExceptionThrown;
-import com.jme3.app.jmeSurfaceView.OnRendererCompleted;
-import com.jme3.system.AppSettings;
-
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.cardview.widget.CardView;
 import androidx.core.content.ContextCompat;
 
+import com.jme3.app.LegacyApplication;
+import com.jme3.system.AppSettings;
+import com.jme3.view.surfaceview.JmeSurfaceView;
+import com.jme3.view.surfaceview.OnExceptionThrown;
+import com.jme3.view.surfaceview.OnRendererCompleted;
+
 import static android.widget.Toast.LENGTH_LONG;
 
 /**
@@ -34,6 +34,7 @@
  */
 public final class MainActivity extends AppCompatActivity implements OnRendererCompleted, OnExceptionThrown {
 
+    private static boolean isRenderingCompleted;
     private JmeSurfaceView jmeSurfaceView;
     private CardView splashScreen;
 
@@ -45,17 +46,24 @@ protected void onCreate(Bundle savedInstanceState) {
 
         /*define the android view with it's id from xml*/
         jmeSurfaceView = findViewById(R.id.jmeSurfaceView);
+        jmeSurfaceView.setDestructionPolicy(JmeSurfaceView.DestructionPolicy.KEEP_WHEN_FINISH);
+
         /*display a splash screen*/
-        splashScreen = new CardView(MainActivity.this);
-        splashScreen.setLayoutParams(new RelativeLayout.LayoutParams(jmeSurfaceView.getLayoutParams().width, jmeSurfaceView.getLayoutParams().height));
-        splashScreen.setBackground(ContextCompat.getDrawable(this, R.drawable.power2));
-        jmeSurfaceView.addView(splashScreen);
+        if (!isRenderingCompleted) {
+            splashScreen = new CardView(MainActivity.this);
+            splashScreen.setLayoutParams(new RelativeLayout.LayoutParams(jmeSurfaceView.getLayoutParams().width, jmeSurfaceView.getLayoutParams().height));
+            splashScreen.setBackground(ContextCompat.getDrawable(this, R.drawable.power2));
+            jmeSurfaceView.addView(splashScreen);
+        } else {
+            findViewById(R.id.webView).setVisibility(View.VISIBLE);
+            findViewById(R.id.image).setVisibility(View.VISIBLE);
+        }
+
         /*set the jme game*/
         jmeSurfaceView.setLegacyApplication(new MyGame());
         jmeSurfaceView.setOnExceptionThrown(this);
         jmeSurfaceView.setOnRendererCompleted(this);
-        /*start the game, with delay for the splashScreen*/
-        jmeSurfaceView.startRenderer(300);
+        jmeSurfaceView.startRenderer(500);
 
         /*Handle other UI-Components parts*/
         final WebView webView = findViewById(R.id.webView);
@@ -98,6 +106,7 @@ public void onRenderCompletion(LegacyApplication application, AppSettings appSet
             /*dismiss the splash screen at the send of the animation*/
             jmeSurfaceView.removeView(splashScreen);
         }).start();
+        isRenderingCompleted = true;
     }
 
     /**

diff --git a/helloandroidui/src/main/java/com/jme3/helloandroidui/MyGame.java b/helloandroidui/src/main/java/com/jme3/helloandroidui/MyGame.java
@@ -14,12 +14,13 @@
  * To use it inside Android :
  * <ol>
  * <li>Create an instance of it inside the #{@link MainActivity}</li>
- * <li>Set that instance using #{@link com.jme3.app.jmeSurfaceView.JmeSurfaceView#setLegacyApplication(LegacyApplication)}</li>
- * <li>Start the game using #{@link com.jme3.app.jmeSurfaceView.JmeSurfaceView#startRenderer(int)}</li>
+ * <li>Set that instance using #{@link com.jme3.view.surfaceview.JmeSurfaceView#setLegacyApplication(LegacyApplication)}</li>
+ * <li>Start the game using #{@link com.jme3.view.surfaceview.JmeSurfaceView#startRenderer(int)}</li>
  * </ol>
  *
  * @author pavl_g
  */
+
 public final class MyGame extends SimpleApplication {
     @Override
     public void simpleInitApp() {

diff --git a/helloandroidui/src/main/res/layout/activity_main.xml b/helloandroidui/src/main/res/layout/activity_main.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <com.jme3.app.jmeSurfaceView.JmeSurfaceView
+    <com.jme3.view.surfaceview.JmeSurfaceView
         android:id="@+id/jmeSurfaceView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

diff --git a/hellofragmentharness/build.gradle b/hellofragmentharness/build.gradle
@@ -3,13 +3,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.jme3.hellofragmentharness"
         minSdkVersion 22
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 
@@ -32,12 +31,12 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     /*add the JMonkeyEngine Dependencies*/
     implementation "org.jmonkeyengine:jme3-core:3.5.1-stable"
     implementation "org.jmonkeyengine:jme3-effects:3.5.1-stable"
-    implementation "org.jmonkeyengine:jme3-android-native:3.5.1-stable"
+    implementation "org.jmonkeyengine:jme3-android-native:3.4.0-SNAPSHOT"
 }
diff --git a/hellojmesurfaceview/build.gradle b/hellojmesurfaceview/build.gradle
@@ -3,13 +3,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.jme3.hellojmesurfaceview"
         minSdkVersion 22
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 
@@ -37,7 +36,9 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     /*add the JMonkeyEngine Dependencies*/
-    implementation "org.jmonkeyengine:jme3-core:3.5.1-stable"
-    implementation "org.jmonkeyengine:jme3-effects:3.5.1-stable"
-    implementation "org.jmonkeyengine:jme3-android-native:3.5.1-stable"
+    implementation "org.jmonkeyengine:jme3-core:3.4.0-SNAPSHOT"
+    //noinspection GradleDependency
+    implementation "org.jmonkeyengine:jme3-effects:3.4.0-SNAPSHOT"
+    //noinspection GradleDependency
+    implementation "org.jmonkeyengine:jme3-android-native:3.4.0-SNAPSHOT"
 }
diff --git a/hellojmesurfaceview/src/main/java/com/jme3/hellojmesurfaceview/MainActivity.java b/hellojmesurfaceview/src/main/java/com/jme3/hellojmesurfaceview/MainActivity.java
@@ -1,26 +1,24 @@
-package com.jme3.hellojmesurfaceview;
+ package com.jme3.hellojmesurfaceview;
 
-import android.content.pm.ActivityInfo;
-import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.RelativeLayout;
-import android.widget.Toast;
+ import android.content.pm.ActivityInfo;
+ import android.graphics.Rect;
+ import android.os.Bundle;
+ import android.view.TouchDelegate;
+ import android.view.View;
+ import android.widget.Toast;
+ import androidx.appcompat.app.AppCompatActivity;
 
-import com.jme3.app.LegacyApplication;
-import com.jme3.app.jmeSurfaceView.JmeSurfaceView;
-import com.jme3.app.jmeSurfaceView.OnExceptionThrown;
-import com.jme3.app.jmeSurfaceView.OnRendererCompleted;
-import com.jme3.system.AppSettings;
+ import com.jme3.app.LegacyApplication;
+ import com.jme3.system.AppSettings;
+ import com.jme3.view.surfaceview.JmeSurfaceView;
+ import com.jme3.view.surfaceview.OnExceptionThrown;
+ import com.jme3.view.surfaceview.OnRendererCompleted;
 
-import androidx.appcompat.app.AppCompatActivity;
-
-/**
+ /**
  * <b>NB: Please Open this example <u>root module</u> using Android Studio; because android build scripts are different from java builds.</b>
  * <br/>
  * An Android Example that demonstrates : How to use a simple game#{@link MyGame}
- * on #{@link com.jme3.app.jmeSurfaceView.JmeSurfaceView} inside an #{@link androidx.appcompat.app.AppCompatActivity}.
+ * on #{@link com.jme3.view.surfaceview.JmeSurfaceView} inside an #{@link androidx.appcompat.app.AppCompatActivity}.
  * <br>
  * <b>Note : use #{@link AppCompatActivity#setRequestedOrientation(int)} and #{@link ActivityInfo#SCREEN_ORIENTATION_LANDSCAPE} for LandScape mode or specify that under the <activity> activity tag xml.</b>
  *
@@ -31,15 +29,15 @@ public final class MainActivity extends AppCompatActivity implements OnRendererC
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
         /*define the android view with it's id from xml*/
         final JmeSurfaceView jmeSurfaceView = findViewById(R.id.jmeSurfaceView);
+        jmeSurfaceView.setDestructionPolicy(JmeSurfaceView.DestructionPolicy.KEEP_WHEN_FINISH);
         /*set the jme game*/
         jmeSurfaceView.setLegacyApplication(new MyGame());
         jmeSurfaceView.setOnExceptionThrown(this);
         jmeSurfaceView.setOnRendererCompleted(this);
         /*start the game*/
-        jmeSurfaceView.startRenderer(0);
+        jmeSurfaceView.startRenderer(500);
     }
 
     /**
@@ -51,7 +49,6 @@ protected void onCreate(Bundle savedInstanceState) {
     public void onExceptionThrown(Throwable e) {
         Toast.makeText(MainActivity.this, "User's Delay Finished w/ exception : " + e.getMessage(), Toast.LENGTH_SHORT).show();
     }
-
     /**
      * Fired when the user delay in ms is up #{@link JmeSurfaceView#startRenderer(int)}.
      *

diff --git a/hellojmesurfaceview/src/main/java/com/jme3/hellojmesurfaceview/MyGame.java b/hellojmesurfaceview/src/main/java/com/jme3/hellojmesurfaceview/MyGame.java
@@ -3,6 +3,8 @@
 import com.jme3.app.LegacyApplication;
 import com.jme3.app.SimpleApplication;
 import com.jme3.asset.AssetKey;
+import com.jme3.input.CameraInput;
+import com.jme3.input.ChaseCamera;
 import com.jme3.material.Material;
 import com.jme3.math.ColorRGBA;
 import com.jme3.scene.Geometry;
@@ -14,13 +16,14 @@
  * To use it inside Android :
  * <ol>
  * <li>Create an instance of it inside the #{@link MainActivity}</li>
- * <li>Set that instance using #{@link com.jme3.app.jmeSurfaceView.JmeSurfaceView#setLegacyApplication(LegacyApplication)}</li>
- * <li>Start the game using #{@link com.jme3.app.jmeSurfaceView.JmeSurfaceView#startRenderer(int)}</li>
+ * <li>Set that instance using #{@link com.jme3.view.surfaceview.JmeSurfaceView#setLegacyApplication(LegacyApplication)}</li>
+ * <li>Start the game using #{@link com.jme3.view.surfaceview.JmeSurfaceView#startRenderer(int)}</li>
  * </ol>
  *
  * @author pavl_g
  */
 public final class MyGame extends SimpleApplication {
+
     @Override
     public void simpleInitApp() {
         final Sphere mySphere = new Sphere(10, 50, 50);

diff --git a/hellojmesurfaceview/src/main/res/layout/activity_main.xml b/hellojmesurfaceview/src/main/res/layout/activity_main.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-  <com.jme3.app.jmeSurfaceView.JmeSurfaceView
+  <com.jme3.view.surfaceview.JmeSurfaceView
       android:id="@+id/jmeSurfaceView"
       android:layout_width="match_parent"
       android:layout_height="match_parent"

diff --git a/hellokotlin/.gitignore b/hellokotlin/.gitignore
@@ -0,0 +1 @@
+/build