add multiline input util

app/build.gradle.kts

@@ -14,14 +14,14 @@ plugins {
 }
 
 android {
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
-        applicationId = "com.geode.launcherXps"
-        minSdk = 26
+        applicationId = "com.geode.launcher"
+        minSdk = 23
         targetSdk = 35
-        versionCode = 1
-        versionName = "1.0.0"
+        versionCode = 22
+        versionName = "1.6.1"
 
         vectorDrawables {
             useSupportLibrary = true
@@ -30,7 +30,7 @@ android {
         @Suppress("UnstableApiUsage")
         externalNativeBuild {
             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 {
         cmake {
+            version = "3.25.0+"
             path = file("src/main/cpp/CMakeLists.txt")
         }
     }
     namespace = "com.geode.launcher"
-    ndkVersion = "27.2.12479018"
+    ndkVersion = "28.1.13356709"
 }
 
 dependencies {
     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.material3:material3")
     implementation ("androidx.compose.ui:ui-tooling-preview")
     implementation ("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7")
     implementation ("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7")
-    implementation ("androidx.activity:activity-compose:1.10.0")
-    implementation ("androidx.activity:activity-ktx:1.10.0")
+    implementation ("androidx.activity:activity-compose:1.10.1")
+    implementation ("androidx.activity:activity-ktx:1.10.1")
     implementation ("androidx.appcompat:appcompat:1.7.0")
     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 ("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")
-    implementation ("org.jetbrains.kotlinx:kotlinx-serialization-json-okio:1.8.0")
-    implementation ("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
-    implementation ("com.mikepenz:multiplatform-markdown-renderer-android:0.30.0")
-    implementation ("com.mikepenz:multiplatform-markdown-renderer-m3:0.30.0")
+    implementation ("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1")
+    implementation ("org.jetbrains.kotlinx:kotlinx-serialization-json-okio:1.8.1")
+    implementation ("org.jetbrains.kotlinx:kotlinx-datetime:0.6.2")
+    implementation ("com.mikepenz:multiplatform-markdown-renderer-android:0.33.0")
+    implementation ("com.mikepenz:multiplatform-markdown-renderer-m3:0.33.0")
+    implementation ("androidx.browser:browser:1.8.0")
     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")
 }

app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <queries>
-        <package android:name="xyz.lncvrt.xps0000002200" />
+        <package android:name="com.robtopx.geometryjump" />
     </queries>
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -39,8 +39,9 @@
         android:label="@string/app_name"
         android:hasFragileUserData="true"
         android:requestLegacyExternalStorage="true"
+        android:enableOnBackInvokedCallback="true"
         android:theme="@style/Theme.GeodeLauncher"
-        tools:targetApi="31">
+        tools:targetApi="35">
         <activity
             android:name=".AltMainActivity"
             android:exported="false"
@@ -89,7 +90,7 @@
 
         <provider
             android:name=".UserDirectoryProvider"
-            android:authorities="com.geode.launcherXps.user"
+            android:authorities="com.geode.launcher.user"
             android:exported="true"
             android:grantUriPermissions="true"
             android:permission="android.permission.MANAGE_DOCUMENTS">
@@ -99,7 +100,7 @@
         </provider>
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.geode.launcherXps.fileprovider"
+            android:authorities="com.geode.launcher.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

app/src/main/cpp/CMakeLists.txt

@@ -13,7 +13,7 @@ option(USE_TULIPHOOK "enables choice of hooking library" OFF)
 if (USE_TULIPHOOK)
     FetchContent_Declare(TulipHook
         GIT_REPOSITORY https://github.com/geode-sdk/TulipHook.git
-        GIT_TAG 0021301fcea265416fa8eb5372694931c1d410cb
+        GIT_TAG 9aa1f95091ebac18c657d57b755f59d00fe6f1f8
     )
 
     set(TULIP_LINK_SOURCE ON CACHE INTERNAL "")
@@ -24,8 +24,9 @@ if (USE_TULIPHOOK)
     target_link_libraries(launcherfix PRIVATE TulipHook TulipHookInclude)
 else()
     FetchContent_Declare(dobby
+        # this is the last version that builds on android at all
         GIT_REPOSITORY https://github.com/jmpews/Dobby
-        GIT_TAG 6a80a61ea062424d1595613058a174c64454fa57
+        GIT_TAG 0932d69c320e786672361ab53825ba8f4245e9d3
     )
 
     FetchContent_GetProperties(dobby)

app/src/main/cpp/launcher-fix.cpp

@@ -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
 
 #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) {
                         __android_log_print(ANDROID_LOG_WARN, "GeodeLauncher-fix", "failed to patch symbol: %s", res.unwrapErr().c_str());
                         return false;

app/src/main/java/com/geode/launcher/GeometryDashActivity.kt

@@ -14,8 +14,10 @@ import android.util.Log
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.FrameLayout
+import androidx.activity.OnBackPressedCallback
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.AppCompatEditText
 import androidx.compose.ui.platform.ComposeView
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
@@ -31,7 +33,6 @@ import com.geode.launcher.utils.GamePackageUtils
 import com.geode.launcher.utils.GeodeUtils
 import com.geode.launcher.utils.LaunchUtils
 import com.geode.launcher.utils.PreferenceUtils
-import org.cocos2dx.lib.Cocos2dxEditText
 import org.cocos2dx.lib.Cocos2dxGLSurfaceView
 import org.cocos2dx.lib.Cocos2dxHelper
 import org.cocos2dx.lib.Cocos2dxRenderer
@@ -121,6 +122,13 @@ class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperL
 
             return
         }
+
+        onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                mGLSurfaceView?.sendKeyBack()
+            }
+        })
+        mGLSurfaceView?.manualBackEvents = true
     }
 
     private fun createVersionFile() {
@@ -398,7 +406,7 @@ class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperL
             ViewGroup.LayoutParams.MATCH_PARENT,
             ViewGroup.LayoutParams.WRAP_CONTENT
         )
