Compare commits

..
4 Commits
Author SHA1 Message Date
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
4 changed files with 14 additions and 6 deletions

No files matched your search

+2 -2
View File
@@ -20,8 +20,8 @@ android {
applicationId = "com.geode.launcher" applicationId = "com.geode.launcher"
minSdk = 23 minSdk = 23
targetSdk = 35 targetSdk = 35
versionCode = 21 versionCode = 22
versionName = "1.6.0" versionName = "1.6.1"
vectorDrawables { vectorDrawables {
useSupportLibrary = true useSupportLibrary = true
@@ -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,
@@ -250,7 +250,7 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
private fun legacyKeyDown(keyCode: Int, keyEvent: KeyEvent): Boolean { private fun legacyKeyDown(keyCode: Int, keyEvent: KeyEvent): Boolean {
return when (keyCode) { return when (keyCode) {
KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_MENU -> { KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_MENU -> {
if (keyEvent.repeatCount != 0 || BaseRobTopActivity.blockBackButton || manualBackEvents) { if (keyEvent.repeatCount != 0 || BaseRobTopActivity.blockBackButton) {
return true return true
} }
queueEvent { cocos2dxRenderer.handleKeyDown(keyCode) } queueEvent { cocos2dxRenderer.handleKeyDown(keyCode) }
@@ -270,7 +270,11 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
cocos2dxRenderer.handleKeyDown(KeyEvent.KEYCODE_BACK) cocos2dxRenderer.handleKeyDown(KeyEvent.KEYCODE_BACK)
} }
} else { } else {
val currentTime = System.nanoTime()
queueEvent { queueEvent {
if (sendTimestampEvents)
GeodeUtils.setNextInputTimestamp(currentTime)
GeodeUtils.nativeKeyDown(KeyEvent.KEYCODE_BACK, 0, false) GeodeUtils.nativeKeyDown(KeyEvent.KEYCODE_BACK, 0, false)
} }
} }
@@ -287,7 +291,7 @@ class Cocos2dxGLSurfaceView(context: Context) : GLSurfaceView(context) {
super.onKeyDown(keyCode, event) super.onKeyDown(keyCode, event)
} }
else -> { else -> {
if (BaseRobTopActivity.blockBackButton || manualBackEvents) { if (BaseRobTopActivity.blockBackButton) {
return true return true
} }
+1
View File
@@ -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>