Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(YouTube): Support version 19.03.35 #2640

Merged
merged 2 commits into from
Jan 24, 2024
Merged

feat(YouTube): Support version 19.03.35 #2640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88f5098
feat(YouTube): Support version `19.03.35`
LisoUseInAIKyrios Jan 24, 2024
baddd39
Add 19.03.35. Increment unreleased support of 19.02.34 to 19.02.39
LisoUseInAIKyrios Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction35c
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...tlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...tlin/app/revanced/patches/youtube/interaction/downloads/ExternalDownloadsBytecodePatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import app.revanced.patches.youtube.video.information.VideoInformationPatch
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
),
]
Expand Down
3 changes: 2 additions & 1 deletion ...lin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
],
Expand Down
3 changes: 2 additions & 1 deletion ...tlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ import com.android.tools.smali.dexlib2.immutable.ImmutableMethod
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
],
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...in/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...in/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ import com.android.tools.smali.dexlib2.Opcode
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...n/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion .../kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction3rc
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/layout/hide/breakingnews/BreakingNewsPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...n/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.formats.Instruction21c
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...anced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...ed/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...kotlin/app/revanced/patches/youtube/layout/hide/loadmorebutton/HideLoadMoreButtonPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion ...lin/app/revanced/patches/youtube/layout/hide/personalinformation/HideEmailAddressPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion .../revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ import app.revanced.patches.youtube.misc.settings.SettingsPatch
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion .../revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ import app.revanced.patches.youtube.shared.fingerprints.SeekbarOnDrawFingerprint
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
7 changes: 5 additions & 2 deletions src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand All @@ -59,6 +60,8 @@ object HideShortsComponentsPatch : BytecodePatch(
override fun execute(context: BytecodeContext) {
// region Hide the Shorts shelf.

// This patch point is not present in 19.03.x and greater.
// If 19.02.x and lower is dropped, then this section of code and the fingerprint should be removed.
ReelConstructorFingerprint.result?.let {
LisoUseInAIKyrios marked this conversation as resolved.
Show resolved Hide resolved
it.mutableMethod.apply {
val insertIndex = it.scanResult.patternScanResult!!.startIndex + 2
Expand All @@ -71,7 +74,7 @@ object HideShortsComponentsPatch : BytecodePatch(
"hideShortsShelf"
)
}
} ?: throw ReelConstructorFingerprint.exception
} // Do not throw an exception if not resolved.

// endregion

Expand Down
12 changes: 9 additions & 3 deletions ...tlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,15 @@ object HideShortsComponentsResourcePatch : ResourcePatch() {
)
)

fun String.getId() = ResourceMappingPatch.resourceMappings.single { it.name == this }.id
ResourceMappingPatch.resourceMappings.find {
it.type == "layout" && it.name == "reel_multiple_items_shelf"
}?.also {
reelMultipleItemShelfId = it.id
}

reelMultipleItemShelfId = "reel_multiple_items_shelf".getId()
reelPlayerRightCellButtonHeight = "reel_player_right_cell_button_height".getId()
reelPlayerRightCellButtonHeight =
ResourceMappingPatch.resourceMappings.single {
it.type == "dimen" && it.name == "reel_player_right_cell_button_height"
}.id
}
}
12 changes: 9 additions & 3 deletions ...pp/revanced/patches/youtube/layout/hide/shorts/fingerprints/ReelConstructorFingerprint.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
package app.revanced.patches.youtube.layout.hide.shorts.fingerprints

import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint
import app.revanced.patches.youtube.layout.hide.shorts.HideShortsComponentsResourcePatch
import app.revanced.util.patch.LiteralValueFingerprint
import app.revanced.util.containsWideLiteralInstructionValue
import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.Opcode

internal object ReelConstructorFingerprint : LiteralValueFingerprint(
internal object ReelConstructorFingerprint : MethodFingerprint(
accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
opcodes = listOf(Opcode.INVOKE_VIRTUAL),
literalSupplier = { HideShortsComponentsResourcePatch.reelMultipleItemShelfId }
customFingerprint = { methodDef, _ ->
// Cannot use LiteralValueFingerprint, because the resource id may not be present.
val reelMultipleItemShelfId = HideShortsComponentsResourcePatch.reelMultipleItemShelfId
reelMultipleItemShelfId != -1L
&& methodDef.containsWideLiteralInstructionValue(reelMultipleItemShelfId)
}
)
3 changes: 2 additions & 1 deletion ...atches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
"18.48.39",
"18.49.37",
"19.01.34",
"19.02.34"
"19.02.39",
"19.03.35"
]
)
]
Expand Down
Loading