-        val editText = Cocos2dxEditText(this)
+        val editText = AppCompatEditText(this)
         editText.layoutParams = editTextLayoutParams
         frameLayout.addView(editText)
 
@@ -435,7 +443,7 @@ class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperL
             renderer.limitFrameRate(frameRate)
         }
 
-        editText.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
+        editText.inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS
         glSurfaceView.cocos2dxEditText = editText
 
         return frameLayout
@@ -472,6 +480,9 @@ class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperL
 
         if (displayMode == DisplayMode.FULLSCREEN && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             window.attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
+            GeodeUtils.handleSafeArea = true
+        } else {
+            GeodeUtils.handleSafeArea = false
         }
 
         hideSystemUi()
@@ -577,6 +588,10 @@ class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperL
                 mGLSurfaceView?.sendTimestampEvents = true
                 true
             }
+            GeodeUtils.CAPABILITY_INTERNAL_CALLBACKS -> {
+                mGLSurfaceView?.sendInternalTimestampEvents = true
+                true
+            }
             else -> false
         }
     }

app/src/main/java/com/geode/launcher/main/UpdateComponents.kt

@@ -58,9 +58,9 @@ import com.geode.launcher.utils.LaunchUtils
 import com.geode.launcher.utils.PreferenceUtils
 import com.mikepenz.markdown.compose.LocalBulletListHandler
 import com.mikepenz.markdown.m3.Markdown
-import com.mikepenz.markdown.m3.markdownColor
 import com.mikepenz.markdown.m3.markdownTypography
 import kotlinx.datetime.toJavaInstant
+import org.intellij.markdown.flavours.gfm.GFMFlavourDescriptor
 import java.io.File
 import java.net.ConnectException
 import java.net.UnknownHostException
@@ -176,7 +176,7 @@ fun LauncherUpdateInformation(onDismiss: () -> Unit) {
 
                         IconButton(onClick = { uriHandler.openUri(nextRelease.release.htmlUrl) }) {
                             Icon(
-                                painterResource(R.drawable.xps_icon),
+                                painterResource(R.drawable.icon_link),
                                 stringResource(R.string.launcher_update_external_link)
                             )
                         }
@@ -191,17 +191,17 @@ fun LauncherUpdateInformation(onDismiss: () -> Unit) {
                             style = Typography.titleLarge
                         )
 
-                        CompositionLocalProvider(LocalBulletListHandler provides { _, _, _ -> "•  " }) {
+                        // every new release of the markdown library adds another arg to it
+                        CompositionLocalProvider(LocalBulletListHandler provides { _, _, _, _, _ -> "•  " }) {
                             Markdown(
                                 content = nextRelease.release.body.replace("\r", ""),
-                                colors = markdownColor(
-                                    linkText = MaterialTheme.colorScheme.primary
-                                ),
                                 typography = markdownTypography(
                                     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(
-                stringResource(
-                    R.string.release_fetch_downloading,
+                if (outOf != null) stringResource(
+                        R.string.release_fetch_downloading,
+                        downloaded,
+                        outOf
+                ) else stringResource(
+                    R.string.release_fetch_downloading_indeterminate,
                     downloaded,
-                    outOf ?: "…"
                 ),
                 modifier = modifier,
                 releaseViewModel = releaseViewModel,

app/src/main/java/com/geode/launcher/preferences/DeveloperSettingsActivity.kt

@@ -146,6 +146,11 @@ fun DeveloperSettingsScreen(onBackPressedDispatcher: OnBackPressedDispatcher?) {
                 }
 
                 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(
                         title = stringResource(R.string.preference_release_channel_tag_name),
                         dialogTitle = stringResource(R.string.preference_release_channel_select),

app/src/main/java/com/geode/launcher/updater/ReleaseManager.kt

@@ -120,12 +120,24 @@ class ReleaseManager private constructor(
         }
 
         val gameVersion = GamePackageUtils.getGameVersionCode(applicationContext.packageManager)
-        val targetTag = getBestReleaseForGameVersion(gameVersion) ?: return null
+        val preferences = PreferenceUtils.get(applicationContext)
 
-        return when (targetTag) {
-            TAG_LATEST -> releaseRepository.getLatestGeodeRelease()
-            TAG_BETA -> releaseRepository.getLatestGeodePreRelease()
-            else -> releaseRepository.getReleaseByTag(targetTag)
+        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
+
+            return when (targetTag) {
+                TAG_LATEST -> releaseRepository.getLatestGeodeRelease()
+                TAG_BETA -> releaseRepository.getLatestGeodePreRelease()
+                else -> releaseRepository.getReleaseByTag(targetTag)
+            }
         }
     }
 
@@ -169,6 +181,10 @@ class ReleaseManager private constructor(
         // set an initial download size
         _uiState.value = ReleaseManagerState.InDownload(0, releaseAsset.size)
 
+        val outputFile = getTempFile()
+        // clone the file instance as renameTo may move the original file
+        val tempFilePath = outputFile.path
+
         try {
             val fileStream = DownloadUtils.downloadStream(
                 httpClient,
@@ -177,23 +193,30 @@ class ReleaseManager private constructor(
                 _uiState.value = ReleaseManagerState.InDownload(progress, outOf)
             }
 
+            outputFile.parentFile?.mkdirs()
+
             val geodeFile = getGeodeOutputPath()
 
+            DownloadUtils.extractFileFromZipStream(
+                fileStream,
+                outputFile.outputStream(),
+                geodeFile.name
+            )
+
             // work around a permission issue from adb push
             if (geodeFile.exists()) {
                 geodeFile.delete()
             }
 
-            geodeFile.parentFile?.mkdirs()
-
-            DownloadUtils.extractFileFromZipStream(
-                fileStream,
-                geodeFile.outputStream(),
-                geodeFile.name
-            )
+            outputFile.renameTo(geodeFile)
         } catch (e: Exception) {
             sendError(e)
             return
+        } finally {
+            val tempFileClone = File(tempFilePath)
+            try {
+                if (tempFileClone.exists()) tempFileClone.delete()
+            } catch (_: Exception) { }
         }
 
         downloadLauncherUpdateIfNecessary()
@@ -313,6 +336,15 @@ class ReleaseManager private constructor(
         return File(geodeDirectory, geodeName)
     }
 
+    private fun getTempFile(): File {
+        val geodeName = LaunchUtils.geodeFilename
+        val geodeDirectory = LaunchUtils.getBaseDirectory(applicationContext)
+
+        val tempFile = File.createTempFile(geodeName, null, geodeDirectory)
+
+        return tempFile
+    }
+
     /**
      * Cancels the current update job.
      */

app/src/main/java/com/geode/launcher/updater/ReleaseRepository.kt

@@ -28,7 +28,7 @@ class ReleaseRepository(private val httpClient: OkHttpClient) {
     }
 
     suspend fun getLatestLauncherRelease(): DownloadableLauncherRelease? {
-        val releasePath = "$GITHUB_API_BASE/repos/Lncvrt/xps-geode-launcher/releases/latest"
+        val releasePath = "$GITHUB_API_BASE/repos/geode-sdk/android-launcher/releases/latest"
 
         val url = URL(releasePath)
 
@@ -165,10 +165,10 @@ class ReleaseRepository(private val httpClient: OkHttpClient) {
     }
 
     @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()!!
             .newBuilder()
-            .addQueryParameter("gd", gd)
+            .addQueryParameter("gd", gd.toString())
             .addQueryParameter("platform", "android")
             .addQueryParameter("prerelease", prerelease.toString())
             .build()

app/src/main/java/com/geode/launcher/utils/Constants.kt

@@ -3,7 +3,7 @@ package com.geode.launcher.utils
 import android.annotation.SuppressLint
 
 object Constants {
-    const val PACKAGE_NAME = "xyz.lncvrt.xps0000002200"
+    const val PACKAGE_NAME = "com.robtopx.geometryjump"
 
     const val COCOS_LIB_NAME = "cocos2dcpp"
     const val FMOD_LIB_NAME = "fmod"

app/src/main/java/com/geode/launcher/utils/GeodeUtils.kt

@@ -21,7 +21,9 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.Keep
 import androidx.appcompat.app.AppCompatActivity
+import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import androidx.documentfile.provider.DocumentFile
 import com.geode.launcher.BuildConfig
 import com.geode.launcher.R
@@ -29,6 +31,7 @@ import com.geode.launcher.UserDirectoryProvider
 import com.geode.launcher.activityresult.GeodeOpenFileActivityResult
 import com.geode.launcher.activityresult.GeodeOpenFilesActivityResult
 import com.geode.launcher.activityresult.GeodeSaveFileActivityResult
+import org.cocos2dx.lib.Cocos2dxGLSurfaceView
 import java.io.File
 import java.lang.ref.WeakReference
 import kotlin.system.exitProcess
@@ -37,6 +40,8 @@ import kotlin.system.exitProcess
 @Suppress("unused", "KotlinJniMissingFunction")
 object GeodeUtils {
     private lateinit var activity: WeakReference<AppCompatActivity>
+    var handleSafeArea: Boolean = false
+
     private lateinit var openFileResultLauncher: ActivityResultLauncher<GeodeOpenFileActivityResult.OpenFileParams>
     private lateinit var openDirectoryResultLauncher: ActivityResultLauncher<Uri?>
     private lateinit var openFilesResultLauncher: ActivityResultLauncher<GeodeOpenFilesActivityResult.OpenFileParams>
@@ -386,6 +391,9 @@ object GeodeUtils {
         return ""
     }
 
+    /**
+     * Returns the current version code of the launcher.
+     */
     @JvmStatic
     fun getLauncherVersion(): Int {
         return BuildConfig.VERSION_CODE
@@ -457,9 +465,16 @@ object GeodeUtils {
     }
 
     // vibration
+
+    /**
+     * If vibration is supported on the device.
+     */
     @JvmStatic
     fun vibrateSupported(): Boolean = getVibrator()?.hasVibrator() == true
 
+    /**
+     * Vibrates for the given amount of time.
+     */
     @JvmStatic
     fun vibrate(ms: Long) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -470,6 +485,10 @@ object GeodeUtils {
         }
     }
 
+    /**
+     * Vibrates with the given pattern.
+     * @see android.os.VibrationEffect.createWaveform
+     */
     @JvmStatic
     fun vibratePattern(pattern: LongArray, repeat: Int) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -480,6 +499,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"
 
     private var additionalLaunchArguments = arrayListOf<String>()
@@ -511,6 +543,7 @@ object GeodeUtils {
 
     const val CAPABILITY_EXTENDED_INPUT = "extended_input"
     const val CAPABILITY_TIMESTAMP_INPUT = "timestamp_inputs"
+    const val CAPABILITY_INTERNAL_CALLBACKS = "internal_callbacks_v1"
 
     private var capabilityListener: WeakReference<CapabilityListener?> = WeakReference(null)
 
@@ -518,6 +551,10 @@ object GeodeUtils {
         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
     fun reportPlatformCapability(capability: String?): Boolean {
         if (capability.isNullOrEmpty()) {
@@ -527,11 +564,30 @@ object GeodeUtils {
         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())
+    }
+
+    @JvmStatic
+    fun openMultilineIMEKeyboard() {
+        Cocos2dxGLSurfaceView.openMultilineIMEKeyboard()
+    }
+
     external fun nativeKeyUp(keyCode: Int, modifiers: Int)
     external fun nativeKeyDown(keyCode: Int, modifiers: Int, isRepeating: Boolean)
     external fun nativeActionScroll(scrollX: Float, scrollY: Float)
     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 setNextInputTimestampInternal(timestamp: Long)
 }

app/src/main/java/com/geode/launcher/utils/PreferenceUtils.kt

@@ -147,13 +147,15 @@ class PreferenceUtils(private val sharedPreferences: SharedPreferences) {
         CUSTOM_ASPECT_RATIO,
         SCREEN_ZOOM,
         SCREEN_ZOOM_FIT,
-        LIMIT_FRAME_RATE
+        LIMIT_FRAME_RATE,
+        USE_INDEX_API,
     }
 
     private fun defaultValueForBooleanKey(key: Key): Boolean {
         return when (key) {
             Key.UPDATE_AUTOMATICALLY, Key.FORCE_HRR -> true
             Key.DEVELOPER_MODE -> BuildConfig.DEBUG
+            Key.USE_INDEX_API -> true
             else -> false
         }
     }
@@ -195,6 +197,7 @@ class PreferenceUtils(private val sharedPreferences: SharedPreferences) {
             Key.SCREEN_ZOOM -> "PreferenceScreenZoom"
             Key.SCREEN_ZOOM_FIT -> "PreferenceScreenZoomFit"
             Key.LIMIT_FRAME_RATE -> "PreferenceLimitFrameRate"
+            Key.USE_INDEX_API -> "PreferenceUseIndexApi"
         }
     }
 

app/src/main/java/org/cocos2dx/lib/Cocos2dxEditText.kt

@@ -1,18 +0,0 @@
-package org.cocos2dx.lib
-
-import android.content.Context
-import android.view.KeyEvent
-import androidx.appcompat.widget.AppCompatEditText
-
-class Cocos2dxEditText(context: Context) : AppCompatEditText(context) {
-    var cocos2dxGLSurfaceView: Cocos2dxGLSurfaceView? = null
-
-    override fun onKeyDown(keyCode: Int, keyEvent: KeyEvent): Boolean {
-        super.onKeyDown(keyCode, keyEvent)
-        if (keyCode != KeyEvent.KEYCODE_BACK) {
-            return true
-        }
-        cocos2dxGLSurfaceView?.requestFocus()
-        return true
-    }
-}

app/src/main/java/org/cocos2dx/lib/Cocos2dxGLSurfaceView.kt

@@ -7,17 +7,21 @@ import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
+import android.text.InputType
 import android.util.Log
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.Surface
 import android.view.inputmethod.InputMethodManager
 import androidx.annotation.RequiresApi
+import androidx.appcompat.widget.AppCompatEditText
 import com.customRobTop.BaseRobTopActivity
 import com.geode.launcher.utils.GeodeUtils
 
 private const val HANDLER_OPEN_IME_KEYBOARD = 2
 private const val HANDLER_CLOSE_IME_KEYBOARD = 3
+private const val HANDLER_ARG_MULTILINE = 1
+private const val HANDLER_ARG_SINGLELINE = 0
 private const val MS_TO_NS = 1_000_000
 
 class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
@@ -26,11 +30,22 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
         private lateinit var handler: Handler
         private lateinit var cocos2dxTextInputWrapper: Cocos2dxTextInputWrapper
 
+        fun openMultilineIMEKeyboard() {
+            val msg = Message().apply {
+                what = HANDLER_OPEN_IME_KEYBOARD
+                obj = cocos2dxGLSurfaceView.getContentText()
+                arg1 = HANDLER_ARG_MULTILINE
+            }
+            handler.sendMessage(msg)
+        }
+
         @JvmStatic
         fun openIMEKeyboard() {
-            val msg = Message()
-            msg.what = HANDLER_OPEN_IME_KEYBOARD
-            msg.obj = cocos2dxGLSurfaceView.getContentText()
+            val msg = Message().apply {
+                what = HANDLER_OPEN_IME_KEYBOARD
+                obj = cocos2dxGLSurfaceView.getContentText()
+                arg1 = HANDLER_ARG_SINGLELINE
+            }
             handler.sendMessage(msg)
         }
 
@@ -55,16 +70,29 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
         }
 
     var sendTimestampEvents = false
+    var sendInternalTimestampEvents = false
+    var manualBackEvents = false
 
-    var cocos2dxEditText: Cocos2dxEditText? = null
+    var cocos2dxEditText: AppCompatEditText? = null
         set(value) {
             field = value
 
             field?.setOnEditorActionListener(cocos2dxTextInputWrapper)
-            field?.cocos2dxGLSurfaceView = this
             requestFocus()
         }
 
+    fun setKeyboardMultiline() {
+        val editText = cocos2dxEditText ?: return
+        editText.inputType = editText.inputType or InputType.TYPE_TEXT_FLAG_MULTI_LINE
+        editText.maxLines = Int.MAX_VALUE
+    }
+
+    fun setKeyboardSingleLine() {
+        val editText = cocos2dxEditText ?: return
+        editText.inputType = editText.inputType and InputType.TYPE_TEXT_FLAG_MULTI_LINE.inv()
+        editText.maxLines = 1
+    }
+
     fun initView() {
         setEGLContextClientVersion(2)
         isFocusableInTouchMode = true
@@ -76,6 +104,12 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
                 when (msg.what) {
                     HANDLER_OPEN_IME_KEYBOARD -> {
                         if (cocos2dxEditText?.requestFocus() == true) {
+                            if (msg.arg1 == HANDLER_ARG_MULTILINE) {
+                                setKeyboardMultiline()
+                            } else {
+                                setKeyboardSingleLine()
+                            }
+
                             cocos2dxEditText?.apply {
                                 removeTextChangedListener(
                                     cocos2dxTextInputWrapper
@@ -149,6 +183,14 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
         queueEvent { cocos2dxRenderer.handleOnResume() }
     }
 
+    private fun sendNextEventTimestamp(timestamp: Long) {
+        if (sendTimestampEvents)
+            GeodeUtils.setNextInputTimestamp(timestamp)
+
+        if (sendInternalTimestampEvents)
+            GeodeUtils.setNextInputTimestampInternal(timestamp)
+    }
+
     override fun onTouchEvent(motionEvent: MotionEvent): Boolean {
         val pointerNumber = motionEvent.pointerCount
         val ids = IntArray(pointerNumber)
@@ -168,9 +210,7 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
                 val xDown = xs[0]
                 val f = ys[0]
                 queueEvent {
-                    if (sendTimestampEvents)
-                        GeodeUtils.setNextInputTimestamp(timestamp)
-
+                    sendNextEventTimestamp(timestamp)
                     cocos2dxRenderer.handleActionDown(idDown, xDown, f)
                 }
                 true
@@ -180,27 +220,21 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
                 val f2 = xs[0]
                 val f3 = ys[0]
                 queueEvent {
-                    if (sendTimestampEvents)
-                        GeodeUtils.setNextInputTimestamp(timestamp)
-
+                    sendNextEventTimestamp(timestamp)
                     cocos2dxRenderer.handleActionUp(idUp, f2, f3)
                 }
                 true
             }
             MotionEvent.ACTION_MOVE -> {
                 queueEvent {
-                    if (sendTimestampEvents)
-                        GeodeUtils.setNextInputTimestamp(timestamp)
-
+                    sendNextEventTimestamp(timestamp)
                     cocos2dxRenderer.handleActionMove(ids, xs, ys)
                 }
                 true
             }
             MotionEvent.ACTION_CANCEL -> {
                 queueEvent {
-                    if (sendTimestampEvents)
-                        GeodeUtils.setNextInputTimestamp(timestamp)
-
+                    sendNextEventTimestamp(timestamp)
                     cocos2dxRenderer.handleActionCancel(ids, xs, ys)
                 }
                 true
@@ -211,9 +245,7 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
                 val xPointerDown = motionEvent.getX(indexPointerDown)
                 val y = motionEvent.getY(indexPointerDown)
                 queueEvent {
-                    if (sendTimestampEvents)
-                        GeodeUtils.setNextInputTimestamp(timestamp)
-
+                    sendNextEventTimestamp(timestamp)
                     cocos2dxRenderer.handleActionDown(idPointerDown, xPointerDown, y)
                 }
                 true
@@ -224,9 +256,7 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
                 val xPointerUp = motionEvent.getX(indexPointUp)
                 val y2 = motionEvent.getY(indexPointUp)
                 queueEvent {
-                    if (sendTimestampEvents)
-                        GeodeUtils.setNextInputTimestamp(timestamp)
-
+                    sendNextEventTimestamp(timestamp)
                     cocos2dxRenderer.handleActionUp(idPointerUp, xPointerUp, y2)
                 }
                 true
@@ -259,6 +289,28 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
         }
     }
 
+    fun sendKeyBack() {
+        if (cocos2dxEditText?.isFocused == true) {
+            requestFocus()
+        }
+
+        if (BaseRobTopActivity.blockBackButton) {
+            return
+        }
+
+        if (useKeyboardEvents) {
+            queueEvent {
+                cocos2dxRenderer.handleKeyDown(KeyEvent.KEYCODE_BACK)
+            }
+        } else {
+            val currentTime = System.nanoTime()
+            queueEvent {
+                sendNextEventTimestamp(currentTime)
+                GeodeUtils.nativeKeyDown(KeyEvent.KEYCODE_BACK, 0, false)
+            }
+        }
+    }
+
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
         if (!useKeyboardEvents) {
             return legacyKeyDown(keyCode, event)
@@ -275,9 +327,7 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
                 }
 
                 queueEvent {
-                    if (sendTimestampEvents)
-                        GeodeUtils.setNextInputTimestamp(event.eventTime * MS_TO_NS)
-
+                    sendNextEventTimestamp(event.eventTime * MS_TO_NS)
                     GeodeUtils.nativeKeyDown(keyCode, event.modifiers, event.repeatCount != 0)
                 }
                 true
@@ -300,9 +350,7 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
                 }
 
                 queueEvent {
-                    if (sendTimestampEvents)
-                        GeodeUtils.setNextInputTimestamp(event.eventTime * MS_TO_NS)
-
+                    sendNextEventTimestamp(event.eventTime * MS_TO_NS)
                     GeodeUtils.nativeKeyUp(keyCode, event.modifiers)
                 }
 
@@ -323,9 +371,7 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
                 event.eventTimeNanos else event.eventTime * MS_TO_NS
 
             queueEvent {
-                if (sendTimestampEvents)
-                    GeodeUtils.setNextInputTimestamp(timestamp)
-
+                sendNextEventTimestamp(timestamp)
                 GeodeUtils.nativeActionScroll(scrollX, scrollY)
             }
 

app/src/main/java/org/cocos2dx/lib/Cocos2dxTextInputWrapper.kt

@@ -5,6 +5,7 @@ import android.text.TextWatcher
 import android.widget.TextView.OnEditorActionListener
 import android.text.Editable
 import android.view.KeyEvent
+import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.TextView
 
@@ -47,22 +48,22 @@ class Cocos2dxTextInputWrapper(private val cocos2dxGLSurfaceView: Cocos2dxGLSurf
 
     override fun onTextChanged(pCharSequence: CharSequence, start: Int, before: Int, count: Int) {}
     override fun onEditorAction(textView: TextView, actionID: Int, keyEvent: KeyEvent?): Boolean {
+        if (actionID != EditorInfo.IME_ACTION_DONE) {
+            return false
+        }
+
         if (cocos2dxGLSurfaceView.cocos2dxEditText == textView && isFullScreenEdit) {
             for (i in originText!!.length downTo 1) {
                 cocos2dxGLSurfaceView.deleteBackward()
             }
             var text = textView.text.toString()
-            if (text.compareTo("") == 0) {
-                text = "\n"
-            }
-            if (10 != text[text.length - 1].code) {
-                text += 10.toChar()
+            if (!text.endsWith('\n')) {
+                text += '\n'
             }
+
             cocos2dxGLSurfaceView.insertText(text)
         }
-        if (actionID != 6) {
-            return false
-        }
+
         cocos2dxGLSurfaceView.requestFocus()
         Cocos2dxGLSurfaceView.closeIMEKeyboard()
         return false

app/src/main/res/drawable/xps_icon.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

app/src/main/res/values/strings.xml

@@ -1,9 +1,9 @@
 <resources>
-    <string name="app_name" translatable="false">XPS: Geode Edition</string>
+    <string name="app_name" translatable="false">Geode</string>
     <string name="no_activity_found">No activity found for this action.</string>
 
     <!-- MainActivity strings -->
-    <string name="game_not_found">XPS 2.2 isn\'t installed</string>
+    <string name="game_not_found">Geometry Dash was not found.\nThe full version of the game is required.</string>
     <string name="launcher_launch">Launch</string>
     <string name="launcher_settings">Settings</string>
     <string name="launcher_download">Download</string>
@@ -18,7 +18,7 @@
     <string name="launcher_settings_icon_alt">settings icon</string>
     <string name="launcher_retry_icon_alt">retry icon</string>
     <string name="geode_download_title">Geode is not installed.</string>
-    <string name="game_outdated">A XPS update is required.\nYou currently have update %1$s.</string>
+    <string name="game_outdated">A Geometry Dash update is required.\nYou currently have update %1$s.</string>
     <string name="geode_download_description">Geode is downloading. Please wait.</string>
     <plurals name="automatically_load_countdown">
         <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_unsupported_version_title">Unsupported version</string>
     <string name="launcher_outdated_version_description">
-        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!
+        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!
     </string>
     <string name="launcher_unsupported_version_description">
-        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!
+        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!
     </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 XPS is no longer supported. Please update XPS to continue receiving Geode updates.</string>
+    <string name="launcher_game_update_required_short">A Geometry Dash 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_update_available">A new launcher update is available!</string>
     <string name="launcher_update_dismiss">Dismiss</string>
@@ -60,18 +60,18 @@
     <string name="launcher_notification_settings">Launcher Settings</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_compatibility">Unsupported XPS version.</string>
+    <string name="launcher_notification_compatibility">Unsupported Geometry Dash version.</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_starting_game">Starting XPS…</string>
+    <string name="launcher_starting_game">Starting Geometry Dash…</string>
     <string name="launcher_downloading_update">Downloading update…</string>
     <string name="launcher_downloading_update_details">(%1$s/%2$s)</string>
     <string name="launcher_cancelled_manual">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_error">Could not start Geode.</string>
-    <string name="launcher_cancelled_outdated">A XPS update is required.</string>
+    <string name="launcher_cancelled_outdated">A Geometry Dash update is required.</string>
     <string name="launcher_cancelled_restart">Restart</string>
     <string name="launcher_cancelled_resume">Resume</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_success">Geode updated!</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_no_internet">No internet found.</string>
     <string name="release_fetch_cancelled">Update cancelled.</string>
@@ -95,15 +96,15 @@
     <!-- GeometryDashActivity strings -->
     <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_abi_error">The architecture of the launcher and XPS do not match. 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_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_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_recommendation_reinstall">Reinstall XPS.</string>
+    <string name="load_failed_recommendation_reinstall">Reinstall Geometry Dash.</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_update">Verify that the latest versions of the launcher and XPS are installed.</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_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_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">Geode %1$s</string>
 
-    <string name="preference_game_version_name">XPS</string>
+    <string name="preference_game_version_name">Geometry Dash</string>
     <string name="preference_game_version_description">%1$s (%2$s)</string>
-    <string name="preference_game_version">XPS %1$s (%2$s)</string>
+    <string name="preference_game_version">Geometry Dash %1$s (%2$s)</string>
     <string name="preference_game_source_google">Google</string>
     <string name="preference_game_source_amazon">Amazon</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_description">Uses exception_symbols.txt to patch</string>
+    <string name="preference_use_index_update_api">Use index release API</string>
 </resources>

app/src/main/res/values/themes.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="Theme.NoActionBar.Fullscreen" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:windowNoTitle">true</item>
@@ -7,6 +7,7 @@
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowBackground">@android:drawable/screen_background_dark</item>
+        <item name="android:windowOptOutEdgeToEdgeEnforcement" tools:targetApi="35">true</item>
     </style>
 
     <style name="Theme.GeodeLauncher" parent="android:Theme.Material.Light.NoActionBar" />

build.gradle.kts

@@ -1,14 +1,14 @@
 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.
 plugins {
-    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 "2.1.0" apply false
-    id("org.jetbrains.kotlin.plugin.serialization") version "2.1.0" apply false
-    id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false
+    id("com.android.application") version "8.9.2" apply false
+    id("com.android.library") version "8.9.2" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.20" apply false
+    id("org.jetbrains.kotlin.plugin.serialization") version "2.1.20" apply false
+    id("org.jetbrains.kotlin.plugin.compose") version "2.1.20" apply false
 }
 
 tasks.register<Delete>("clean") {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
+#Thu Apr 24 10:54:01 MST 2025
 distributionBase=GRADLE_USER_HOME
 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
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME