Merge pull request #460 from crimera/dev

chore: Merge branch `dev` to `main`

Author: crimera

.releaserc

@@ -13,6 +13,7 @@
           { "type": "feat", "release": "minor" },
           { "type": "update", "release": "patch" },
           { "type": "refactor", "release": "patch" },
+          { "type": "perf", "release": "patch" },
           { "type": "build", "scope": "Needs bump", "release": "patch" }
         ]
       }
@@ -27,6 +28,7 @@
             { type: "feat", section: "Features", hidden: false },
             { type: "update", section: "Updates", hidden: false },
             { type: "refactor", section: "Refactors", hidden: false },
+            { type: "perf", section: "Perfomance", hidden: false },
           ]
         }
       }

CHANGELOG.md

@@ -1,3 +1,25 @@
+## [1.45.0-dev.1](https://github.com/crimera/piko/compare/v1.44.1-dev.2...v1.45.0-dev.1) (2024-11-12)
+
+### Features
+
+* **Twitter:** Added `Customise post font size` patch ([ea608e0](https://github.com/crimera/piko/commit/ea608e09b7b0775f38ca1914503e1b54dc7b73f9))
+
+## [1.44.1-dev.2](https://github.com/crimera/piko/compare/v1.44.1-dev.1...v1.44.1-dev.2) (2024-11-11)
+
+### Perfomance
+
+* **Bring back twitter:** Optimize string replacement ([#440](https://github.com/crimera/piko/issues/440)) ([7e61023](https://github.com/crimera/piko/commit/7e6102351d9488f89489f87df2ec45d6d0d178d8))
+
+## [1.44.1-dev.1](https://github.com/crimera/piko/compare/v1.44.0...v1.44.1-dev.1) (2024-11-09)
+
+### Bug Fixes
+
+* **Twitter:** Share menu button add hook in/from 10.67 ([a640946](https://github.com/crimera/piko/commit/a640946e7045be359535ed0eead00ec80d2e10c4))
+
+### Refactors
+
+* **Twitter:** refactor values of list preference ([e0e5c5b](https://github.com/crimera/piko/commit/e0e5c5b8639efcd5eecd6476bc59b7f125d5b851))
+
 ## [1.44.0](https://github.com/crimera/piko/compare/v1.43.0...v1.44.0) (2024-11-06)
 
 ### Features

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 1.44.0
+version = 1.45.0-dev.1

patches.json

@@ -7,12 +7,11 @@ import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.util.ResourceGroup
 import app.revanced.util.asSequence
 import app.revanced.util.copyResources
-import app.util.measureExecutionTime
 import crimera.patches.twitter.misc.bringbacktwitter.custromstringsupdater.ja
+import crimera.patches.twitter.misc.bringbacktwitter.custromstringsupdater.pt_rBR
 import crimera.patches.twitter.misc.bringbacktwitter.strings.StringsMap
 import org.w3c.dom.Element
 import java.io.File
-import java.io.FileWriter
 
 @Patch(
     name = "Bring back twitter",
@@ -97,20 +96,16 @@ object BringBackTwitterResourcePatch : ResourcePatch() {
         // update strings to old ones
         updateStrings(context)
         ja.updateStrings(context)
+        pt_rBR.updateStrings(context)
     }
 
     private fun updateStrings(context: ResourceContext) {
         val langs = StringsMap.replacementMap
         for ((key, value) in langs) {
             val stringsFile = context["res/$key/strings.xml"]
-            if (!stringsFile.isFile) {
-
-                context["res/$key"].mkdirs()
-                FileWriter(stringsFile).use {
-                    it.write("<?xml version=\"1.0\" encoding=\"utf-8\"?><resources></resources>")
-                }
+            if (stringsFile.exists()) {
+                updateStringsFile(stringsFile, value, context)
             }
-            updateStringsFile(stringsFile, value, context)
         }
     }
 
@@ -121,39 +116,27 @@ object BringBackTwitterResourcePatch : ResourcePatch() {
         context.xmlEditor[stringsFile.toString()].use { editor ->
             val document = editor.file
 
-            for ((key, value) in stringsMap) {
-                val nodes = document.getElementsByTagName("string")
-                var keyReplaced = false
-                for (i in 0 until nodes.length) {
-                    val node = nodes.item(i)
-                    val name = node.attributes.getNamedItem("name")?.nodeValue
-                    if (name == key) {
-                        node.textContent = value
-                        keyReplaced = true
-                        break
-                    } else if (name == "conference_default_title") {/*
-                         * Parsing causes the default value which contains the
-                         * character 𝕏 to be "corrupted" so we change it to a normal X
-                         */
+            val nodes = document.getElementsByTagName("string")
+            for (i in 0 until nodes.length) {
+                val node = nodes.item(i)
+                val name = node.attributes.getNamedItem("name")?.nodeValue
+
+                if (name == "conference_default_title") {
+                    /*
+                     * Parsing XML causes the string which contains the
+                     * character "𝕏" to be corrupted, so we change it to "Twitter"
+                     */
+                    node.textContent = stringsMap[name] ?: run {
                         val content = node.textContent
-                        node.textContent = stringsMap[name] ?: run {
-                            val delimiter = if (content.contains("-")) '-' else ' '
-                            content.split(delimiter).joinToString(delimiter.toString()) {
-                                if (it.startsWithSpecialByte()) "Twitter" else it
-                            }
+                        val delimiter = if (content.contains("-")) '-' else ' '
+                        content.split(delimiter).joinToString(delimiter.toString()) {
+                            if (it.startsWithSpecialByte()) "Twitter" else it
                         }
                     }
+                    continue
                 }
 
-                // log which keys were not found or failed
-                if (!keyReplaced) {
-                    val colorElement = document.createElement("string")
-
-                    colorElement.setAttribute("name", key)
-                    colorElement.textContent = value
-
-                    document.getElementsByTagName("resources").item(0).appendChild(colorElement)
-                }
+                node.textContent = stringsMap[name] ?: continue
             }
         }
     }

src/main/kotlin/crimera/patches/twitter/misc/bringbacktwitter/BringBackTwitterResourcePatch.kt

@@ -1,4 +1,7 @@
-package crimera.patches.twitter.misc.bringbacktwitter.strings
+package crimera.patches.twitter.misc.bringbacktwitter.custromstringsupdater
+
+import app.revanced.patcher.data.ResourceContext
+import java.io.FileWriter
 
 object pt_rBR {
     val values = mapOf(
@@ -63,4 +66,40 @@ object pt_rBR {
         "ps__retweeted_on_twitter" to "*%s* retweetou em",
         "tweet_removed_from_your_bookmarks" to "Tweet removido dos seus Itens salvos"
     )
+
+    /*
+     * The official X app doesn't have Brazilian Portuguese string resources.
+     * So, add the strings instead of trying to replace them.
+     */
+    fun updateStrings(context: ResourceContext) {
+        if (!context["res/values-pt"].exists()) {
+            // User likely intentionally excluded the Portuguese split when merging split APKs.
+            // In this case, there is no need to add the pt-rBR strings.
+            return
+        }
+
+        val stringsFile = context["res/values-pt-rBR/strings.xml"]
+
+        // Note: If SettingsPatch was executed prior to this patch, stringsFile will exist.
+        if (!stringsFile.exists()) {
+            context["res/values-pt-rBR"].mkdirs()
+            FileWriter(stringsFile).use {
+                it.write("<?xml version=\"1.0\" encoding=\"utf-8\"?><resources></resources>")
+            }
+        }
+
+        // Append strings from the map.
+        context.xmlEditor[stringsFile.toString()].use {
+            val document = it.file
+            val parentNode = document.getElementsByTagName("resources").item(0)
+
+            for ((key, value) in values) {
+                val newElement = document.createElement("string")
+                newElement.setAttribute("name", key)
+                newElement.textContent = value
+
+                parentNode.appendChild(newElement)
+            }
+        }
+    }
 }

…/misc/bringbacktwitter/strings/pt_rBR.kt …ktwitter/custromstringsupdater/pt_rBR.ktsrc/main/kotlin/crimera/patches/twitter/misc/bringbacktwitter/strings/pt_rBR.kt renamed to src/main/kotlin/crimera/patches/twitter/misc/bringbacktwitter/custromstringsupdater/pt_rBR.kt src/main/kotlin/crimera/patches/twitter/misc/bringbacktwitter/strings/pt_rBR.kt renamed to src/main/kotlin/crimera/patches/twitter/misc/bringbacktwitter/custromstringsupdater/pt_rBR.kt

@@ -6,7 +6,6 @@ object StringsMap {
         "values-en-rGB" to en_rGB.values,
         "values-ru" to ru.values,
         "values-hi" to hi.values,
-        "values-pt-rBR" to pt_rBR.values,
         "values-tr" to tr.values,
         "values-zh-rCN" to zh_rCN.values,
         "values-zh-rTW" to zh_rTW.values,

src/main/kotlin/crimera/patches/twitter/misc/bringbacktwitter/strings/StringsMap.kt

@@ -0,0 +1,50 @@
+package crimera.patches.twitter.misc.customize.postFontSize
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
+import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchException
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+import crimera.patches.twitter.misc.settings.SettingsPatch
+import crimera.patches.twitter.misc.settings.fingerprints.SettingsStatusLoadFingerprint
+
+object CustomizePostFontSizeFingerprint : MethodFingerprint(
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
+    customFingerprint = { methodDef, _ ->
+        methodDef.definingClass.endsWith("TextContentView;")
+    },
+)
+
+@Patch(
+    name = "Customise post font size",
+    description = "",
+    dependencies = [SettingsPatch::class],
+    compatiblePackages = [CompatiblePackage("com.twitter.android")],
+    use = true,
+)
+object CustomizePostFontSize : BytecodePatch(
+    setOf(CustomizePostFontSizeFingerprint, SettingsStatusLoadFingerprint),
+) {
+    override fun execute(context: BytecodeContext) {
+        val result1 =
+            CustomizePostFontSizeFingerprint.result
+                ?: throw PatchException("CustomizePostFontSizeFingerprint not found")
+
+        val method1 = result1.mutableMethod
+
+        val index1 =
+            method1
+                .getInstructions()
+                .last { it.opcode == Opcode.MOVE_RESULT }
+                .location.index
+        method1.addInstruction(index1 + 1, "sget p1, ${SettingsPatch.PREF_DESCRIPTOR};->POST_FONT_SIZE:F")
+
+        SettingsStatusLoadFingerprint.enableSettings("customPostFontSize")
+    }
+}

src/main/kotlin/crimera/patches/twitter/misc/customize/postFontSize/CustomizePostFontSize.kt

@@ -30,7 +30,7 @@ object SettingsResourcePatch : ResourcePatch() {
             parent.appendChild(prefMod)
         }
 
-        //credits aero
+        // credits aero
         val sideBarLayout = context["res/layout/main_activity_app_bar.xml"]
         if (!sideBarLayout.exists()) throw PatchException("settings_root not found")
 
@@ -53,23 +53,39 @@ object SettingsResourcePatch : ResourcePatch() {
             parent.appendChild(sideBtn)
         }
 
-        //credits @inotia00
+        // credits @inotia00
         context.appendStrings("twitter/settings", "values/strings.xml")
         context.appendStrings("twitter/settings", "values/arrays.xml")
 
         /**
          * create directory for the untranslated language resources
          */
-        val languages = arrayOf(
-            "es", "ar", "ja", "hi", "in", "zh-rCN", "ru", "pl", "pt-rBR", "v21", "tr", "zh-rTW"
-        ).map { "values-$it" }
+        val languages =
+            arrayOf(
+                "es",
+                "ar",
+                "ja",
+                "hi",
+                "in",
+                "zh-rCN",
+                "ru",
+                "pl",
+                "pt-rBR",
+                "v21",
+                "tr",
+                "zh-rTW",
+            ).map { "values-$it" }
 
         languages.forEach {
+//            println("res/$it")
             if (context["res/$it"].exists()) {
                 context.appendStrings("twitter/settings", "$it/strings.xml")
             } else {
                 context["res/$it"].mkdirs()
                 context.copyResources("twitter/settings", ResourceGroup(it, "strings.xml"))
+                if (it.contains("v21")) {
+                    context.copyResources("twitter/settings", ResourceGroup(it, "arrays.xml"))
+                }
             }
         }
     }

src/main/kotlin/crimera/patches/twitter/misc/settings/SettingsResourcePatch.kt

@@ -18,7 +18,7 @@ object ShareMenuButtonAddHook : MethodFingerprint(
             "3691233323:audiospace",
         ),
     customFingerprint = { methodDef, _ ->
-        methodDef.name == "a"
+        methodDef.name == "a" && methodDef.parameters.size == 4
     },
 ) {
     fun addButton(