Removed Gecko test. Added support for window.open events. Added targetSdkVersion. Added easy options to force canvas and noaudio.

Author: felixjones

.gitignore

@@ -1,10 +1,12 @@
 
-# Created by https://www.gitignore.io/api/android,androidstudio,java,intellij+all,jetbrains+all,linux,macos,windows
+# Created by https://www.gitignore.io/api/java,linux,macos,gradle,windows,android,intellij+all,jetbrains+all,androidstudio
+# Edit at https://www.gitignore.io/?templates=java,linux,macos,gradle,windows,android,intellij+all,jetbrains+all,androidstudio
 
 ### Android ###
 # Built application files
 *.apk
 *.ap_
+*.aab
 
 # Files for the ART/Dalvik VM
 *.dex
@@ -36,22 +38,39 @@ proguard/
 # Android Studio captures folder
 captures/
 
-# Intellij
+# IntelliJ
 *.iml
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml
+.idea/assetWizardSettings.xml
 .idea/dictionaries
 .idea/libraries
+.idea/caches
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
 
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
 # Freeline
 freeline.py
 freeline/
 freeline_project_description.json
 
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
 ### Android Patch ###
 gen-external-apklibs
 
@@ -100,7 +119,9 @@ obj/
 /out/
 
 # User-specific configurations
+.idea/caches/
 .idea/libraries/
+.idea/shelf/
 .idea/.name
 .idea/compiler.xml
 .idea/copyright/profiles_settings.xml
@@ -128,6 +149,8 @@ Thumbs.db
 # Legacy Eclipse project files
 .classpath
 .project
+.cproject
+.settings/
 
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
@@ -161,35 +184,47 @@ fabric.properties
 !/gradle/wrapper/gradle-wrapper.jar
 
 ### Intellij+all ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff:
+# User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
 
-# Sensitive or high-churn files:
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
 .idea/**/dataSources/
 .idea/**/dataSources.ids
-.idea/**/dataSources.xml
 .idea/**/dataSources.local.xml
 .idea/**/sqlDataSources.xml
 .idea/**/dynamic.xml
 .idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
 
-# Gradle:
+# Gradle
 .idea/**/gradle.xml
 .idea/**/libraries
 
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+
 # CMake
-cmake-build-debug/
+cmake-build-*/
 
-# Mongo Explorer plugin:
+# Mongo Explorer plugin
 .idea/**/mongoSettings.xml
 
-## File-based project format:
-
-## Plugin-specific files:
+# File-based project format
 
 # IntelliJ
 
@@ -202,12 +237,22 @@ cmake-build-debug/
 
 # Crashlytics plugin (for Android Studio and IntelliJ)
 
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
 ### Intellij+all Patch ###
-# Ignores the whole idea folder
+# Ignores the whole .idea folder and all .iml files
 # See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
 
 .idea/
 
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
+modules.xml
+
 ### Java ###
 # Compiled class file
 
@@ -220,29 +265,38 @@ cmake-build-debug/
 
 # Package Files #
 *.jar
+*.nar
 *.zip
 *.tar.gz
 *.rar
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 
 ### JetBrains+all ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff:
+# User-specific stuff
 
-# Sensitive or high-churn files:
+# Generated files
 
-# Gradle:
+# Sensitive or high-churn files
 
-# CMake
+# Gradle
 
-# Mongo Explorer plugin:
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
 
-## File-based project format:
+# CMake
 
-## Plugin-specific files:
+# Mongo Explorer plugin
+
+# File-based project format
 
 # IntelliJ
 
@@ -254,11 +308,18 @@ cmake-build-debug/
 
 # Crashlytics plugin (for Android Studio and IntelliJ)
 
+# Editor-based Rest Client
+
+# Android studio 3.1+ serialized cache file
+
 ### JetBrains+all Patch ###
-# Ignores the whole idea folder
+# Ignores the whole .idea folder and all .iml files
 # See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
 
 
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
+
 ### Linux ###
 
 # temporary files which can be created if a process still has a handle open of a deleted file
@@ -274,7 +335,7 @@ cmake-build-debug/
 .nfs*
 
 ### macOS ###
-*.DS_Store
+# General
 .AppleDouble
 .LSOverride
 
@@ -301,19 +362,41 @@ Temporary Items
 # Windows thumbnail cache files
 ehthumbs_vista.db
 
+# Dump file
+*.stackdump
+
 # Folder config file
-Desktop.ini
+[Dd]esktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
 
 # Windows Installer files
 *.cab
 *.msi
+*.msix
 *.msm
 *.msp
 
 # Windows shortcuts
 *.lnk
 
-# End of https://www.gitignore.io/api/android,androidstudio,java,intellij+all,jetbrains+all,linux,macos,windows
+### Gradle ###
+/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+### Gradle Patch ###
+**/build/
+
+# End of https://www.gitignore.io/api/java,linux,macos,gradle,windows,android,intellij+all,jetbrains+all,androidstudio

app/build.gradle

@@ -23,8 +23,11 @@ android {
      */
     def BACK_BUTTON_QUITS   = true // Use back button to quit the app?
     def SHOW_FPS            = false // Display the FPS monitor?
+    def FORCE_CANVAS        = false // Disables fast WebGL rendering when available
+    def FORCE_NO_AUDIO      = false // Disables WebAudio
+    def ANDROID_SDK         = 28 // Android 9 "Pie" API 28
 
-    compileSdkVersion 28
+    compileSdkVersion ANDROID_SDK
 
     defaultConfig {
 
@@ -34,12 +37,16 @@ android {
         applicationId "id.application.rpgmakermv" // Change this to your applicationId.
         versionCode 1 // Set this to a higher number for game updates.
         versionName "1.0" // This is the version that the player sees.
+
+        targetSdkVersion ANDROID_SDK
     }
 
     buildTypes {
         buildTypes.each { buildType ->
             buildType.buildConfigField "boolean",  "BACK_BUTTON_QUITS", String.valueOf(BACK_BUTTON_QUITS)
             buildType.buildConfigField "boolean",  "SHOW_FPS",          String.valueOf(SHOW_FPS)
+            buildType.buildConfigField "boolean",  "FORCE_CANVAS",      String.valueOf(FORCE_CANVAS)
+            buildType.buildConfigField "boolean",  "FORCE_NO_AUDIO",    String.valueOf(FORCE_NO_AUDIO)
         }
     }
 
@@ -53,14 +60,6 @@ android {
             buildConfigField "boolean", "BOOTSTRAP_INTERFACE", "true"
         }
 
-        // WARNING: Gecko engine is currently not functional
-        zz_geckoalpha {
-            dimension "mv_android_client"
-            minSdkVersion 26
-
-            buildConfigField "boolean", "BOOTSTRAP_INTERFACE", "false"
-        }
-
         // WARNING: As of February 2017 Crosswalk is no longer maintained https://crosswalk-project.org/blog/crosswalk-final-release.html
         zz_crosswalk {
             dimension "mv_android_client"
@@ -82,7 +81,5 @@ dependencies {
 
     implementation 'com.android.support:appcompat-v7:28.0.0'
 
-    zz_geckoalphaImplementation 'org.mozilla.geckoview:geckoview-beta-armeabi-v7a:+'
-
     zz_crosswalkImplementation 'org.xwalk:xwalk_core_library:23.53.589.4'
 }

app/src/main/java/systems/altimit/rpgmakermv/WebPlayerActivity.java

@@ -219,10 +219,12 @@ public void run() {
         @Override
         protected void onPrepare(boolean webgl, boolean webaudio, boolean showfps) {
             Context context = mPlayer.getContext();
-            if (webgl) {
+            if (webgl && !BuildConfig.FORCE_CANVAS) {
                 mURIBuilder = appendQuery(mURIBuilder, context.getString(R.string.query_webgl));
+            } else {
+                mURIBuilder = appendQuery(mURIBuilder, context.getString(R.string.query_canvas));
             }
-            if (!webaudio) {
+            if (!webaudio || BuildConfig.FORCE_NO_AUDIO) {
                 mURIBuilder = appendQuery(mURIBuilder, context.getString(R.string.query_noaudio));
             }
             if (showfps || BuildConfig.SHOW_FPS) {

app/src/main/res/values/values_internal.xml

@@ -19,6 +19,7 @@
     <string name="mv_project_index">//android_asset/www/index.html</string>
 
     <string name="query_webgl">webgl</string>
+    <string name="query_canvas">canvas</string>
     <string name="query_noaudio">noaudio</string>
     <string name="query_showfps">showfps</string>