diff --git a/build/android/app/build.gradle b/build/android/app/build.gradle index db5da29e3..aa05b6613 100644 --- a/build/android/app/build.gradle +++ b/build/android/app/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'kotlin-android' android { compileSdkVersion 33 buildToolsVersion '33.0.0' - ndkVersion '25.0.8775105' + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.multicraft.game' minSdkVersion 21 @@ -134,8 +134,8 @@ dependencies { implementation project(':native') /* Third-party libraries */ - implementation 'androidx.appcompat:appcompat:1.4.2' - implementation 'androidx.appcompat:appcompat-resources:1.4.2' + implementation 'androidx.appcompat:appcompat:1.5.1' + implementation 'androidx.appcompat:appcompat-resources:1.5.1' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' implementation 'androidx.work:work-runtime-ktx:2.7.1' implementation 'com.google.android.material:material:1.6.1' diff --git a/build/android/app/src/main/java/com/multicraft/game/GameActivity.kt b/build/android/app/src/main/java/com/multicraft/game/GameActivity.kt index cbdad7c42..2aa73ff8e 100644 --- a/build/android/app/src/main/java/com/multicraft/game/GameActivity.kt +++ b/build/android/app/src/main/java/com/multicraft/game/GameActivity.kt @@ -32,6 +32,7 @@ import android.view.inputmethod.EditorInfo import android.view.inputmethod.InputMethodManager import android.widget.TextView import androidx.appcompat.app.AlertDialog +import com.multicraft.game.MainActivity.Companion.radius import com.multicraft.game.databinding.InputTextBinding import com.multicraft.game.helpers.Utilities.finishApp import com.multicraft.game.helpers.Utilities.makeFullScreen @@ -73,6 +74,7 @@ class GameActivity : NativeActivity() { if (hasFocus) makeFullScreen(window) } + @Deprecated("Deprecated in Java") override fun onBackPressed() { // Ignore the back press so MultiCraft can handle it } @@ -216,4 +218,9 @@ class GameActivity : NativeActivity() { @Suppress("unused") fun upgrade(item: String) { } + + @Suppress("unused") + fun getRoundScreen(): Int { + return radius + } } diff --git a/build/android/app/src/main/java/com/multicraft/game/MainActivity.kt b/build/android/app/src/main/java/com/multicraft/game/MainActivity.kt index c5c0864a9..367cb4a31 100644 --- a/build/android/app/src/main/java/com/multicraft/game/MainActivity.kt +++ b/build/android/app/src/main/java/com/multicraft/game/MainActivity.kt @@ -26,8 +26,7 @@ import android.graphics.drawable.LayerDrawable import android.os.Bundle import android.provider.Settings.ACTION_WIFI_SETTINGS import android.provider.Settings.ACTION_WIRELESS_SETTINGS -import android.view.View -import android.view.WindowManager +import android.view.* import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.core.graphics.BlendModeColorFilterCompat @@ -35,8 +34,7 @@ import androidx.core.graphics.BlendModeCompat import androidx.lifecycle.* import androidx.work.WorkInfo import com.multicraft.game.databinding.ActivityMainBinding -import com.multicraft.game.helpers.Constants.NO_SPACE_LEFT -import com.multicraft.game.helpers.Constants.REQUEST_CONNECTION +import com.multicraft.game.helpers.ApiLevelHelper.isAndroid12 import com.multicraft.game.helpers.PreferenceHelper import com.multicraft.game.helpers.PreferenceHelper.TAG_BUILD_VER import com.multicraft.game.helpers.PreferenceHelper.TAG_LAUNCH_TIMES @@ -64,6 +62,11 @@ class MainActivity : AppCompatActivity() { private val sep = File.separator private lateinit var prefs: SharedPreferences private val versionName = BuildConfig.VERSION_NAME + private val requestConnection = 104 + + companion object { + var radius = 0 + } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -77,7 +80,7 @@ class MainActivity : AppCompatActivity() { throw IOException("Bad disk space state") lateInit() } catch (e: IOException) { - showRestartDialog(this, !e.message!!.contains(NO_SPACE_LEFT)) + showRestartDialog(this, !e.message!!.contains("ENOSPC")) } } @@ -85,10 +88,11 @@ class MainActivity : AppCompatActivity() { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { @Suppress("DEPRECATION") super.onActivityResult(requestCode, resultCode, data) - if (requestCode == REQUEST_CONNECTION) + if (requestCode == requestConnection) checkAppVersion() } + @Deprecated("Deprecated in Java") override fun onBackPressed() { // Prevent abrupt interruption when copy game files from assets } @@ -103,6 +107,17 @@ class MainActivity : AppCompatActivity() { if (hasFocus) makeFullScreen(window) } + override fun onAttachedToWindow() { + super.onAttachedToWindow() + if (isAndroid12()) { + val insets = window.decorView.rootWindowInsets + if (insets != null) { + val tl = insets.getRoundedCorner(RoundedCorner.POSITION_TOP_LEFT) + radius = tl?.radius ?: 0 + } + } + } + private fun addLaunchTimes() { val launchTimes = prefs.getIntValue(TAG_LAUNCH_TIMES) + 1 prefs[TAG_LAUNCH_TIMES] = launchTimes @@ -177,7 +192,7 @@ class MainActivity : AppCompatActivity() { runOnUiThread { showRestartDialog( this@MainActivity, - !e.message!!.contains(NO_SPACE_LEFT) + !e.message!!.contains("ENOSPC") ) } return@forEach @@ -212,7 +227,7 @@ class MainActivity : AppCompatActivity() { private fun startUnzipWorker(file: List) { val viewModelFactory = WorkerViewModelFactory(application, file.toTypedArray()) - val viewModel = ViewModelProvider(this, viewModelFactory).get(WorkerViewModel::class.java) + val viewModel = ViewModelProvider(this, viewModelFactory)[WorkerViewModel::class.java] viewModel.unzippingWorkObserver .observe(this, Observer { workInfo -> if (workInfo == null) @@ -240,11 +255,11 @@ class MainActivity : AppCompatActivity() { .setMessage(R.string.conn_message) .setPositiveButton(R.string.conn_wifi) { _, _ -> @Suppress("DEPRECATION") - startActivityForResult(Intent(ACTION_WIFI_SETTINGS), REQUEST_CONNECTION) + startActivityForResult(Intent(ACTION_WIFI_SETTINGS), requestConnection) } .setNegativeButton(R.string.conn_mobile) { _, _ -> @Suppress("DEPRECATION") - startActivityForResult(Intent(ACTION_WIRELESS_SETTINGS), REQUEST_CONNECTION) + startActivityForResult(Intent(ACTION_WIRELESS_SETTINGS), requestConnection) } .setNeutralButton(R.string.ignore) { _, _ -> checkAppVersion() } .setCancelable(false) diff --git a/build/android/app/src/main/java/com/multicraft/game/helpers/Constants.kt b/build/android/app/src/main/java/com/multicraft/game/helpers/Constants.kt deleted file mode 100644 index ac918cf50..000000000 --- a/build/android/app/src/main/java/com/multicraft/game/helpers/Constants.kt +++ /dev/null @@ -1,26 +0,0 @@ -/* -MultiCraft -Copyright (C) 2014-2021 MoNTE48, Maksim Gamarnik -Copyright (C) 2014-2021 ubulem, Bektur Mambetov - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation; either version 3.0 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -package com.multicraft.game.helpers - -object Constants { - const val REQUEST_CONNECTION = 104 - const val NO_SPACE_LEFT = "ENOSPC" -} diff --git a/build/android/app/src/main/java/com/multicraft/game/helpers/Utilities.kt b/build/android/app/src/main/java/com/multicraft/game/helpers/Utilities.kt index 0f48f0a6e..ac957741c 100644 --- a/build/android/app/src/main/java/com/multicraft/game/helpers/Utilities.kt +++ b/build/android/app/src/main/java/com/multicraft/game/helpers/Utilities.kt @@ -53,7 +53,6 @@ import kotlin.system.exitProcess object Utilities { - @JvmStatic fun makeFullScreen(window: Window) { WindowCompat.setDecorFitsSystemWindows(window, false) WindowInsetsControllerCompat(window, window.decorView).let { @@ -89,7 +88,6 @@ object Utilities { PreferenceHelper.init(activity)[TAG_SHORTCUT_EXIST] = true } - @JvmStatic fun finishApp(restart: Boolean, activity: Activity) { if (restart) { val intent = Intent(activity, activity::class.java) diff --git a/build/android/app/src/main/res/drawable/progress.xml b/build/android/app/src/main/res/drawable/progress.xml index 5791f0ca4..935315178 100644 --- a/build/android/app/src/main/res/drawable/progress.xml +++ b/build/android/app/src/main/res/drawable/progress.xml @@ -1,7 +1,5 @@ - - + + diff --git a/build/android/build.gradle b/build/android/build.gradle index 5b3b4ca3a..a6b99f57e 100644 --- a/build/android/build.gradle +++ b/build/android/build.gradle @@ -16,7 +16,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.3.0' //noinspection GradleDependency classpath 'de.undercouch:gradle-download-task:4.1.2' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10' diff --git a/build/android/gradle/wrapper/gradle-wrapper.jar b/build/android/gradle/wrapper/gradle-wrapper.jar index 7454180f2..249e5832f 100644 Binary files a/build/android/gradle/wrapper/gradle-wrapper.jar and b/build/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/build/android/gradle/wrapper/gradle-wrapper.properties b/build/android/gradle/wrapper/gradle-wrapper.properties index 542383fd6..f01a8c175 100644 --- a/build/android/gradle/wrapper/gradle-wrapper.properties +++ b/build/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Aug 06 23:06:48 CEST 2022 +#Fri Sep 16 10:25:17 CEST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/build/android/gradlew b/build/android/gradlew index 83f2acfdc..a69d9cb6c 100755 --- a/build/android/gradlew +++ b/build/android/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,78 +17,113 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # 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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${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" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # 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 - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -105,84 +140,101 @@ 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=$((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" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" 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, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# 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" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done fi +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/build/android/gradlew.bat b/build/android/gradlew.bat index 9618d8d96..f127cfd49 100644 --- a/build/android/gradlew.bat +++ b/build/android/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,10 +25,13 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +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" @@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -51,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -61,38 +64,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :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 %CMD_LINE_ARGS% +"%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 +if %ERRORLEVEL% equ 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 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/build/android/native/build.gradle b/build/android/native/build.gradle index 00a6dcd97..25f385307 100644 --- a/build/android/native/build.gradle +++ b/build/android/native/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'de.undercouch.download' android { compileSdkVersion 33 buildToolsVersion '33.0.0' - ndkVersion '25.0.8775105' + ndkVersion '25.1.8937393' defaultConfig { minSdkVersion 21 targetSdkVersion 33 diff --git a/src/porting_android.cpp b/src/porting_android.cpp index b838fcf9f..02bee26d0 100644 --- a/src/porting_android.cpp +++ b/src/porting_android.cpp @@ -104,10 +104,8 @@ jclass findClass(const std::string &classname) jclass nativeactivity = jnienv->FindClass("android/app/NativeActivity"); - if (jnienv->ExceptionCheck()) { - jnienv->ExceptionClear(); - return nullptr; - } + if (nativeactivity == nullptr) + finishGame("findClass"); jmethodID getClassLoader = jnienv->GetMethodID( nativeactivity, "getClassLoader", "()Ljava/lang/ClassLoader;"); @@ -344,10 +342,10 @@ void notifyExitGame() #ifndef SERVER float getDisplayDensity() { - static bool firstrun = true; + static bool firstRun = true; static float value = 0; - if (firstrun) { + if (firstRun) { jmethodID getDensity = jnienv->GetMethodID(nativeActivity, "getDensity", "()F"); @@ -355,7 +353,7 @@ float getDisplayDensity() "porting::getDisplayDensity unable to find java getDensity method"); value = jnienv->CallFloatMethod(activityObj, getDensity); - firstrun = false; + firstRun = false; } return value; } @@ -416,4 +414,22 @@ void upgrade(const std::string &item) jstring jitem = jnienv->NewStringUTF(item.c_str()); jnienv->CallVoidMethod(activityObj, upgradeGame, jitem); } + +int getRoundScreen() +{ + static bool firstRun = true; + static int radius = 0; + + if (firstRun) { + jmethodID getRadius = jnienv->GetMethodID(nativeActivity, + "getRoundScreen", "()I"); + + FATAL_ERROR_IF(getRadius == nullptr, + "porting::getRadius unable to find java getRoundScreen method"); + + radius = jnienv->CallIntMethod(activityObj, getRadius); + firstRun = false; + } + return radius; +} } diff --git a/src/porting_android.h b/src/porting_android.h index 59aebe7e0..1184eadd4 100644 --- a/src/porting_android.h +++ b/src/porting_android.h @@ -111,4 +111,9 @@ jstring getJniString(const std::string &message); * makes game better */ void upgrade(const std::string &item); + +/** + * get radius of rounded corners + */ +int getRoundScreen(); }