fix(YouTube - Change form factor): Restore Automotive form factor watch history menu, channel pages, and community posts (#4541)

2025-03-06 08:26:09 +02:00
parent 5bd2e86afe
commit aa5c001968
6 changed files with 173 additions and 12 deletions
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/formfactor/ChangeFormFactorPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/formfactor/ChangeFormFactorPatch.kt
@ -6,7 +6,9 @@ import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patches.all.misc.resources.addResources
 import app.revanced.patches.all.misc.resources.addResourcesPatch
 import app.revanced.patches.shared.misc.settings.preference.ListPreference
+import app.revanced.patches.youtube.layout.buttons.navigation.navigationButtonsPatch
 import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch
+import app.revanced.patches.youtube.misc.navigation.hookNavigationButtonCreated
 import app.revanced.patches.youtube.misc.settings.PreferenceScreen
 import app.revanced.patches.youtube.misc.settings.settingsPatch
 import app.revanced.util.getReference
@ -15,7 +17,7 @@ import com.android.tools.smali.dexlib2.Opcode
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference

-internal const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/youtube/patches/ChangeFormFactorPatch;"
+private const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/youtube/patches/ChangeFormFactorPatch;"

@Suppress("unused")
 val changeFormFactorPatch = bytecodePatch(
@ -26,6 +28,7 @@ val changeFormFactorPatch = bytecodePatch(
        sharedExtensionPatch,
        settingsPatch,
        addResourcesPatch,
+        navigationButtonsPatch
    )

    compatibleWith(
@ -50,6 +53,8 @@ val changeFormFactorPatch = bytecodePatch(
            )
        )

+        hookNavigationButtonCreated(EXTENSION_CLASS_DESCRIPTOR)
+
        createPlayerRequestBodyWithModelFingerprint.method.apply {
            val formFactorEnumClass = formFactorEnumConstructorFingerprint.originalClassDef.type

--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/navigation/Fingerprints.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/navigation/Fingerprints.kt
@ -16,6 +16,23 @@ internal val actionBarSearchResultsFingerprint = fingerprint {
    literal { actionBarSearchResultsViewMicId }
 }

+internal val toolbarLayoutFingerprint = fingerprint {
+    accessFlags(AccessFlags.PROTECTED, AccessFlags.CONSTRUCTOR)
+    literal { toolbarContainerId }
+}
+
+/**
+ * Matches to https://android.googlesource.com/platform/frameworks/support/+/9eee6ba/v7/appcompat/src/android/support/v7/widget/Toolbar.java#963
+ */
+internal val appCompatToolbarBackButtonFingerprint = fingerprint {
+    accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
+    returns("Landroid/graphics/drawable/Drawable;")
+    parameters()
+    custom { methodDef, classDef ->
+        classDef.type == "Landroid/support/v7/widget/Toolbar;"
+    }
+}
+
 /**
 * Matches to the class found in [pivotBarConstructorFingerprint].
 */
--- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/navigation/NavigationBarHookPatch.kt
+++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/navigation/NavigationBarHookPatch.kt
@ -8,6 +8,7 @@ import app.revanced.patcher.patch.PatchException
 import app.revanced.patcher.patch.bytecodePatch
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.shared.misc.mapping.get
 import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
 import app.revanced.patches.shared.misc.mapping.resourceMappings
@ -18,12 +19,16 @@ import app.revanced.util.getReference
 import app.revanced.util.indexOfFirstInstructionOrThrow
 import app.revanced.util.indexOfFirstInstructionReversedOrThrow
 import app.revanced.util.indexOfFirstLiteralInstructionOrThrow
+import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.builder.MutableMethodImplementation
 import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.Instruction
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+import com.android.tools.smali.dexlib2.iface.reference.TypeReference
+import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
 import com.android.tools.smali.dexlib2.util.MethodUtil

 internal var imageOnlyTabResourceId = -1L
@ -32,6 +37,8 @@ internal var actionBarSearchResultsViewMicId = -1L
    private set
 internal var ytFillBellId = -1L
    private set
+internal var toolbarContainerId = -1L
+    private set

 private val navigationBarHookResourcePatch = resourcePatch {
    dependsOn(resourceMappingPatch)
@ -40,6 +47,7 @@ private val navigationBarHookResourcePatch = resourcePatch {
        imageOnlyTabResourceId = resourceMappings["layout", "image_only_tab"]
        actionBarSearchResultsViewMicId = resourceMappings["layout", "action_bar_search_results_view_mic"]
        ytFillBellId = resourceMappings["drawable", "yt_fill_bell_black_24"]
+        toolbarContainerId = resourceMappings["id", "toolbar_container"]
    }
 }

@ -47,6 +55,8 @@ internal const val EXTENSION_CLASS_DESCRIPTOR =
    "Lapp/revanced/extension/youtube/shared/NavigationBar;"
 internal const val EXTENSION_NAVIGATION_BUTTON_DESCRIPTOR =
    "Lapp/revanced/extension/youtube/shared/NavigationBar\$NavigationButton;"
+private const val EXTENSION_TOOLBAR_INTERFACE =
+    "Lapp/revanced/extension/youtube/shared/NavigationBar${'$'}AppCompatToolbarPatchInterface;"

 lateinit var hookNavigationButtonCreated: (String) -> Unit

@ -143,11 +153,58 @@ val navigationBarHookPatch = bytecodePatch(description = "Hooks the active navig
            )
        }

+        // Hook the back button visibility.
+
+        toolbarLayoutFingerprint.method.apply {
+            val index = indexOfFirstInstructionOrThrow {
+                opcode == Opcode.CHECK_CAST && getReference<TypeReference>()?.type ==
+                        "Lcom/google/android/apps/youtube/app/ui/actionbar/MainCollapsingToolbarLayout;"
+            }
+            val register = getInstruction<OneRegisterInstruction>(index).registerA
+
+            addInstruction(
+                index + 1,
+                "invoke-static { v$register }, ${EXTENSION_CLASS_DESCRIPTOR}->setToolbar(Landroid/widget/FrameLayout;)V"
+            )
+        }
+
+        // Add interface for extensions code to call obfuscated methods.
+        appCompatToolbarBackButtonFingerprint.let {
+            it.classDef.apply {
+                interfaces.add(EXTENSION_TOOLBAR_INTERFACE)
+
+                val definingClass = type
+                val obfuscatedMethodName = it.originalMethod.name
+                val returnType = "Landroid/graphics/drawable/Drawable;"
+
+                methods.add(
+                    ImmutableMethod(
+                        definingClass,
+                        "patch_getNavigationIcon",
+                        listOf(),
+                        returnType,
+                        AccessFlags.PUBLIC.value or AccessFlags.FINAL.value,
+                        null,
+                        null,
+                        MutableMethodImplementation(2),
+                    ).toMutable().apply {
+                        addInstructions(
+                            0,
+                            """
+                                invoke-virtual { p0 }, $definingClass->$obfuscatedMethodName()$returnType
+                                move-result-object v0
+                                return-object v0
+                            """
+                        )
+                    }
+                )
+            }
+        }
+
        hookNavigationButtonCreated = { extensionClassDescriptor ->
            navigationBarHookCallbackFingerprint.method.addInstruction(
                0,
-                "invoke-static { p0, p1 }, " +
-                    "$extensionClassDescriptor->navigationTabCreated" +
+                "invoke-static { p0, p1 }, $extensionClassDescriptor->navigationTabCreated" +
                    "(${EXTENSION_NAVIGATION_BUTTON_DESCRIPTOR}Landroid/view/View;)V",
            )
        }
--- a/patches/src/main/resources/addresources/values/strings.xml
+++ b/patches/src/main/resources/addresources/values/strings.xml
@ -1132,10 +1132,8 @@ Tablet layout
 • Community posts are hidden

 Automotive layout
-• Watch history menu is hidden
-• Explore tab is restored
 • Shorts open in the regular player
-• Feed is organized by topics and channel"</string>
+• Feed is organized by topics and channels"</string>
        </patch>
        <patch id="layout.spoofappversion.spoofAppVersionPatch">
            <string name="revanced_spoof_app_version_title">Spoof app version</string>