rename constants

This commit is contained in:
qimiko committed 2022-11-16 10:20:28 -07:00
1 parent 44faafacc3
commit bbbd1eae38
4 files changed
+9 -9

No files matched your search

@@ -20,7 +20,7 @@ import androidx.core.view.WindowInsetsCompat
import androidx.core.view.WindowInsetsControllerCompat import androidx.core.view.WindowInsetsControllerCompat
import com.customRobTop.BaseRobTopActivity import com.customRobTop.BaseRobTopActivity
import com.customRobTop.JniToCpp import com.customRobTop.JniToCpp
import com.geode.geodelauncher.utils.GJConstants import com.geode.geodelauncher.utils.Constants
import com.geode.geodelauncher.utils.LaunchUtils import com.geode.geodelauncher.utils.LaunchUtils
import org.cocos2dx.lib.Cocos2dxEditText import org.cocos2dx.lib.Cocos2dxEditText
import org.cocos2dx.lib.Cocos2dxGLSurfaceView import org.cocos2dx.lib.Cocos2dxGLSurfaceView
@@ -54,7 +54,7 @@ class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperL
startActivity(launchIntent) startActivity(launchIntent)
} }
val gdPackageInfo = packageManager.getPackageInfo(GJConstants.PACKAGE_NAME, 0) val gdPackageInfo = packageManager.getPackageInfo(Constants.PACKAGE_NAME, 0)
val gdNativeLibraryPath = "${gdPackageInfo.applicationInfo.nativeLibraryDir}/" val gdNativeLibraryPath = "${gdPackageInfo.applicationInfo.nativeLibraryDir}/"
try { try {
@@ -66,14 +66,14 @@ class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperL
try { try {
// fixes bugs specific to the new app directory, such as package name // fixes bugs specific to the new app directory, such as package name
LauncherFix.loadLibrary() LauncherFix.loadLibrary()
LauncherFix.setOriginalDataPath(GJConstants.GJ_DATA_DIR) LauncherFix.setOriginalDataPath(Constants.GJ_DATA_DIR)
LauncherFix.setDataPath(filesDir.path) LauncherFix.setDataPath(filesDir.path)
} catch (e: UnsatisfiedLinkError) { } catch (e: UnsatisfiedLinkError) {
e.printStackTrace() e.printStackTrace()
} }
System.load("$gdNativeLibraryPath/lib${GJConstants.FMOD_LIB_NAME}.so") System.load("$gdNativeLibraryPath/lib${Constants.FMOD_LIB_NAME}.so")
System.load("$gdNativeLibraryPath/lib${GJConstants.COCOS_LIB_NAME}.so") System.load("$gdNativeLibraryPath/lib${Constants.COCOS_LIB_NAME}.so")
if (getLoadTesting()) { if (getLoadTesting()) {
loadTestingLibraries() loadTestingLibraries()
@@ -1,10 +1,10 @@
package com.geode.geodelauncher package com.geode.geodelauncher
import com.geode.geodelauncher.utils.GJConstants import com.geode.geodelauncher.utils.Constants
object LauncherFix { object LauncherFix {
fun loadLibrary() { fun loadLibrary() {
System.loadLibrary(GJConstants.LAUNCHER_FIX_LIB_NAME) System.loadLibrary(Constants.LAUNCHER_FIX_LIB_NAME)
} }
external fun setDataPath(dataPath: String) external fun setDataPath(dataPath: String)
@@ -2,7 +2,7 @@ package com.geode.geodelauncher.utils
import android.annotation.SuppressLint import android.annotation.SuppressLint
object GJConstants { object Constants {
const val PACKAGE_NAME = "com.robtopx.geometryjump" const val PACKAGE_NAME = "com.robtopx.geometryjump"
const val COCOS_LIB_NAME = "cocos2dcpp" const val COCOS_LIB_NAME = "cocos2dcpp"
@@ -7,7 +7,7 @@ import android.content.res.AssetManager
object LaunchUtils { object LaunchUtils {
fun isGeometryDashInstalled(packageManager: PackageManager): Boolean { fun isGeometryDashInstalled(packageManager: PackageManager): Boolean {
return try { return try {
packageManager.getPackageInfo(GJConstants.PACKAGE_NAME, 0) packageManager.getPackageInfo(Constants.PACKAGE_NAME, 0)
true true
} catch (e: PackageManager.NameNotFoundException) { } catch (e: PackageManager.NameNotFoundException) {
false false