chore: Merge branch dev to main (#3295)

CHANGELOG.md

@@ -1,3 +1,24 @@
+# [2.198.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.197.1-dev.2...v2.198.0-dev.1) (2023-11-19)
+
+
+### Features
+
+* **YouTube - Custom branding:** Add "YT ReVanced" to the default app name options ([#3300](https://github.com/ReVanced/revanced-patches/issues/3300)) ([b86bac7](https://github.com/ReVanced/revanced-patches/commit/b86bac759ebad62173b644d4a74e7bed5f252d42))
+
+## [2.197.1-dev.2](https://github.com/ReVanced/revanced-patches/compare/v2.197.1-dev.1...v2.197.1-dev.2) (2023-11-18)
+
+
+### Bug Fixes
+
+* **YouTube - ReturnYouTubeDislike:** Fix text alignment on videos that don't use rolling number animations ([8fe9df7](https://github.com/ReVanced/revanced-patches/commit/8fe9df75efa59faa9586eda8462d97f81b9f8ed0))
+
+## [2.197.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.197.0...v2.197.1-dev.1) (2023-11-18)
+
+
+### Bug Fixes
+
+* **YouTube - ReturnYouTubeDislike:** Improve layout padding ([#3291](https://github.com/ReVanced/revanced-patches/issues/3291)) ([630b067](https://github.com/ReVanced/revanced-patches/commit/630b067b1828476708fd019e84153b0fb5e25d1c))
+
 # [2.197.0](https://github.com/ReVanced/revanced-patches/compare/v2.196.0...v2.197.0) (2023-11-18)
 
 

gradle.properties

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

src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt

@@ -43,6 +43,7 @@ object CustomBrandingPatch : ResourcePatch() {
         default = APP_NAME,
         values = mapOf(
             "YouTube ReVanced" to APP_NAME,
+            "YT ReVanced" to "YT ReVanced",
             "YT" to "YT",
             "YouTube" to "YouTube",
         ),

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt

@@ -55,7 +55,8 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
         DislikeFingerprint,
         RemoveLikeFingerprint,
         RollingNumberSetterFingerprint,
-        RollingNumberTextViewFingerprint
+        RollingNumberTextViewFingerprint,
+        RollingNumberMeasureTextParentFingerprint
     )
 ) {
     private const val INTEGRATIONS_CLASS_DESCRIPTOR =
@@ -181,6 +182,51 @@ object ReturnYouTubeDislikePatch : BytecodePatch(
             }
         } ?: throw RollingNumberSetterFingerprint.exception
 
+        // Rolling Number text views use the measured width of the raw string for layout.
+        // Modify the measure text calculation to include the left drawable separator if needed.
+        RollingNumberMeasureTextFingerprint.also {
+            if (!it.resolve(context, RollingNumberMeasureTextParentFingerprint.result!!.classDef))
+                throw it.exception
+        }.result?.also {
+            it.mutableMethod.apply {
+                val returnInstructionIndex = it.scanResult.patternScanResult!!.endIndex
+                val measuredTextWidthRegister =
+                    getInstruction<OneRegisterInstruction>(returnInstructionIndex).registerA
+
+                replaceInstruction( // Replace instruction to preserve control flow label.
+                    returnInstructionIndex,
+                    "invoke-static {p1, v$measuredTextWidthRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->onRollingNumberMeasured(Ljava/lang/String;F)F"
+                )
+                addInstructions(
+                    returnInstructionIndex + 1,
+                    """
+                        move-result v$measuredTextWidthRegister
+                        return v$measuredTextWidthRegister
+                    """
+                )
+            }
+        } ?: throw RollingNumberMeasureTextFingerprint.exception
+
+        // Additional text measurement method. Used if YouTube decides not to animate the likes count
+        // and sometimes used for initial video load.
+        RollingNumberStaticLabelMeasureTextFingerprint.also {
+            if (!it.resolve(context, RollingNumberMeasureTextParentFingerprint.result!!.classDef))
+                throw it.exception
+        }.result?.also {
+            it.mutableMethod.apply {
+                val measureTextIndex = it.scanResult.patternScanResult!!.startIndex + 1
+                val freeRegister = getInstruction<TwoRegisterInstruction>(0).registerA
+
+                addInstructions(
+                    measureTextIndex + 1,
+                    """
+                        move-result v$freeRegister
+                        invoke-static {p1, v$freeRegister}, $INTEGRATIONS_CLASS_DESCRIPTOR->onRollingNumberMeasured(Ljava/lang/String;F)F
+                    """
+                )
+            }
+        } ?: throw RollingNumberStaticLabelMeasureTextFingerprint.exception
+
         // The rolling number Span is missing styling since it's initially set as a String.
         // Modify the UI text view and use the styled like/dislike Span.
         RollingNumberTextViewFingerprint.result?.let {

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RollingNumberMeasureTextFingerprint.kt

@@ -0,0 +1,23 @@
+package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+/**
+ * Resolves to class found in [RollingNumberMeasureTextParentFingerprint].
+ */
+object RollingNumberMeasureTextFingerprint : MethodFingerprint(
+    returnType = "F",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("Ljava/lang/String;"),
+    opcodes = listOf(
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.ADD_FLOAT_2ADDR,
+        Opcode.ADD_INT_LIT8,
+        Opcode.GOTO,
+        Opcode.RETURN
+    )
+)

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RollingNumberMeasureTextParentFingerprint.kt

@@ -0,0 +1,12 @@
+package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+
+object RollingNumberMeasureTextParentFingerprint : MethodFingerprint(
+    returnType = "Ljava/lang/String;",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf(),
+    strings = listOf("RollingNumberFontProperties{paint=")
+)

src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/RollingNumberStaticLabelMeasureTextFingerprint.kt

@@ -0,0 +1,21 @@
+package app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.fingerprint.MethodFingerprint
+import com.android.tools.smali.dexlib2.AccessFlags
+import com.android.tools.smali.dexlib2.Opcode
+
+/**
+ * Resolves to class found in [RollingNumberMeasureTextParentFingerprint].
+ */
+object RollingNumberStaticLabelMeasureTextFingerprint : MethodFingerprint(
+    returnType = "F",
+    accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
+    parameters = listOf("Ljava/lang/String;"),
+    opcodes = listOf(
+        Opcode.IGET_OBJECT,
+        Opcode.INVOKE_VIRTUAL,
+        Opcode.MOVE_RESULT,
+        Opcode.RETURN
+    )
+)