From 0b26d2bd9ea47e0f1b3fdf308f56e1f6010362a0 Mon Sep 17 00:00:00 2001 From: cocobo1 Date: Sun, 18 May 2025 14:16:52 +0300 Subject: [PATCH] im a moron im a moron im a moron --- app/build.gradle.kts | 4 +-- .../io/github/pupu/xposed/FontsModule.kt | 35 ++----------------- .../io/github/pupu/xposed/LogBoxModule.kt | 2 +- .../main/kotlin/io/github/pupu/xposed/Main.kt | 4 +-- .../io/github/pupu/xposed/ThemeModule.kt | 2 +- 5 files changed, 8 insertions(+), 39 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 25a12db..06d111e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -12,8 +12,8 @@ android { applicationId = "cocobo1.pupu.xposed" minSdk = 22 targetSdk = 36 - versionCode = 1100 - versionName = "1.1.0" + versionCode = 1110 + versionName = "1.1.1" } buildTypes { diff --git a/app/src/main/kotlin/io/github/pupu/xposed/FontsModule.kt b/app/src/main/kotlin/io/github/pupu/xposed/FontsModule.kt index 651e1ef..542d6e9 100644 --- a/app/src/main/kotlin/io/github/pupu/xposed/FontsModule.kt +++ b/app/src/main/kotlin/io/github/pupu/xposed/FontsModule.kt @@ -50,37 +50,6 @@ class FontsModule: Module() { } } - private fun hookClass(classLoader: ClassLoader, className: String) { - XposedHelpers.findAndHookMethod( - className, - classLoader, - "createAssetTypeface", - String::class.java, - Int::class.java, - "android.content.res.AssetManager", - object : XC_MethodReplacement() { - override fun replaceHookedMethod(param: MethodHookParam): Typeface? { - val fontFamilyName: String = param.args[0].toString() - val style: Int = param.args[1] as Int - val assetManager: AssetManager = param.args[2] as AssetManager - return createAssetTypeface(fontFamilyName, style, assetManager) - } - }) - } - -// override fun onInit(packageParam: XC_LoadPackage.LoadPackageParam) = with (packageParam) { -// XposedHelpers.findAndHookMethod("com.facebook.react.views.text.ReactFontManager", classLoader, "createAssetTypeface", -// String::class.java, -// Int::class.java, -// "android.content.res.AssetManager", object : XC_MethodReplacement() { -// override fun replaceHookedMethod(param: MethodHookParam): Typeface? { -// val fontFamilyName: String = param.args[0].toString() -// val style: Int = param.args[1] as Int -// val assetManager: AssetManager = param.args[2] as AssetManager -// return createAssetTypeface(fontFamilyName, style, assetManager) -// } -// }) - override fun onInit(packageParam: XC_LoadPackage.LoadPackageParam) = with (packageParam) { try { // Try to hook on versions (280201+) @@ -93,7 +62,7 @@ class FontsModule: Module() { } } - val fontDefFile = File(appInfo.dataDir, "files/pyon/fonts.json") + val fontDefFile = File(appInfo.dataDir, "files/pyoncord/fonts.json") if (!fontDefFile.exists()) return@with val fontDef = try { @@ -101,7 +70,7 @@ class FontsModule: Module() { json.decodeFromString(fontDefFile.readText()) } catch (_: Throwable) { return@with } - fontsDownloadsDir = File(appInfo.dataDir, "files/pyon/downloads/fonts").apply { mkdirs() } + fontsDownloadsDir = File(appInfo.dataDir, "files/pyoncord/downloads/fonts").apply { mkdirs() } fontsDir = File(fontsDownloadsDir, fontDef.name!!).apply { mkdirs() } fontsAbsPath = fontsDir.absolutePath + "/" diff --git a/app/src/main/kotlin/io/github/pupu/xposed/LogBoxModule.kt b/app/src/main/kotlin/io/github/pupu/xposed/LogBoxModule.kt index b05b08a..bc84b99 100644 --- a/app/src/main/kotlin/io/github/pupu/xposed/LogBoxModule.kt +++ b/app/src/main/kotlin/io/github/pupu/xposed/LogBoxModule.kt @@ -91,7 +91,7 @@ class LogBoxModule: Module() { reloadApp() } 1 -> { - val bundleFile = File(packageParam.appInfo.dataDir, "cache/pyon/bundle.js") + val bundleFile = File(packageParam.appInfo.dataDir, "cache/pyoncord/bundle.js") if (bundleFile.exists()) { bundleFile.delete() } diff --git a/app/src/main/kotlin/io/github/pupu/xposed/Main.kt b/app/src/main/kotlin/io/github/pupu/xposed/Main.kt index fbfaad6..285a8b0 100644 --- a/app/src/main/kotlin/io/github/pupu/xposed/Main.kt +++ b/app/src/main/kotlin/io/github/pupu/xposed/Main.kt @@ -104,8 +104,8 @@ class Main : IXposedHookLoadPackage { String::class.java ).apply { isAccessible = true } - val cacheDir = File(appInfo.dataDir, "cache/pyon").apply { mkdirs() } - val filesDir = File(appInfo.dataDir, "files/pyon").apply { mkdirs() } + val cacheDir = File(appInfo.dataDir, "cache/pyoncord").apply { mkdirs() } + val filesDir = File(appInfo.dataDir, "files/pyoncord").apply { mkdirs() } val preloadsDir = File(filesDir, "preloads").apply { mkdirs() } val bundle = File(cacheDir, "bundle.js") diff --git a/app/src/main/kotlin/io/github/pupu/xposed/ThemeModule.kt b/app/src/main/kotlin/io/github/pupu/xposed/ThemeModule.kt index 0ef9ad3..3caf491 100644 --- a/app/src/main/kotlin/io/github/pupu/xposed/ThemeModule.kt +++ b/app/src/main/kotlin/io/github/pupu/xposed/ThemeModule.kt @@ -67,7 +67,7 @@ class ThemeModule : Module() { private fun getTheme(): Theme? { val filesDir = File(param.appInfo.dataDir, "files").apply { mkdirs() } - val pyonDir = File(filesDir, "pyon").apply { mkdirs() } + val pyonDir = File(filesDir, "pyoncord").apply { mkdirs() } val themeFile = File(pyonDir, "current-theme.json") val legacyThemeFile = File(filesDir, "vendetta_theme.json")