mirror of
https://github.com/geode-sdk/android-launcher.git
synced 2026-10-21 16:32:39 +00:00
generate more specific warnings
This commit is contained in:
4 files changed
+22
-8
No files matched your search
@@ -65,8 +65,12 @@ class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperL
|
||||
val gdPackageInfo = packageManager.getPackageInfo(Constants.PACKAGE_NAME, 0)
|
||||
val abiMismatch = LaunchUtils.detectAbiMismatch(this, gdPackageInfo, e)
|
||||
|
||||
val errorMessage = if (abiMismatch) getString(R.string.load_failed_abi_error_description) else
|
||||
getString(R.string.load_failed_link_error_description)
|
||||
val is64bit = LaunchUtils.is64bit
|
||||
val errorMessage = when {
|
||||
abiMismatch && is64bit -> getString(R.string.load_failed_abi_error_need_32bit_description)
|
||||
abiMismatch -> getString(R.string.load_failed_abi_error_need_64bit_description)
|
||||
else -> getString(R.string.load_failed_link_error_description)
|
||||
}
|
||||
|
||||
returnToMain(
|
||||
getString(R.string.load_failed_link_error),
|
||||
|
||||
@@ -252,9 +252,14 @@ fun UpdateWarning() {
|
||||
Text(stringResource(R.string.launcher_unsupported_version_title))
|
||||
},
|
||||
text = {
|
||||
val message = if (gdVersionCode >= Constants.SUPPORTED_VERSION_CODE) {
|
||||
R.string.launcher_unsupported_version_description
|
||||
} else {
|
||||
R.string.launcher_outdated_version_description
|
||||
}
|
||||
|
||||
Text(stringResource(
|
||||
R.string.launcher_unsupported_version_description,
|
||||
gdVersionString, Constants.SUPPORTED_VERSION_STRING
|
||||
message, gdVersionString, Constants.SUPPORTED_VERSION_STRING
|
||||
))
|
||||
},
|
||||
confirmButton = {
|
||||
|
||||
@@ -89,8 +89,9 @@ object LaunchUtils {
|
||||
@Suppress("DEPRECATION")
|
||||
val applicationArchitecture: String = Build.CPU_ABI
|
||||
|
||||
val platformName: String = if (applicationArchitecture == "arm64-v8a")
|
||||
"android64" else "android32"
|
||||
val is64bit = applicationArchitecture == "arm64-v8a"
|
||||
|
||||
val platformName: String = if (is64bit) "android64" else "android32"
|
||||
|
||||
val geodeFilename: String = "Geode.$platformName.so"
|
||||
|
||||
|
||||
Reference in new issue
Block a user