gwh/droid48-gwh
1
0
Fork 0
Code Pull requests Activity

Android tools update

Browse source
This commit is contained in:
Arnaud Brochard 2022-10-16 17:02:24 +02:00
parent ff5869d06c
commit ad5a5e8fcc
10 changed files with 41 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -36,3 +36,8 @@ app/.externalNativeBuild
app/.cxx app/.cxx
app/app-all-release.apk app/app-all-release.apk
#using VSCode now
org.eclipse.buildship.core.prefs
.project
.classpath

17
.vscode/c_cpp_properties.json vendored Normal file
View file

@ -0,0 +1,17 @@
{
"configurations": [
{
"name": "Linux",
"includePath": [
"${workspaceFolder}/**",
"/opt/android/ndk/25.1.8937393/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include"
],
"defines": [],
"compilerPath": "/usr/bin/gcc",
"cStandard": "gnu17",
"cppStandard": "gnu++14",
"intelliSenseMode": "linux-gcc-x64"
}
],
"version": 4
}

3
.vscode/settings.json vendored Normal file
View file

@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "interactive"
}

8
app/build.gradle
View file

@ -11,13 +11,13 @@ android {
keyPassword localProps["droid48.pass"] keyPassword localProps["droid48.pass"]
} }
} }
compileSdkVersion 29 compileSdkVersion 31
ndkVersion "22.1.7171670" ndkVersion "25.1.8937393"
defaultConfig { defaultConfig {
applicationId "org.ab.x48" applicationId "org.ab.x48"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 29 targetSdkVersion 31
externalNativeBuild { externalNativeBuild {
cmake { cmake {
@ -34,5 +34,5 @@ android {
} }
dependencies { dependencies {
implementation 'com.getkeepsafe.relinker:relinker:1.4.3' implementation 'com.getkeepsafe.relinker:relinker:1.4.5'
} }

6
app/src/main/AndroidManifest.xml
View file

@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.ab.x48" android:installLocation="auto" android:versionCode="74" android:versionName="1.74"> package="org.ab.x48" android:installLocation="auto" android:versionCode="75" android:versionName="1.75">
<application android:icon="@drawable/icon" android:label="@string/app_name"> <application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".X48" <activity android:name=".X48"
android:label="@string/app_name" android:label="@string/app_name"
android:configChanges="keyboardHidden|orientation" android:launchMode="singleTop"> <!-- |screenSize --> android:configChanges="keyboardHidden|orientation"
android:launchMode="singleTop"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />

8
app/src/main/java/org/ab/x48/HPView.java
View file

@ -380,10 +380,10 @@ public class HPView extends SurfaceView implements SurfaceHolder.Callback {
boolean antialias = true; boolean antialias = true;
systemOptionsPaint = new Paint(); systemOptionsPaint = new Paint();
systemOptionsPaint.setTypeface(regularBold); systemOptionsPaint.setTypeface(regularBold);
systemOptionsPaint.setAntiAlias(antialias); systemOptionsPaint.setAntiAlias(antialias);
systemOptionsPaint.setTextSize((int) (12f * scale)); systemOptionsPaint.setTextSize((int) (12f * scale));
systemOptionsPaint.setColor(Color.BLACK); systemOptionsPaint.setColor(Color.BLACK);
if (x48.isBitmapSkin()) { if (x48.isBitmapSkin()) {
BitmapFactory.Options opts = new BitmapFactory.Options(); BitmapFactory.Options opts = new BitmapFactory.Options();

2
app/src/main/java/org/ab/x48/X48.java
View file

@ -134,7 +134,7 @@ public class X48 extends Activity {
public void checkPrefs() { public void checkPrefs() {
SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences mPrefs = PreferenceManager.getDefaultSharedPreferences(this);
if (mPrefs.getBoolean("blockOrientation", false)) if (mPrefs.getBoolean("blockOrientation", false))
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_NOSENSOR);
else else
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);

2
app/src/main/jni/CMakeLists.txt
View file

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
cmake_minimum_required(VERSION 3.4.1) cmake_minimum_required(VERSION 3.10.2)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=format-security") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=format-security")

2
build.gradle
View file

@ -5,7 +5,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.0.2' classpath 'com.android.tools.build:gradle:7.3.0'
} }
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Tue May 04 22:27:50 CEST 2021 #Tue May 04 22:27:50 CEST 2021
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME