Compare commits

...
17 Commits
Author SHA1 Message Date
Lncvrt f59492ca8e XPSified 2025-08-30 20:41:06 -07:00
Chloe 352ff63ab0 also send timestamp for back 2025-05-03 16:33:19 -07:00
Chloe 91fc804dee bump version 2025-05-03 16:24:55 -07:00
Chloe 87808b56b3 remove premature bug fix 2025-05-03 16:22:21 -07:00
Chloe 2c2884c3b8 use indeterminate state instead of ellipses 2025-05-03 16:14:12 -07:00
Chloe 74e91e7dc1 document some unlisted methods 2025-05-03 14:29:40 -07:00
Chloe e3ffbf311e try it 2025-05-03 14:13:39 -07:00
Chloe 5ad77bca57 i forgot i never actually committed that 2025-05-03 03:27:25 -07:00
Chloe 3be0127e04 unfortunate 2025-05-03 03:24:39 -07:00
Chloe 458c837aba add index release api opt in 2025-05-03 03:16:29 -07:00
Chloe 67ca7707d8 support predictive back gestures 2025-04-24 11:59:31 -07:00
Chloe 776a4fa468 obligatory update commit 2025-04-24 11:00:12 -07:00
Chloe 9528eef313 bump tulip 2025-04-23 23:56:55 -07:00
Chloe 9827fe36c1 add screen insets utils 2025-04-23 23:56:54 -07:00
Oleksandr Nemesh ce44270b7a add webview util (#37) 2025-04-22 13:01:53 -07:00
Chloe 34e324c54d revert all refresh rate changes 2025-01-23 20:14:52 -07:00
Chloe 986e33ce03 this is dumb 2025-01-23 19:15:08 -07:00
17 changed files with 197 additions and 73 deletions

No files matched your search

+18 -16
View File
@@ -14,14 +14,14 @@ plugins {
} }
android { android {
compileSdk = 35 compileSdk = 36
defaultConfig { defaultConfig {
applicationId = "com.geode.launcher" applicationId = "com.geode.launcherXps"
minSdk = 23 minSdk = 23
targetSdk = 35 targetSdk = 35
versionCode = 20 versionCode = 22
versionName = "1.5.0" versionName = "1.0.1"
vectorDrawables { vectorDrawables {
useSupportLibrary = true useSupportLibrary = true
@@ -30,7 +30,7 @@ android {
@Suppress("UnstableApiUsage") @Suppress("UnstableApiUsage")
externalNativeBuild { externalNativeBuild {
cmake { cmake {
arguments("-DUSE_TULIPHOOK:BOOL=OFF", "-DANDROID_STL=c++_shared") arguments("-DUSE_TULIPHOOK:BOOL=OFF", "-DANDROID_STL=c++_shared", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES:BOOL=OFF")
} }
} }
@@ -82,32 +82,34 @@ android {
} }
externalNativeBuild { externalNativeBuild {
cmake { cmake {
version = "3.25.0+"
path = file("src/main/cpp/CMakeLists.txt") path = file("src/main/cpp/CMakeLists.txt")
} }
} }
namespace = "com.geode.launcher" namespace = "com.geode.launcher"
ndkVersion = "27.2.12479018" ndkVersion = "28.1.13356709"
} }
dependencies { dependencies {
implementation (platform("androidx.compose:compose-bom:$composeBOM")) implementation (platform("androidx.compose:compose-bom:$composeBOM"))
implementation ("androidx.core:core-ktx:1.15.0") implementation ("androidx.core:core-ktx:1.16.0")
implementation ("androidx.compose.ui:ui") implementation ("androidx.compose.ui:ui")
implementation ("androidx.compose.material3:material3") implementation ("androidx.compose.material3:material3")
implementation ("androidx.compose.ui:ui-tooling-preview") implementation ("androidx.compose.ui:ui-tooling-preview")
implementation ("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7") implementation ("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
implementation ("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7") implementation ("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7")
implementation ("androidx.activity:activity-compose:1.10.0") implementation ("androidx.activity:activity-compose:1.10.1")
implementation ("androidx.activity:activity-ktx:1.10.0") implementation ("androidx.activity:activity-ktx:1.10.1")
implementation ("androidx.appcompat:appcompat:1.7.0") implementation ("androidx.appcompat:appcompat:1.7.0")
implementation ("androidx.documentfile:documentfile:1.0.1") implementation ("androidx.documentfile:documentfile:1.0.1")
implementation ("com.squareup.okio:okio:3.10.2") implementation ("com.squareup.okio:okio:3.11.0")
implementation ("com.squareup.okhttp3:okhttp:4.12.0") implementation ("com.squareup.okhttp3:okhttp:4.12.0")
implementation ("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0") implementation ("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1")
implementation ("org.jetbrains.kotlinx:kotlinx-serialization-json-okio:1.8.0") implementation ("org.jetbrains.kotlinx:kotlinx-serialization-json-okio:1.8.1")
implementation ("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1") implementation ("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2")
implementation ("com.mikepenz:multiplatform-markdown-renderer-android:0.30.0") implementation ("com.mikepenz:multiplatform-markdown-renderer-android:0.33.0")
implementation ("com.mikepenz:multiplatform-markdown-renderer-m3:0.30.0") implementation ("com.mikepenz:multiplatform-markdown-renderer-m3:0.33.0")
implementation ("androidx.browser:browser:1.8.0")
debugImplementation ("androidx.compose.ui:ui-tooling") debugImplementation ("androidx.compose.ui:ui-tooling")
coreLibraryDesugaring ("com.android.tools:desugar_jdk_libs:2.1.4") coreLibraryDesugaring ("com.android.tools:desugar_jdk_libs:2.1.5")
} }
+5 -4
View File
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<queries> <queries>
<package android:name="com.robtopx.geometryjump" /> <package android:name="xyz.lncvrt.xps0000002200" />
</queries> </queries>
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
@@ -39,8 +39,9 @@
android:label="@string/app_name" android:label="@string/app_name"
android:hasFragileUserData="true" android:hasFragileUserData="true"
android:requestLegacyExternalStorage="true" android:requestLegacyExternalStorage="true"
android:enableOnBackInvokedCallback="true"
android:theme="@style/Theme.GeodeLauncher" android:theme="@style/Theme.GeodeLauncher"
tools:targetApi="31"> tools:targetApi="35">
<activity <activity
android:name=".AltMainActivity" android:name=".AltMainActivity"
android:exported="false" android:exported="false"
@@ -89,7 +90,7 @@
<provider <provider
android:name=".UserDirectoryProvider" android:name=".UserDirectoryProvider"
android:authorities="com.geode.launcher.user" android:authorities="com.geode.launcherXps.user"
android:exported="true" android:exported="true"
android:grantUriPermissions="true" android:grantUriPermissions="true"
android:permission="android.permission.MANAGE_DOCUMENTS"> android:permission="android.permission.MANAGE_DOCUMENTS">
@@ -99,7 +100,7 @@
</provider> </provider>
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="com.geode.launcher.fileprovider" android:authorities="com.geode.launcherXps.fileprovider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true"> android:grantUriPermissions="true">
<meta-data <meta-data
+3 -2
View File
@@ -13,7 +13,7 @@ option(USE_TULIPHOOK "enables choice of hooking library" OFF)
if (USE_TULIPHOOK) if (USE_TULIPHOOK)
FetchContent_Declare(TulipHook FetchContent_Declare(TulipHook
GIT_REPOSITORY https://github.com/geode-sdk/TulipHook.git GIT_REPOSITORY https://github.com/geode-sdk/TulipHook.git
GIT_TAG 0021301fcea265416fa8eb5372694931c1d410cb GIT_TAG 9aa1f95091ebac18c657d57b755f59d00fe6f1f8
) )
set(TULIP_LINK_SOURCE ON CACHE INTERNAL "") set(TULIP_LINK_SOURCE ON CACHE INTERNAL "")
@@ -24,8 +24,9 @@ if (USE_TULIPHOOK)
target_link_libraries(launcherfix PRIVATE TulipHook TulipHookInclude) target_link_libraries(launcherfix PRIVATE TulipHook TulipHookInclude)
else() else()
FetchContent_Declare(dobby FetchContent_Declare(dobby
# this is the last version that builds on android at all
GIT_REPOSITORY https://github.com/jmpews/Dobby GIT_REPOSITORY https://github.com/jmpews/Dobby
GIT_TAG 6a80a61ea062424d1595613058a174c64454fa57 GIT_TAG 0932d69c320e786672361ab53825ba8f4245e9d3
) )
FetchContent_GetProperties(dobby) FetchContent_GetProperties(dobby)
+1 -1
View File
@@ -109,7 +109,7 @@ bool patch_symbol(std::uint32_t* hash_table, char* str_table, ElfW(Sym)* sym_tab
// we found it! now go rename the symbol // we found it! now go rename the symbol
#ifdef USE_TULIPHOOK #ifdef USE_TULIPHOOK
auto res = tulip::hook::writeMemory(sym_name, new_symbol.data(), new_symbol.size()); auto res = tulip::hook::writeMemory(sym_name, SYMBOL_PATCH_VALUE.data(), SYMBOL_PATCH_VALUE.size());
if (!res) { if (!res) {
__android_log_print(ANDROID_LOG_WARN, "GeodeLauncher-fix", "failed to patch symbol: %s", res.unwrapErr().c_str()); __android_log_print(ANDROID_LOG_WARN, "GeodeLauncher-fix", "failed to patch symbol: %s", res.unwrapErr().c_str());
return false; return false;
@@ -14,6 +14,7 @@ import android.util.Log
import android.view.ViewGroup import android.view.ViewGroup
import android.view.WindowManager import android.view.WindowManager
import android.widget.FrameLayout import android.widget.FrameLayout
import android.window.OnBackInvokedDispatcher
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.compose.ui.platform.ComposeView import androidx.compose.ui.platform.ComposeView
@@ -70,7 +71,7 @@ class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperL
private var mHasWindowFocus = false private var mHasWindowFocus = false
private var displayMode = DisplayMode.DEFAULT private var displayMode = DisplayMode.DEFAULT
private var mChosenDisplayRate: Float? = null private var mForceRefreshRate = false
private var mLimitedRefreshRate: Int? = null private var mLimitedRefreshRate: Int? = null
private var mAspectRatio = 0.0f private var mAspectRatio = 0.0f
private var mScreenZoom = 1.0f private var mScreenZoom = 1.0f
@@ -121,6 +122,13 @@ class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperL
return return
} }
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
onBackInvokedDispatcher.registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_DEFAULT) {
mGLSurfaceView?.sendKeyBack()
}
mGLSurfaceView?.manualBackEvents = true
}
} }
private fun createVersionFile() { private fun createVersionFile() {
@@ -428,7 +436,7 @@ class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperL
val renderer = Cocos2dxRenderer(glSurfaceView) val renderer = Cocos2dxRenderer(glSurfaceView)
glSurfaceView.setCocos2dxRenderer(renderer) glSurfaceView.setCocos2dxRenderer(renderer)
renderer.setFrameRate = mChosenDisplayRate renderer.setFrameRate = mForceRefreshRate
val frameRate = mLimitedRefreshRate val frameRate = mLimitedRefreshRate
if (frameRate != null) { if (frameRate != null) {
@@ -457,20 +465,24 @@ class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperL
val limitedRefreshRate = preferenceUtils.getInt(PreferenceUtils.Key.LIMIT_FRAME_RATE).takeIf { it != 0 } val limitedRefreshRate = preferenceUtils.getInt(PreferenceUtils.Key.LIMIT_FRAME_RATE).takeIf { it != 0 }
mLimitedRefreshRate = limitedRefreshRate mLimitedRefreshRate = limitedRefreshRate
val forceRefreshRate = preferenceUtils.getBoolean(PreferenceUtils.Key.FORCE_HRR) mForceRefreshRate = preferenceUtils.getBoolean(PreferenceUtils.Key.FORCE_HRR)
if (forceRefreshRate && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { if (mForceRefreshRate && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
var chosenDisplay = display.supportedModes?.maxByOrNull { it.refreshRate } val chosenDisplay = display.supportedModes?.maxByOrNull { it.refreshRate }
if (chosenDisplay != null) { if (chosenDisplay != null) {
var chosenRefreshRate = chosenDisplay.refreshRate var chosenRefreshRate = chosenDisplay.refreshRate
println("Forcing a refresh rate of $chosenRefreshRate (display ${chosenDisplay.modeId})") println("setupUIState: Forcing a refresh rate of $chosenRefreshRate (display ${chosenDisplay.modeId})")
window.attributes.preferredRefreshRate = chosenRefreshRate window.attributes.preferredRefreshRate = chosenRefreshRate
mChosenDisplayRate = chosenRefreshRate } else {
println("setupUIState could not find a display to select refresh rate of...")
} }
} }
if (displayMode == DisplayMode.FULLSCREEN && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { if (displayMode == DisplayMode.FULLSCREEN && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
window.attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES window.attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
GeodeUtils.handleSafeArea = true
} else {
GeodeUtils.handleSafeArea = false
} }
hideSystemUi() hideSystemUi()
@@ -58,9 +58,9 @@ import com.geode.launcher.utils.LaunchUtils
import com.geode.launcher.utils.PreferenceUtils import com.geode.launcher.utils.PreferenceUtils
import com.mikepenz.markdown.compose.LocalBulletListHandler import com.mikepenz.markdown.compose.LocalBulletListHandler
import com.mikepenz.markdown.m3.Markdown import com.mikepenz.markdown.m3.Markdown
import com.mikepenz.markdown.m3.markdownColor
import com.mikepenz.markdown.m3.markdownTypography import com.mikepenz.markdown.m3.markdownTypography
import kotlinx.datetime.toJavaInstant import kotlinx.datetime.toJavaInstant
import org.intellij.markdown.flavours.gfm.GFMFlavourDescriptor
import java.io.File import java.io.File
import java.net.ConnectException import java.net.ConnectException
import java.net.UnknownHostException import java.net.UnknownHostException
@@ -191,17 +191,17 @@ fun LauncherUpdateInformation(onDismiss: () -> Unit) {
style = Typography.titleLarge style = Typography.titleLarge
) )
CompositionLocalProvider(LocalBulletListHandler provides { _, _, _ -> "•  " }) { // every new release of the markdown library adds another arg to it
CompositionLocalProvider(LocalBulletListHandler provides { _, _, _, _, _ -> "•  " }) {
Markdown( Markdown(
content = nextRelease.release.body.replace("\r", ""), content = nextRelease.release.body.replace("\r", ""),
colors = markdownColor(
linkText = MaterialTheme.colorScheme.primary
),
typography = markdownTypography( typography = markdownTypography(
link = MaterialTheme.typography.bodyLarge.copy( link = MaterialTheme.typography.bodyLarge.copy(
textDecoration = TextDecoration.Underline textDecoration = TextDecoration.Underline,
) color = MaterialTheme.colorScheme.primary,
), ),
),
flavour = GFMFlavourDescriptor(),
) )
} }
} }
@@ -370,10 +370,13 @@ fun UpdateCard(releaseViewModel: ReleaseViewModel, modifier: Modifier = Modifier
} }
UpdateProgressIndicator( UpdateProgressIndicator(
stringResource( if (outOf != null) stringResource(
R.string.release_fetch_downloading, R.string.release_fetch_downloading,
downloaded, downloaded,
outOf ?: "…" outOf
) else stringResource(
R.string.release_fetch_downloading_indeterminate,
downloaded,
), ),
modifier = modifier, modifier = modifier,
releaseViewModel = releaseViewModel, releaseViewModel = releaseViewModel,
@@ -146,6 +146,11 @@ fun DeveloperSettingsScreen(onBackPressedDispatcher: OnBackPressedDispatcher?) {
} }
OptionsGroup(title = stringResource(R.string.preference_category_updater)) { OptionsGroup(title = stringResource(R.string.preference_category_updater)) {
SettingsCard(
title = stringResource(R.string.preference_use_index_update_api),
preferenceKey = PreferenceUtils.Key.USE_INDEX_API
)
SettingsSelectCard( SettingsSelectCard(
title = stringResource(R.string.preference_release_channel_tag_name), title = stringResource(R.string.preference_release_channel_tag_name),
dialogTitle = stringResource(R.string.preference_release_channel_select), dialogTitle = stringResource(R.string.preference_release_channel_select),
@@ -120,6 +120,17 @@ class ReleaseManager private constructor(
} }
val gameVersion = GamePackageUtils.getGameVersionCode(applicationContext.packageManager) val gameVersion = GamePackageUtils.getGameVersionCode(applicationContext.packageManager)
val preferences = PreferenceUtils.get(applicationContext)
if (preferences.getBoolean(PreferenceUtils.Key.USE_INDEX_API)) {
val targetTag = preferences.getInt(PreferenceUtils.Key.RELEASE_CHANNEL_TAG)
return when (targetTag) {
2 -> releaseRepository.getReleaseByTag("nightly")
1 -> releaseRepository.getLatestIndexRelease(gameVersion, true)
else -> releaseRepository.getLatestIndexRelease(gameVersion, false)
}
} else {
val targetTag = getBestReleaseForGameVersion(gameVersion) ?: return null val targetTag = getBestReleaseForGameVersion(gameVersion) ?: return null
return when (targetTag) { return when (targetTag) {
@@ -128,6 +139,7 @@ class ReleaseManager private constructor(
else -> releaseRepository.getReleaseByTag(targetTag) else -> releaseRepository.getReleaseByTag(targetTag)
} }
} }
}
private suspend fun downloadLauncherUpdate(release: Downloadable) { private suspend fun downloadLauncherUpdate(release: Downloadable) {
val download = release.getDownload() ?: return val download = release.getDownload() ?: return
@@ -28,7 +28,7 @@ class ReleaseRepository(private val httpClient: OkHttpClient) {
} }
suspend fun getLatestLauncherRelease(): DownloadableLauncherRelease? { suspend fun getLatestLauncherRelease(): DownloadableLauncherRelease? {
val releasePath = "$GITHUB_API_BASE/repos/geode-sdk/android-launcher/releases/latest" val releasePath = "$GITHUB_API_BASE/repos/Lncvrt/xps-geode-launcher/releases/latest"
val url = URL(releasePath) val url = URL(releasePath)
@@ -165,10 +165,10 @@ class ReleaseRepository(private val httpClient: OkHttpClient) {
} }
@OptIn(ExperimentalSerializationApi::class) @OptIn(ExperimentalSerializationApi::class)
suspend fun getLatestIndexRelease(gd: String, prerelease: Boolean = false): DownloadableLoaderRelease? { suspend fun getLatestIndexRelease(gd: Long, prerelease: Boolean = false): DownloadableLoaderRelease? {
val url = "$GEODE_API_BASE/loader/versions/latest".toHttpUrlOrNull()!! val url = "$GEODE_API_BASE/loader/versions/latest".toHttpUrlOrNull()!!
.newBuilder() .newBuilder()
.addQueryParameter("gd", gd) .addQueryParameter("gd", gd.toString())
.addQueryParameter("platform", "android") .addQueryParameter("platform", "android")
.addQueryParameter("prerelease", prerelease.toString()) .addQueryParameter("prerelease", prerelease.toString())
.build() .build()
@@ -3,7 +3,7 @@ package com.geode.launcher.utils
import android.annotation.SuppressLint import android.annotation.SuppressLint
object Constants { object Constants {
const val PACKAGE_NAME = "com.robtopx.geometryjump" const val PACKAGE_NAME = "xyz.lncvrt.xps0000002200"
const val COCOS_LIB_NAME = "cocos2dcpp" const val COCOS_LIB_NAME = "cocos2dcpp"
const val FMOD_LIB_NAME = "fmod" const val FMOD_LIB_NAME = "fmod"
@@ -21,7 +21,9 @@ import androidx.activity.result.ActivityResultLauncher
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
import androidx.annotation.Keep import androidx.annotation.Keep
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.browser.customtabs.CustomTabsIntent
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.net.toUri
import androidx.documentfile.provider.DocumentFile import androidx.documentfile.provider.DocumentFile
import com.geode.launcher.BuildConfig import com.geode.launcher.BuildConfig
import com.geode.launcher.R import com.geode.launcher.R
@@ -37,6 +39,8 @@ import kotlin.system.exitProcess
@Suppress("unused", "KotlinJniMissingFunction") @Suppress("unused", "KotlinJniMissingFunction")
object GeodeUtils { object GeodeUtils {
private lateinit var activity: WeakReference<AppCompatActivity> private lateinit var activity: WeakReference<AppCompatActivity>
var handleSafeArea: Boolean = false
private lateinit var openFileResultLauncher: ActivityResultLauncher<GeodeOpenFileActivityResult.OpenFileParams> private lateinit var openFileResultLauncher: ActivityResultLauncher<GeodeOpenFileActivityResult.OpenFileParams>
private lateinit var openDirectoryResultLauncher: ActivityResultLauncher<Uri?> private lateinit var openDirectoryResultLauncher: ActivityResultLauncher<Uri?>
private lateinit var openFilesResultLauncher: ActivityResultLauncher<GeodeOpenFilesActivityResult.OpenFileParams> private lateinit var openFilesResultLauncher: ActivityResultLauncher<GeodeOpenFilesActivityResult.OpenFileParams>
@@ -386,6 +390,9 @@ object GeodeUtils {
return "" return ""
} }
/**
* Returns the current version code of the launcher.
*/
@JvmStatic @JvmStatic
fun getLauncherVersion(): Int { fun getLauncherVersion(): Int {
return BuildConfig.VERSION_CODE return BuildConfig.VERSION_CODE
@@ -457,9 +464,16 @@ object GeodeUtils {
} }
// vibration // vibration
/**
* If vibration is supported on the device.
*/
@JvmStatic @JvmStatic
fun vibrateSupported(): Boolean = getVibrator()?.hasVibrator() == true fun vibrateSupported(): Boolean = getVibrator()?.hasVibrator() == true
/**
* Vibrates for the given amount of time.
*/
@JvmStatic @JvmStatic
fun vibrate(ms: Long) { fun vibrate(ms: Long) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -470,6 +484,10 @@ object GeodeUtils {
} }
} }
/**
* Vibrates with the given pattern.
* @see android.os.VibrationEffect.createWaveform
*/
@JvmStatic @JvmStatic
fun vibratePattern(pattern: LongArray, repeat: Int) { fun vibratePattern(pattern: LongArray, repeat: Int) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -480,6 +498,19 @@ object GeodeUtils {
} }
} }
@JvmStatic
fun getScreenInsets(): IntArray? {
if (!handleSafeArea || Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
return null
}
return activity.get()?.run {
val displayCutout = window.decorView.rootWindowInsets?.displayCutout ?: return null
intArrayOf(displayCutout.safeInsetLeft, displayCutout.safeInsetBottom, displayCutout.safeInsetRight, displayCutout.safeInsetTop)
}
}
const val ARGUMENT_SAFE_MODE = "--geode:safe-mode" const val ARGUMENT_SAFE_MODE = "--geode:safe-mode"
private var additionalLaunchArguments = arrayListOf<String>() private var additionalLaunchArguments = arrayListOf<String>()
@@ -518,6 +549,10 @@ object GeodeUtils {
capabilityListener = WeakReference(listener) capabilityListener = WeakReference(listener)
} }
/**
* Reports that the game client supports a feature.
* These features typically require callbacks into the game, so ensure that the required methods are registered first.
*/
@JvmStatic @JvmStatic
fun reportPlatformCapability(capability: String?): Boolean { fun reportPlatformCapability(capability: String?): Boolean {
if (capability.isNullOrEmpty()) { if (capability.isNullOrEmpty()) {
@@ -527,11 +562,24 @@ object GeodeUtils {
return capabilityListener.get()?.onCapabilityAdded(capability) == true return capabilityListener.get()?.onCapabilityAdded(capability) == true
} }
@JvmStatic
fun openWebview(url: String) {
val activity = activity.get() ?: return
CustomTabsIntent.Builder()
.setShowTitle(true)
.build()
.launchUrl(activity, url.toUri())
}
external fun nativeKeyUp(keyCode: Int, modifiers: Int) external fun nativeKeyUp(keyCode: Int, modifiers: Int)
external fun nativeKeyDown(keyCode: Int, modifiers: Int, isRepeating: Boolean) external fun nativeKeyDown(keyCode: Int, modifiers: Int, isRepeating: Boolean)
external fun nativeActionScroll(scrollX: Float, scrollY: Float) external fun nativeActionScroll(scrollX: Float, scrollY: Float)
external fun resizeSurface(width: Int, height: Int) external fun resizeSurface(width: Int, height: Int)
// represents the timestamp of the next input callback, in nanoseconds (most events don't send it, but it's there) /**
* Gives the timestamp of the next input callback, in nanoseconds.
* Enable this by sending the "timestamp_inputs" platform capability.
* @see reportPlatformCapability
*/
external fun setNextInputTimestamp(timestamp: Long) external fun setNextInputTimestamp(timestamp: Long)
} }
@@ -147,13 +147,15 @@ class PreferenceUtils(private val sharedPreferences: SharedPreferences) {
CUSTOM_ASPECT_RATIO, CUSTOM_ASPECT_RATIO,
SCREEN_ZOOM, SCREEN_ZOOM,
SCREEN_ZOOM_FIT, SCREEN_ZOOM_FIT,
LIMIT_FRAME_RATE LIMIT_FRAME_RATE,
USE_INDEX_API,
} }
private fun defaultValueForBooleanKey(key: Key): Boolean { private fun defaultValueForBooleanKey(key: Key): Boolean {
return when (key) { return when (key) {
Key.UPDATE_AUTOMATICALLY, Key.FORCE_HRR -> true Key.UPDATE_AUTOMATICALLY, Key.FORCE_HRR -> true
Key.DEVELOPER_MODE -> BuildConfig.DEBUG Key.DEVELOPER_MODE -> BuildConfig.DEBUG
Key.USE_INDEX_API -> true
else -> false else -> false
} }
} }
@@ -195,6 +197,7 @@ class PreferenceUtils(private val sharedPreferences: SharedPreferences) {
Key.SCREEN_ZOOM -> "PreferenceScreenZoom" Key.SCREEN_ZOOM -> "PreferenceScreenZoom"
Key.SCREEN_ZOOM_FIT -> "PreferenceScreenZoomFit" Key.SCREEN_ZOOM_FIT -> "PreferenceScreenZoomFit"
Key.LIMIT_FRAME_RATE -> "PreferenceLimitFrameRate" Key.LIMIT_FRAME_RATE -> "PreferenceLimitFrameRate"
Key.USE_INDEX_API -> "PreferenceUseIndexApi"
} }
} }
@@ -1,5 +1,6 @@
package org.cocos2dx.lib package org.cocos2dx.lib
import android.app.Activity
import android.content.Context import android.content.Context
import android.opengl.GLSurfaceView import android.opengl.GLSurfaceView
import android.os.Build import android.os.Build
@@ -54,6 +55,7 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
} }
var sendTimestampEvents = false var sendTimestampEvents = false
var manualBackEvents = false
var cocos2dxEditText: Cocos2dxEditText? = null var cocos2dxEditText: Cocos2dxEditText? = null
set(value) { set(value) {
@@ -119,8 +121,21 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
} }
@RequiresApi(Build.VERSION_CODES.R) @RequiresApi(Build.VERSION_CODES.R)
fun updateRefreshRate(refreshRate: Float) { fun updateRefreshRate() {
holder.surface.setFrameRate(refreshRate, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT) val chosenDisplay = display.supportedModes?.maxByOrNull { it.refreshRate }
if (chosenDisplay == null) {
println("updateRefreshRate failed to find a display to maximize refresh rate...")
return
}
val chosenRefreshRate = chosenDisplay.refreshRate
println("updateRefreshRate: selecting refresh rate of ${chosenDisplay.refreshRate} (display ${chosenDisplay.modeId})")
holder.surface.setFrameRate(chosenRefreshRate, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT)
if (isAttachedToWindow) {
(context as Activity).window.attributes.preferredRefreshRate = chosenRefreshRate
}
} }
override fun onPause() { override fun onPause() {
@@ -245,6 +260,26 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
} }
} }
fun sendKeyBack() {
if (BaseRobTopActivity.blockBackButton) {
return
}
if (useKeyboardEvents) {
queueEvent {
cocos2dxRenderer.handleKeyDown(KeyEvent.KEYCODE_BACK)
}
} else {
val currentTime = System.nanoTime()
queueEvent {
if (sendTimestampEvents)
GeodeUtils.setNextInputTimestamp(currentTime)
GeodeUtils.nativeKeyDown(KeyEvent.KEYCODE_BACK, 0, false)
}
}
}
override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean { override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
if (!useKeyboardEvents) { if (!useKeyboardEvents) {
return legacyKeyDown(keyCode, event) return legacyKeyDown(keyCode, event)
@@ -64,7 +64,7 @@ class Cocos2dxRenderer(private var handler: Cocos2dxGLSurfaceView) : GLSurfaceVi
private var screenWidth = 0 private var screenWidth = 0
private var screenHeight = 0 private var screenHeight = 0
var sendResizeEvents = false var sendResizeEvents = false
var setFrameRate: Float? = null var setFrameRate = false
private var mAnimationInterval: Long? = null private var mAnimationInterval: Long? = null
fun limitFrameRate(rate: Int) { fun limitFrameRate(rate: Int) {
@@ -82,9 +82,8 @@ class Cocos2dxRenderer(private var handler: Cocos2dxGLSurfaceView) : GLSurfaceVi
} }
override fun onSurfaceChanged(gl10: GL10?, width: Int, height: Int) { override fun onSurfaceChanged(gl10: GL10?, width: Int, height: Int) {
val chosenRefreshRate = setFrameRate if (setFrameRate && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
if (chosenRefreshRate != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { handler.updateRefreshRate()
handler.updateRefreshRate(chosenRefreshRate)
} }
println("renderer surfaceChanged: ${width}x${height}@${handler.display.refreshRate}fps") println("renderer surfaceChanged: ${width}x${height}@${handler.display.refreshRate}fps")
+17 -15
View File
@@ -1,9 +1,9 @@
<resources> <resources>
<string name="app_name" translatable="false">Geode</string> <string name="app_name" translatable="false">XPS: Geode Edition</string>
<string name="no_activity_found">No activity found for this action.</string> <string name="no_activity_found">No activity found for this action.</string>
<!-- MainActivity strings --> <!-- MainActivity strings -->
<string name="game_not_found">Geometry Dash was not found.\nThe full version of the game is required.</string> <string name="game_not_found">XPS 2.2 isn\'t installed</string>
<string name="launcher_launch">Launch</string> <string name="launcher_launch">Launch</string>
<string name="launcher_settings">Settings</string> <string name="launcher_settings">Settings</string>
<string name="launcher_download">Download</string> <string name="launcher_download">Download</string>
@@ -18,7 +18,7 @@
<string name="launcher_settings_icon_alt">settings icon</string> <string name="launcher_settings_icon_alt">settings icon</string>
<string name="launcher_retry_icon_alt">retry icon</string> <string name="launcher_retry_icon_alt">retry icon</string>
<string name="geode_download_title">Geode is not installed.</string> <string name="geode_download_title">Geode is not installed.</string>
<string name="game_outdated">A Geometry Dash update is required.\nYou currently have update %1$s.</string> <string name="game_outdated">A XPS update is required.\nYou currently have update %1$s.</string>
<string name="geode_download_description">Geode is downloading. Please wait.</string> <string name="geode_download_description">Geode is downloading. Please wait.</string>
<plurals name="automatically_load_countdown"> <plurals name="automatically_load_countdown">
<item quantity="one">Automatically launching game in %1$d second.</item> <item quantity="one">Automatically launching game in %1$d second.</item>
@@ -28,14 +28,14 @@
<string name="launcher_error_icon_alt">error</string> <string name="launcher_error_icon_alt">error</string>
<string name="launcher_unsupported_version_title">Unsupported version</string> <string name="launcher_unsupported_version_title">Unsupported version</string>
<string name="launcher_outdated_version_description"> <string name="launcher_outdated_version_description">
The current version of Geometry Dash is not compatible with the version supported by the launcher (%2$s). You must update Geometry Dash to fix this.\nLaunch will continue, but crashes may occur! The current version of XPS is not compatible with the version supported by the launcher (%2$s). You must update XPS to fix this.\nLaunch will continue, but crashes may occur!
</string> </string>
<string name="launcher_unsupported_version_description"> <string name="launcher_unsupported_version_description">
The current version of Geometry Dash is not compatible with the version supported by the launcher. A launcher update is required to fix this.\nLaunch will continue, but crashes may occur! The current version of XPS is not compatible with the version supported by the launcher. A launcher update is required to fix this.\nLaunch will continue, but crashes may occur!
</string> </string>
<string name="launcher_game_update_required_short">A Geometry Dash update is required.</string> <string name="launcher_game_update_required_short">A XPS update is required.</string>
<string name="launcher_game_update_required">The currently installed version of Geometry Dash is no longer supported. Please update Geometry Dash to continue receiving Geode updates.</string> <string name="launcher_game_update_required">The currently installed version of XPS is no longer supported. Please update XPS to continue receiving Geode updates.</string>
<string name="launcher_update_available">A new launcher update is available!</string> <string name="launcher_update_available">A new launcher update is available!</string>
<string name="launcher_update_dismiss">Dismiss</string> <string name="launcher_update_dismiss">Dismiss</string>
@@ -60,18 +60,18 @@
<string name="launcher_notification_settings">Launcher Settings</string> <string name="launcher_notification_settings">Launcher Settings</string>
<string name="launcher_notification_update_failed">Failed to update Geode.</string> <string name="launcher_notification_update_failed">Failed to update Geode.</string>
<string name="launcher_notification_update_success">Geode updated!</string> <string name="launcher_notification_update_success">Geode updated!</string>
<string name="launcher_notification_compatibility">Unsupported Geometry Dash version.</string> <string name="launcher_notification_compatibility">Unsupported XPS version.</string>
<string name="launcher_notification_compatibility_description">An update is required to receive Geode updates.</string> <string name="launcher_notification_compatibility_description">An update is required to receive Geode updates.</string>
<string name="launcher_notification_update_cta">Tap for more information.</string> <string name="launcher_notification_update_cta">Tap for more information.</string>
<string name="launcher_starting_game">Starting Geometry Dash…</string> <string name="launcher_starting_game">Starting XPS…</string>
<string name="launcher_downloading_update">Downloading update…</string> <string name="launcher_downloading_update">Downloading update…</string>
<string name="launcher_downloading_update_details">(%1$s/%2$s)</string> <string name="launcher_downloading_update_details">(%1$s/%2$s)</string>
<string name="launcher_cancelled_manual">Launch paused.</string> <string name="launcher_cancelled_manual">Launch paused.</string>
<string name="launcher_cancelled_navigated_away">Launch paused.</string> <string name="launcher_cancelled_navigated_away">Launch paused.</string>
<string name="launcher_cancelled_crash">Launch paused due to a crash.</string> <string name="launcher_cancelled_crash">Launch paused due to a crash.</string>
<string name="launcher_cancelled_error">Could not start Geode.</string> <string name="launcher_cancelled_error">Could not start Geode.</string>
<string name="launcher_cancelled_outdated">A Geometry Dash update is required.</string> <string name="launcher_cancelled_outdated">A XPS update is required.</string>
<string name="launcher_cancelled_restart">Restart</string> <string name="launcher_cancelled_restart">Restart</string>
<string name="launcher_cancelled_resume">Resume</string> <string name="launcher_cancelled_resume">Resume</string>
<string name="launcher_cancelled_retry">Retry</string> <string name="launcher_cancelled_retry">Retry</string>
@@ -84,6 +84,7 @@
<string name="release_fetch_in_progress">Checking for new releases…</string> <string name="release_fetch_in_progress">Checking for new releases…</string>
<string name="release_fetch_success">Geode updated!</string> <string name="release_fetch_success">Geode updated!</string>
<string name="release_fetch_downloading">Downloading update… (%1$s/%2$s)</string> <string name="release_fetch_downloading">Downloading update… (%1$s/%2$s)</string>
<string name="release_fetch_downloading_indeterminate">Downloading update… (%1$s)</string>
<string name="release_fetch_cancelling">Cancelling update…</string> <string name="release_fetch_cancelling">Cancelling update…</string>
<string name="release_fetch_no_internet">No internet found.</string> <string name="release_fetch_no_internet">No internet found.</string>
<string name="release_fetch_cancelled">Update cancelled.</string> <string name="release_fetch_cancelled">Update cancelled.</string>
@@ -95,15 +96,15 @@
<!-- GeometryDashActivity strings --> <!-- GeometryDashActivity strings -->
<string name="load_failed_link_error">Failed to link libraries</string> <string name="load_failed_link_error">Failed to link libraries</string>
<string name="load_failed_link_error_description">Game libraries could not be found. Try to:</string> <string name="load_failed_link_error_description">Game libraries could not be found. Try to:</string>
<string name="load_failed_abi_error">The architecture of the launcher and Geometry Dash do not match. Try to:</string> <string name="load_failed_abi_error">The architecture of the launcher and XPS do not match. Try to:</string>
<string name="load_failed_generic_error">Failed to load Geode</string> <string name="load_failed_generic_error">Failed to load Geode</string>
<string name="load_failed_generic_error_description">Uncaught error during game load. Try to:</string> <string name="load_failed_generic_error_description">Uncaught error during game load. Try to:</string>
<string name="load_failed_crashed">Geode crashed</string> <string name="load_failed_crashed">Geode crashed</string>
<string name="load_failed_crashed_description">A crash was reported during the last session. Try to:</string> <string name="load_failed_crashed_description">A crash was reported during the last session. Try to:</string>
<string name="load_failed_recommendation_reinstall">Reinstall Geometry Dash.</string> <string name="load_failed_recommendation_reinstall">Reinstall XPS.</string>
<string name="load_failed_recommendation_switch_32bit_abi">Install the 32-bit version of the launcher.</string> <string name="load_failed_recommendation_switch_32bit_abi">Install the 32-bit version of the launcher.</string>
<string name="load_failed_recommendation_switch_64bit_abi">Install the non 32-bit version of the launcher.</string> <string name="load_failed_recommendation_switch_64bit_abi">Install the non 32-bit version of the launcher.</string>
<string name="load_failed_recommendation_update">Verify that the latest versions of the launcher and Geometry Dash are installed.</string> <string name="load_failed_recommendation_update">Verify that the latest versions of the launcher and XPS are installed.</string>
<string name="load_failed_recommendation_report">Report this issue to the developers.</string> <string name="load_failed_recommendation_report">Report this issue to the developers.</string>
<string name="load_failed_recommendation_safe_mode">Hold the Launch button to launch in safe mode.</string> <string name="load_failed_recommendation_safe_mode">Hold the Launch button to launch in safe mode.</string>
<string name="load_failed_recommendation_dev_stl">Devs: If this is a locally built Geode version, please use the c++_shared ANDROID_STL!</string> <string name="load_failed_recommendation_dev_stl">Devs: If this is a locally built Geode version, please use the c++_shared ANDROID_STL!</string>
@@ -192,9 +193,9 @@
<string name="preference_loader_version_description">%1$s</string> <string name="preference_loader_version_description">%1$s</string>
<string name="preference_loader_version">Geode %1$s</string> <string name="preference_loader_version">Geode %1$s</string>
<string name="preference_game_version_name">Geometry Dash</string> <string name="preference_game_version_name">XPS</string>
<string name="preference_game_version_description">%1$s (%2$s)</string> <string name="preference_game_version_description">%1$s (%2$s)</string>
<string name="preference_game_version">Geometry Dash %1$s (%2$s)</string> <string name="preference_game_version">XPS %1$s (%2$s)</string>
<string name="preference_game_source_google">Google</string> <string name="preference_game_source_google">Google</string>
<string name="preference_game_source_amazon">Amazon</string> <string name="preference_game_source_amazon">Amazon</string>
<string name="preference_game_source_unknown">Unknown</string> <string name="preference_game_source_unknown">Unknown</string>
@@ -254,4 +255,5 @@
<string name="preference_override_exceptions_name">Custom exceptions fix symbols</string> <string name="preference_override_exceptions_name">Custom exceptions fix symbols</string>
<string name="preference_override_exceptions_description">Uses exception_symbols.txt to patch</string> <string name="preference_override_exceptions_description">Uses exception_symbols.txt to patch</string>
<string name="preference_use_index_update_api">Use index release API</string>
</resources> </resources>
+6 -6
View File
@@ -1,14 +1,14 @@
buildscript { buildscript {
val composeBOM by extra("2025.01.00") val composeBOM by extra("2025.04.01")
} }
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id("com.android.application") version "8.8.0" apply false id("com.android.application") version "8.9.2" apply false
id("com.android.library") version "8.8.0" apply false id("com.android.library") version "8.9.2" apply false
id("org.jetbrains.kotlin.android") version "2.1.0" apply false id("org.jetbrains.kotlin.android") version "2.1.20" apply false
id("org.jetbrains.kotlin.plugin.serialization") version "2.1.0" apply false id("org.jetbrains.kotlin.plugin.serialization") version "2.1.20" apply false
id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false id("org.jetbrains.kotlin.plugin.compose") version "2.1.20" apply false
} }
tasks.register<Delete>("clean") { tasks.register<Delete>("clean") {
+2 -1
View File
@@ -1,6 +1,7 @@
#Thu Apr 24 10:54:01 MST 2025
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME