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.

Sign up for GitHub

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

Jump to bottom

Android: Add LZH support, refactor GameBrowser Game Searching #3230

Merged
merged 26 commits into from
Aug 25, 2024
Merged

Android: Add LZH support, refactor GameBrowser Game Searching #3230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
8a18a8c
Android: Hardcode the read only strings
Ghabry May 23, 2024
f24639f
Android: Remove FastForward button by default
Ghabry May 23, 2024
c76ea07
FileFinder: Add a helper function to recursively find a game
Ghabry May 23, 2024
af01610
Android: Fix Saf Write test
Ghabry May 23, 2024
59ac1ce
Android: Refactor Player Filesystem API
Ghabry May 23, 2024
3465068
Android: Use native FileFinder for the game detection of the GameBrow…
Ghabry May 23, 2024
9c99c32
Android: Add progress information to the scanning process
Ghabry May 23, 2024
a2c0565
ZipFs: Reuse the initial stream (LzhFs already does this)
Ghabry May 23, 2024
cc33823
Android: Multiple games are now found in subdirectories
Ghabry May 23, 2024
440f32b
Android: Sync the FF-Multiplier setting with the INI setting
Ghabry May 23, 2024
623cba0
Android: Update translations to mention LZH support and lack of 7z-su…
Ghabry May 23, 2024
e229a20
Android: Pass in the title through JNI, cleanup
Ghabry May 23, 2024
1e2bd02
Android: Try to load the title image in three ways
Ghabry May 23, 2024
f4c8c7a
Android: Fetch the game name from the INI
Ghabry May 24, 2024
7b5ad5b
Android: Add option to rename the game
Ghabry May 24, 2024
f08e92b
Android: Provide soundfont path via command line. Fix typos
Ghabry May 24, 2024
555db42
Android: Make it possible to configure the Font
Ghabry May 24, 2024
48f9826
Settings: Hide Font settings when Freetype is missing
Ghabry May 24, 2024
ea64c4d
Android: Improve font scene, show preview
Ghabry May 24, 2024
d7bfcc7
Android: Improve wording of the folder buttons
Ghabry May 25, 2024
3ada4ce
Android: Remove GameScanner suffix from the cpp files
Ghabry May 25, 2024
7209ec1
Android: Add RTP status to the Folders activity
Ghabry May 25, 2024
6d83034
Android: Add "Toggle FPS" and "Reset Game" to the game drawer
Ghabry May 25, 2024
d4663aa
Android: Use different save paths when multiple games are in one archive
Ghabry Aug 25, 2024
387301c
Android: Bump to SDK 34
Ghabry Aug 25, 2024
e6e8cc3
Android: Update deps and gradle to 8.10
Ghabry Aug 25, 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
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,6 @@ if(${PLAYER_TARGET_PLATFORM} STREQUAL "SDL2")
endif()

if(ANDROID)
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/builds/android/app/src/gamebrowser)
set(PLAYER_BUILD_EXECUTABLE OFF)
endif()

Expand Down Expand Up @@ -1347,6 +1346,7 @@ else() # library
endif()
elseif(ANDROID AND ${PLAYER_TARGET_PLATFORM} STREQUAL "SDL2")
add_library(easyrpg_android
src/platform/android/android.cpp
src/platform/android/android.h
src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.cpp
src/platform/android/org_easyrpg_player_player_EasyRpgPlayerActivity.h
Expand All @@ -1357,6 +1357,7 @@ else() # library
src/platform/sdl/main.cpp)
target_link_libraries(easyrpg_android ${PROJECT_NAME})
set_target_properties(easyrpg_android PROPERTIES DEBUG_POSTFIX "")
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/builds/android/app/src/gamebrowser)
set(PLAYER_TEST_LIBRARIES "easyrpg_android")
else()
message(FATAL_ERROR "Unsupported library target platform ${PLAYER_TARGET_PLATFORM}")
Expand Down
11 changes: 5 additions & 6 deletions builds/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
apply plugin: 'com.android.application'
android {
namespace "org.easyrpg.player"
compileSdkVersion 33
buildToolsVersion '33.0.0'
ndkVersion '21.4.7075529'
assetPacks = [":assets"]
defaultConfig {
applicationId "org.easyrpg.player"
compileSdk 34
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
versionName VERSION_NAME
versionCode Integer.parseInt(VERSION_CODE)
}
Expand Down Expand Up @@ -75,10 +74,10 @@ allprojects {
}

dependencies {
implementation 'androidx.appcompat:appcompat:1.6.0'
implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.recyclerview:recyclerview:1.3.2'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.documentfile:documentfile:1.0.1'
implementation 'org.ini4j:ini4j:0.5.4'
Expand Down
9 changes: 5 additions & 4 deletions builds/android/app/src/gamebrowser/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ cmake_minimum_required(VERSION 3.7)
project(easyrpg_android VERSION 1.0 LANGUAGES CXX)

add_library(gamebrowser
org_easyrpg_player_game_browser_GameScanner.cpp
org_easyrpg_player_game_browser_GameScanner.h
org_easyrpg_player_game_browser.cpp
org_easyrpg_player_game_browser.h
)

find_package(PNG REQUIRED)
target_link_libraries(gamebrowser PNG::PNG)
set_target_properties(gamebrowser PROPERTIES DEBUG_POSTFIX "")

target_link_libraries(gamebrowser easyrpg_android)

if(BUILD_SHARED_LIBS)
set_property(TARGET gamebrowser PROPERTY POSITION_INDEPENDENT_CODE ON)
Expand Down
Loading
Loading