Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update android support #1007

Merged
merged 60 commits into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
ef8069c
Update gameinterface.lua
SkullzOTS Jan 17, 2024
33abddf
Update interface.otmod
SkullzOTS Jan 17, 2024
319cc00
Add files via upload
SkullzOTS Jan 17, 2024
b47c361
Add files via upload
SkullzOTS Jan 17, 2024
a61afff
fix game_joystick (provisional)
SkullzOTS Jan 18, 2024
e9d5aeb
Update uimap.cpp
SkullzOTS Jan 18, 2024
5b7684a
Update mapview.cpp
SkullzOTS Jan 18, 2024
9bb31fb
Update uimap.h
SkullzOTS Jan 18, 2024
833a5cb
Update console.lua
SkullzOTS Jan 18, 2024
8591931
Update uiitem.lua
SkullzOTS Jan 18, 2024
989bed0
Update gameinterface.lua
SkullzOTS Jan 18, 2024
034318e
Update gameinterface.lua
SkullzOTS Jan 18, 2024
6667a23
Update gameinterface.lua
SkullzOTS Jan 18, 2024
1a2e0d2
Update console.lua
SkullzOTS Jan 18, 2024
d4f0c53
fix StatesChange
SkullzOTS Jan 18, 2024
914ffaa
Update keyboard.lua
SkullzOTS Jan 18, 2024
9810efc
Update healthinfo.lua
SkullzOTS Jan 18, 2024
bf9ade8
Update ruleviolation.lua
SkullzOTS Jan 18, 2024
3696b5e
Update player.lua
SkullzOTS Jan 18, 2024
975e890
fix Rain Shader in Mobile
SkullzOTS Jan 18, 2024
256c8f3
Merge branch 'main' into mobile-working
SkullzOTS May 30, 2024
4b601bc
Merge branch 'main' into mobile-working
SkullzOTS Jun 1, 2024
12ca0ac
fix build
SkullzOTS Jun 1, 2024
83d1e7d
Merge branch 'main' into mobile-working
SkullzOTS Jun 1, 2024
4e80546
check mobile .otui
SkullzOTS Jun 1, 2024
263f09f
Merge branch 'main' into mobile-working
SkullzOTS Jun 1, 2024
310f7d7
Merge branch 'main' into mobile-working
SkullzOTS Jun 9, 2024
71fa888
Merge branch 'main' into mobile-working
SkullzOTS Jun 29, 2024
51cd4bd
Merge branch 'main' into mobile-working
SkullzOTS Jul 27, 2024
2fd7020
Merge branch 'main' into mobile-working
SkullzOTS Aug 27, 2024
557a3c6
Merge branch 'main' into mobile-working
SkullzOTS Aug 28, 2024
4aa4b1a
Merge branch 'main' into mobile-working
SkullzOTS Aug 28, 2024
d3d4675
fix terminal errors and interface scale
SkullzOTS Aug 29, 2024
04daf1e
Fix Touch Position
SkullzOTS Aug 29, 2024
ce282bc
Merge branch 'main' into mobile-working
SkullzOTS Aug 29, 2024
c48e1c1
Merge branch 'mobile-working' of https://github.com/mehah/otclient in…
SkullzOTS Aug 29, 2024
ec80347
Merge branch 'main' into mobile-working
SkullzOTS Aug 29, 2024
24c0fae
fix statsbar
SkullzOTS Aug 29, 2024
168ce54
Merge branch 'main' into mobile-working
SkullzOTS Sep 5, 2024
0f286c3
Merge branch 'main' into mobile-working
SkullzOTS Sep 14, 2024
4fa06f6
Merge branch 'main' into mobile-working
SkullzOTS Sep 28, 2024
5b142d0
feat: mouse press
mehah Sep 29, 2024
6891a0c
New Mobile Features
SkullzOTS Sep 29, 2024
02848f6
Merge branch 'main' into mobile-working
mehah Oct 7, 2024
a51fc47
Merge branch 'main' into mobile-working
SkullzOTS Oct 31, 2024
b3627d1
Update walk.lua
SkullzOTS Oct 31, 2024
4cc1f19
Merge branch 'main' into mobile-working
SkullzOTS Dec 5, 2024
a9776e6
Merge branch 'main' into mobile-working
SkullzOTS Dec 22, 2024
6fd25a8
Merge branch 'main' into mobile-working
SkullzOTS Dec 24, 2024
cfd1c0b
Merge branch 'main' into mobile-working
SkullzOTS Dec 25, 2024
1e3a1ba
Merge branch 'main' into mobile-working
SkullzOTS Dec 25, 2024
10fbeb0
Merge branch 'main' into mobile-working
SkullzOTS Dec 27, 2024
83e2b90
fix build
SkullzOTS Dec 29, 2024
5bcbbc2
fix
SkullzOTS Dec 29, 2024
696c751
update
SkullzOTS Dec 29, 2024
743c0c2
fix
SkullzOTS Dec 29, 2024
f855a6c
update
SkullzOTS Dec 29, 2024
dcdebb9
Rename Icon_Charms.png to icon_charms.png
SkullzOTS Dec 30, 2024
e21141f
fix
SkullzOTS Dec 30, 2024
efa998c
fix release build
SkullzOTS Dec 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 31 additions & 19 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,55 +4,67 @@ plugins {
}

android {
compileSdk 32
namespace 'com.github.otclient'
compileSdk 35

defaultConfig {
applicationId "com.github.otclient"
minSdk 21
targetSdk 32
targetSdk 35
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
externalNativeBuild {
cmake {
cppFlags '-std=c++20'
arguments "-DVCPKG_TARGET_ANDROID=ON"
cppFlags '-std=c++20', '-fuse-ld=lld', '-flto'
arguments "-DVCPKG_TARGET_ANDROID=ON", "-DANDROID_STL=c++_shared"
}
}
ndk {
abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'
}

externalNativeBuild {
cmake {
path file('../../CMakeLists.txt')
version '3.31.1'
}
}

buildTypes {
release {
minifyEnabled false
shrinkResources false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = '1.8'
}
externalNativeBuild {
cmake {
path file('../../CMakeLists.txt')
version '3.22.1'
}
jvmTarget = '17'
}

buildFeatures {
viewBinding true
prefab true
}
ndkVersion '25.1.8937393'

ndkVersion '28.0.12674087'

defaultConfig {
externalNativeBuild {
cmake {
abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
}
}
}
}

dependencies {
implementation 'androidx.core:core-ktx:1.8.0'
implementation 'androidx.appcompat:appcompat:1.5.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.games:games-activity:1.2.1'
implementation 'com.google.android.material:material:1.6.1'
implementation 'com.google.android.material:material:1.10.0'
}
3 changes: 1 addition & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.github.otclient" >
xmlns:tools="http://schemas.android.com/tools" >

<!-- OpenGL ES 2.0 -->
<uses-feature android:glEsVersion="0x00020000"/>
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '7.2.2' apply false
id 'com.android.library' version '7.2.2' apply false
id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
id 'com.android.application' version '8.7.3' apply false
id 'com.android.library' version '8.7.3' apply false
id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
}

task clean(type: Delete) {
Expand Down
3 changes: 2 additions & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ kotlin.code.style=official
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
# Enables experimental Prefab
android.prefabVersion=2.0.0
android.prefabVersion=2.0.0
android.useGoldLinker=false
Binary file modified android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 4 additions & 3 deletions android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Mon Aug 29 19:57:03 BRT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading