cleanup motionevent

app/build.gradle.kts

@@ -99,6 +99,5 @@ dependencies {
     implementation ("org.jetbrains.kotlinx:kotlinx-serialization-json-okio:1.6.2")
     implementation ("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0")
     debugImplementation ("androidx.compose.ui:ui-tooling")
-    debugImplementation ("androidx.compose.ui:ui-test-manifest")
     coreLibraryDesugaring ("com.android.tools:desugar_jdk_libs:2.0.4")
 }

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

@@ -23,14 +23,14 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.filled.Share
-import androidx.compose.material3.Divider
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.LinearProgressIndicator
@@ -254,7 +254,7 @@ fun ApplicationLogsScreen(
                     navigationIcon = {
                         IconButton(onClick = { onBackPressedDispatcher?.onBackPressed() }) {
                             Icon(
-                                imageVector = Icons.Filled.ArrowBack,
+                                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                                 contentDescription = stringResource(R.string.back_icon_alt)
                             )
                         }
@@ -402,7 +402,7 @@ fun ApplicationLogsScreen(
                 logLines
             ) { line ->
                 LogCard(line)
-                Divider()
+                HorizontalDivider()
             }
         }
     }

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

@@ -1,6 +1,5 @@
 package com.geode.launcher
 
-import android.Manifest
 import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.Intent
@@ -8,7 +7,6 @@ import android.content.IntentFilter
 import android.content.pm.ActivityInfo
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
-import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
 import android.os.Environment
@@ -37,7 +35,7 @@ import java.io.FileInputStream
 import java.io.FileOutputStream
 
 
-class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperListener {
+class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperListener, GeodeUtils.CapabilityListener {
     private var mGLSurfaceView: Cocos2dxGLSurfaceView? = null
     private val sTag = GeometryDashActivity::class.simpleName
     private var mIsRunning = false
@@ -109,7 +107,9 @@ class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperL
         setupRedirection(gdPackageInfo)
 
         Cocos2dxHelper.init(this, this)
+
         GeodeUtils.setContext(this)
+        GeodeUtils.setCapabilityListener(this)
 
         tryLoadLibrary(gdPackageInfo, Constants.FMOD_LIB_NAME)
         tryLoadLibrary(gdPackageInfo, Constants.COCOS_LIB_NAME)
@@ -450,4 +450,13 @@ class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperL
             }
         }
     }
+
+    override fun onCapabilityAdded(capability: String): Boolean {
+        if (capability == GeodeUtils.CAPABILITY_EXTENDED_INPUT) {
+            mGLSurfaceView?.useKeyboardEvents = true
+            return true
+        }
+
+        return false
+    }
 }

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

@@ -145,7 +145,7 @@ fun UpdateProgressIndicator(
     message: String,
     releaseViewModel: ReleaseViewModel,
     modifier: Modifier = Modifier,
-    progress: Float? = null
+    progress: (() -> Float)? = null
 ) {
     Column(
         verticalArrangement = Arrangement.Center,
@@ -159,7 +159,7 @@ fun UpdateProgressIndicator(
         if (progress == null) {
             LinearProgressIndicator()
         } else {
-            LinearProgressIndicator(progress)
+            LinearProgressIndicator(progress = progress)
         }
 
         TextButton(
@@ -349,8 +349,6 @@ fun UpdateCard(releaseViewModel: ReleaseViewModel, modifier: Modifier = Modifier
             )
         }
         is ReleaseViewModel.ReleaseUIState.InDownload -> {
-            val progress = state.downloaded / state.outOf.toDouble()
-
             val downloaded = remember(state.downloaded) {
                 formatShortFileSize(context, state.downloaded)
             }
@@ -367,7 +365,10 @@ fun UpdateCard(releaseViewModel: ReleaseViewModel, modifier: Modifier = Modifier
                 ),
                 modifier = modifier,
                 releaseViewModel = releaseViewModel,
-                progress = progress.toFloat()
+                progress = {
+                    val progress = state.downloaded / state.outOf.toDouble()
+                    progress.toFloat()
+                }
             )
         }
         is ReleaseViewModel.ReleaseUIState.InUpdateCheck -> {
@@ -448,7 +449,7 @@ fun MainScreen(
 ) {
     val context = LocalContext.current
 
-    val shouldAutomaticallyLaunch = PreferenceUtils.useBooleanPreference(
+    val shouldAutomaticallyLaunch by PreferenceUtils.useBooleanPreference(
         preferenceKey = PreferenceUtils.Key.LOAD_AUTOMATICALLY
     )
 
@@ -491,15 +492,11 @@ fun MainScreen(
         )
 
         if (gdInstalled && geodeInstalled) {
-            if (shouldAutomaticallyLaunch.value && !releaseViewModel.isInUpdate && !disableAutomaticLaunch) {
+            val stopLaunch = releaseViewModel.isInUpdate || disableAutomaticLaunch || showSafeModeDialog
+            if (shouldAutomaticallyLaunch && !stopLaunch) {
                 val countdownTimer = useCountdownTimer(
                     time = 3000,
-                    onCountdownFinish = {
+                    onCountdownFinish = { beginLaunch = true }
-                        // just in case this changed async
-                        if (shouldAutomaticallyLaunch.value) {
-                            beginLaunch = true
-                        }
-                    }
                 )
 
                 if (countdownTimer != 0L) {

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

@@ -23,7 +23,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -145,7 +145,9 @@ fun UpdateIndicator(
             enablePopup = true
             val progress = updateStatus.downloaded / updateStatus.outOf.toDouble()
 
-            CircularProgressIndicator(progress.toFloat())
+            CircularProgressIndicator(
+                progress = { progress.toFloat() },
+            )
         }
         else -> {}
     }
@@ -259,7 +261,7 @@ fun SettingsScreen(
                 navigationIcon = {
                     IconButton(onClick = { onBackPressedDispatcher?.onBackPressed() }) {
                         Icon(
-                            imageVector = Icons.Filled.ArrowBack,
+                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
                             contentDescription = context.getString(R.string.back_icon_alt)
                         )
                     }

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

@@ -446,4 +446,30 @@ object GeodeUtils {
 
         return null
     }
+
+    interface CapabilityListener {
+        fun onCapabilityAdded(capability: String): Boolean
+    }
+
+    const val CAPABILITY_EXTENDED_INPUT = "extended_input"
+
+    private var capabilityListener: WeakReference<CapabilityListener?> = WeakReference(null)
+
+    fun setCapabilityListener(listener: CapabilityListener) {
+        capabilityListener = WeakReference(listener)
+    }
+
+    @JvmStatic
+    fun reportPlatformCapability(capability: String?): Boolean {
+        if (capability.isNullOrEmpty()) {
+            return false
+        }
+
+        return capabilityListener.get()?.onCapabilityAdded(capability) ?: false
+    }
+
+    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)
 }

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

@@ -10,6 +10,7 @@ import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.inputmethod.InputMethodManager
 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
@@ -37,6 +38,11 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
     }
 
     private lateinit var cocos2dxRenderer: Cocos2dxRenderer
+    var useKeyboardEvents = false
+        set(value) {
+            field = value
+            cocos2dxRenderer.sendResizeEvents = value
+        }
 
     var cocos2dxEditText: Cocos2dxEditText? = null
         set(value) {
@@ -207,7 +213,7 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
         }
     }
 
-    override fun onKeyDown(keyCode: Int, keyEvent: KeyEvent): Boolean {
+    private fun legacyKeyDown(keyCode: Int, keyEvent: KeyEvent): Boolean {
         return when (keyCode) {
             KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_MENU -> {
                 if (keyEvent.repeatCount != 0 || BaseRobTopActivity.blockBackButton) {
@@ -220,6 +226,71 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
         }
     }
 
+    override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
+        if (!useKeyboardEvents) {
+            return legacyKeyDown(keyCode, event)
+        }
+
+        return when (keyCode) {
+            // ignore system keys
+            KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_MUTE -> {
+                super.onKeyDown(keyCode, event)
+            }
+            else -> {
+                if (BaseRobTopActivity.blockBackButton) {
+                    return true
+                }
+
+                queueEvent {
+                    GeodeUtils.nativeKeyDown(keyCode, event.modifiers, event.repeatCount != 0)
+                }
+                true
+            }
+        }
+    }
+
+    override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
+        if (!useKeyboardEvents) {
+            return super.onKeyUp(keyCode, event)
+        }
+
+        return when (keyCode) {
+            KeyEvent.KEYCODE_VOLUME_DOWN, KeyEvent.KEYCODE_VOLUME_UP, KeyEvent.KEYCODE_MUTE -> {
+                super.onKeyUp(keyCode, event)
+            }
+            else -> {
+                if (event.repeatCount != 0 || BaseRobTopActivity.blockBackButton) {
+                    return true
+                }
+
+                queueEvent {
+                    GeodeUtils.nativeKeyUp(keyCode, event.modifiers)
+                }
+
+                true
+            }
+        }
+    }
+
+    override fun onGenericMotionEvent(event: MotionEvent?): Boolean {
+        if (!useKeyboardEvents) {
+            return super.onGenericMotionEvent(event)
+        }
+
+        if (event?.action == MotionEvent.ACTION_SCROLL) {
+            val scrollX = event.getAxisValue(MotionEvent.AXIS_HSCROLL)
+            val scrollY = event.getAxisValue(MotionEvent.AXIS_VSCROLL)
+
+            queueEvent {
+                GeodeUtils.nativeActionScroll(scrollX, scrollY)
+            }
+
+            return true
+        }
+
+        return super.onGenericMotionEvent(event)
+    }
+
     fun setCocos2dxRenderer(renderer: Cocos2dxRenderer) {
         this.cocos2dxRenderer = renderer
         setRenderer(this.cocos2dxRenderer)

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

@@ -59,6 +59,7 @@ class Cocos2dxRenderer : GLSurfaceView.Renderer {
     private var lastTickInNanoSeconds: Long = 0
     private var screenWidth = 0
     private var screenHeight = 0
+    var sendResizeEvents = false
 
     fun setScreenWidthAndHeight(surfaceWidth: Int, surfaceHeight: Int) {
         screenWidth = surfaceWidth

build.gradle.kts

@@ -1,6 +1,6 @@
 buildscript {
-    val composeBOM by extra("2023.10.01")
+    val composeBOM by extra("2024.02.00")
-    val composeCompiler by extra("1.5.8")
+    val composeCompiler by extra("1.5.9")
 }
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.