diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt index 098e840ef..a36d3ff5d 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt @@ -78,8 +78,6 @@ val hideAdsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt index b0b2af45b..c4fb21b15 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt @@ -25,8 +25,6 @@ val hideGetPremiumPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt index 1a33bdfa0..e2a00c496 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt @@ -23,8 +23,6 @@ val videoAdsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlPatch.kt index 129db7807..928b87355 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlPatch.kt @@ -53,8 +53,6 @@ val copyVideoUrlPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt index bbf583766..054c18e1c 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt @@ -24,8 +24,6 @@ val removeViewerDiscretionDialogPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt index a647e589c..8e5c95f24 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt @@ -68,8 +68,6 @@ val downloadsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt index 20653ce2e..79e788961 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt @@ -23,8 +23,6 @@ val disablePreciseSeekingGesturePatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt index 4aaaead45..48c4b7468 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt @@ -26,8 +26,6 @@ val enableSeekbarTappingPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - // 18.38.44 patches but crashes on startup. - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt index 4f6ef7ba4..2fb042567 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt @@ -35,7 +35,6 @@ val enableSlideToSeekPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarThumbnailsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarThumbnailsPatch.kt index e5fcc8414..a539aaa5b 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarThumbnailsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarThumbnailsPatch.kt @@ -19,7 +19,7 @@ private const val EXTENSION_CLASS_DESCRIPTOR = val seekbarThumbnailsPatch = bytecodePatch( name = "Seekbar thumbnails", description = "Adds an option to use high quality fullscreen seekbar thumbnails. " + - "Patching 19.16.39 or lower adds an option to restore old seekbar thumbnails.", + "Patching 19.16.39 adds an option to restore old seekbar thumbnails.", ) { dependsOn( sharedExtensionPatch, @@ -29,8 +29,6 @@ val seekbarThumbnailsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsPatch.kt index 5bececd59..1090e7b92 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsPatch.kt @@ -74,8 +74,6 @@ val swipeControlsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt index 17187b4b1..c8fa4c558 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt @@ -22,8 +22,6 @@ val autoCaptionsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt index f0435a6a3..b20a3fe6c 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/CustomBrandingPatch.kt @@ -43,8 +43,6 @@ val customBrandingPatch = resourcePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt index 69e54cc4b..3219333cf 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/ChangeHeaderPatch.kt @@ -41,8 +41,6 @@ val changeHeaderPatch = resourcePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt index 2d0dfbfe2..7b36f3648 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt @@ -22,8 +22,6 @@ val hideButtonsPatch = resourcePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt index 0f7647b4c..06e872f3c 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt @@ -40,8 +40,6 @@ val navigationButtonsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/overlay/HidePlayerOverlayButtonsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/overlay/HidePlayerOverlayButtonsPatch.kt index 75d250f2d..76cd99d15 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/overlay/HidePlayerOverlayButtonsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/buttons/overlay/HidePlayerOverlayButtonsPatch.kt @@ -54,8 +54,6 @@ val hidePlayerOverlayButtonsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git 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 index b7621b02f..bf800b643 100644 --- 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 @@ -30,8 +30,6 @@ val changeFormFactorPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt index 4f5663317..e33732c1d 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt @@ -56,8 +56,6 @@ val hideEndscreenCardsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt index 041436494..816dad7b5 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt @@ -29,8 +29,6 @@ val disableFullscreenAmbientModePatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt index d55358386..2159229ed 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt @@ -125,8 +125,6 @@ val hideLayoutComponentsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt index 2197bf69d..8c9e5bec9 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt @@ -57,8 +57,6 @@ val hideInfoCardsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt index 2795dc41f..057e18718 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt @@ -24,8 +24,6 @@ val hidePlayerFlyoutMenuPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt index 8dac00f2c..f689fe3c8 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt @@ -29,8 +29,6 @@ val disableRollingNumberAnimationPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - // 18.43 is the earliest target this patch works. - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt index 52d128592..4d0adeaee 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt @@ -25,8 +25,6 @@ val hideSeekbarPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/Fingerprints.kt index 5a2a2ac64..7d563f3c7 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/Fingerprints.kt @@ -30,12 +30,6 @@ internal val createShortsButtonsFingerprint = fingerprint { literal { reelPlayerRightCellButtonHeight } } -internal val reelConstructorFingerprint = fingerprint { - accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR) - opcodes(Opcode.INVOKE_VIRTUAL) - literal { reelMultipleItemShelfId } -} - internal val renderBottomNavigationBarFingerprint = fingerprint { returns("V") parameters("Ljava/lang/String;") diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt index fb0cfe999..e41cc727c 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt @@ -18,7 +18,6 @@ import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch import app.revanced.patches.youtube.misc.litho.filter.addLithoFilter import app.revanced.patches.youtube.misc.litho.filter.lithoFilterPatch import app.revanced.patches.youtube.misc.navigation.navigationBarHookPatch -import app.revanced.patches.youtube.misc.playservice.is_19_03_or_greater import app.revanced.patches.youtube.misc.playservice.is_19_41_or_greater import app.revanced.patches.youtube.misc.playservice.versionCheckPatch import app.revanced.patches.youtube.misc.settings.PreferenceScreen @@ -27,11 +26,8 @@ import app.revanced.util.* import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction -import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction import com.android.tools.smali.dexlib2.iface.reference.MethodReference -internal var reelMultipleItemShelfId = -1L - private set internal var reelPlayerRightCellButtonHeight = -1L private set internal var bottomBarContainer = -1L @@ -155,13 +151,6 @@ private val hideShortsComponentsResourcePatch = resourcePatch { "dimen", "reel_player_right_pivot_v2_size", ] - - if (!is_19_03_or_greater) { - reelMultipleItemShelfId = resourceMappings[ - "dimen", - "reel_player_right_cell_button_height", - ] - } } } @@ -183,8 +172,6 @@ val hideShortsComponentsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", @@ -199,25 +186,6 @@ val hideShortsComponentsPatch = bytecodePatch( hideShortsWidgetOption() execute { - // region Hide the Shorts shelf. - - // This patch point is not present in 19.03.x and greater. - if (!is_19_03_or_greater && reelConstructorFingerprint.methodOrNull != null) { - reelConstructorFingerprint.method.apply { - val insertIndex = reelConstructorFingerprint.patternMatch!!.startIndex + 2 - val viewRegister = getInstruction(insertIndex).registerA - - injectHideViewCall( - insertIndex, - viewRegister, - FILTER_CLASS_DESCRIPTOR, - "hideShortsShelf", - ) - } - } - - // endregion - // region Hide the Shorts buttons in older versions of YouTube. // Some Shorts buttons are views, hide them by setting their visibility to GONE. diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt index b9c488c00..822de8994 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt @@ -54,8 +54,6 @@ val disableSuggestedVideoEndScreenPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt index cce98d701..2943d7fd2 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt @@ -21,8 +21,6 @@ val hideTimestampPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt index d989d41d0..086c2c8bf 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/MiniplayerPatch.kt @@ -79,53 +79,52 @@ private val miniplayerResourcePatch = resourcePatch { "player_overlays", ] - if (is_19_16_or_greater) { - modernMiniplayerClose = resourceMappings[ - "id", - "modern_miniplayer_close", + + modernMiniplayerClose = resourceMappings[ + "id", + "modern_miniplayer_close", + ] + + modernMiniplayerExpand = resourceMappings[ + "id", + "modern_miniplayer_expand", + ] + + modernMiniplayerRewindButton = resourceMappings[ + "id", + "modern_miniplayer_rewind_button", + ] + + modernMiniplayerForwardButton = resourceMappings[ + "id", + "modern_miniplayer_forward_button", + ] + + // Resource id is not used during patching, but is used by extension. + // Verify the resource is present while patching. + resourceMappings[ + "id", + "modern_miniplayer_subtitle_text", + ] + + // Only required for exactly 19.16 + if (!is_19_17_or_greater) { + ytOutlinePictureInPictureWhite24 = resourceMappings[ + "drawable", + "yt_outline_picture_in_picture_white_24", ] - modernMiniplayerExpand = resourceMappings[ - "id", - "modern_miniplayer_expand", + ytOutlineXWhite24 = resourceMappings[ + "drawable", + "yt_outline_x_white_24", ] + } - modernMiniplayerRewindButton = resourceMappings[ - "id", - "modern_miniplayer_rewind_button", + if (is_19_26_or_greater) { + miniplayerMaxSize = resourceMappings[ + "dimen", + "miniplayer_max_size", ] - - modernMiniplayerForwardButton = resourceMappings[ - "id", - "modern_miniplayer_forward_button", - ] - - // Resource id is not used during patching, but is used by extension. - // Verify the resource is present while patching. - resourceMappings[ - "id", - "modern_miniplayer_subtitle_text", - ] - - // Only required for exactly 19.16 - if (!is_19_17_or_greater) { - ytOutlinePictureInPictureWhite24 = resourceMappings[ - "drawable", - "yt_outline_picture_in_picture_white_24", - ] - - ytOutlineXWhite24 = resourceMappings[ - "drawable", - "yt_outline_x_white_24", - ] - } - - if (is_19_26_or_greater) { - miniplayerMaxSize = resourceMappings[ - "dimen", - "miniplayer_max_size", - ] - } } } } @@ -146,9 +145,6 @@ val miniplayerPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - // 18.49.37 // Could be supported, but no reason when 19.16 exists and has modern types. - // 19.14.43 // Incomplete code for modern miniplayers. - // 19.15.36 // Different code for handling subtitle texts and not worth supporting. "19.16.39", // First with modern miniplayers. // 19.17.41 // Works without issues, but no reason to recommend over 19.16. // 19.18.41 // Works without issues, but no reason to recommend over 19.16. diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt index 8910157cb..69cdf7f92 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt @@ -21,8 +21,6 @@ val playerPopupPanelsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt index e573640c3..6455f69b7 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt @@ -12,8 +12,6 @@ val playerControlsBackgroundPatch = resourcePatch( ) { compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/ExitFullscreenPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/ExitFullscreenPatch.kt index 105494a22..415b970fd 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/ExitFullscreenPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/ExitFullscreenPatch.kt @@ -21,8 +21,6 @@ internal val exitFullscreenPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityPatch.kt index 67e3b8424..98cb3eb00 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityPatch.kt @@ -52,8 +52,6 @@ val customPlayerOverlayOpacityPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt index 68afe01e4..84d48468a 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt @@ -54,7 +54,6 @@ val returnYouTubeDislikePatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt index 5eaf7c83b..f7eda01f9 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt @@ -29,8 +29,6 @@ val wideSearchbarPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsautoplay/ShortsAutoplayPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsautoplay/ShortsAutoplayPatch.kt index 98d4ca652..63f598576 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsautoplay/ShortsAutoplayPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsautoplay/ShortsAutoplayPatch.kt @@ -33,7 +33,6 @@ val shortsAutoplayPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsplayer/OpenShortsInRegularPlayerPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsplayer/OpenShortsInRegularPlayerPatch.kt index 247a49d78..8ef858590 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsplayer/OpenShortsInRegularPlayerPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/shortsplayer/OpenShortsInRegularPlayerPatch.kt @@ -41,8 +41,6 @@ val openShortsInRegularPlayerPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockPatch.kt index 19c6461cb..78edfff91 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockPatch.kt @@ -106,8 +106,6 @@ val sponsorBlockPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt index 5eccd583d..b233693de 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt @@ -21,7 +21,7 @@ val spoofAppVersionPatch = bytecodePatch( name = "Spoof app version", description = "Adds an option to trick YouTube into thinking you are running an older version of the app. " + "This can be used to restore old UI elements and features. " + - "Patching 19.16.39 or lower includes additional older spoofing targets.", + "Patching 19.16.39 includes additional older spoofing targets.", ) { dependsOn( sharedExtensionPatch, @@ -32,8 +32,6 @@ val spoofAppVersionPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", // "19.25.37", // Cannot be supported because the lowest spoof target is higher. // "19.34.42", // Cannot be supported because the lowest spoof target is higher. diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt index 7cfc7b17a..d788aad60 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startpage/ChangeStartPagePatch.kt @@ -29,8 +29,6 @@ val changeStartPagePatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt index 1b7188c96..60ba9483e 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt @@ -31,8 +31,6 @@ val disableResumingShortsOnStartupPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt index 285909ce4..587e56c12 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemePatch.kt @@ -208,8 +208,6 @@ val themePatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt index c50f02a05..1fa6868b3 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt @@ -33,8 +33,6 @@ val alternativeThumbnailsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/BypassImageRegionRestrictionsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/BypassImageRegionRestrictionsPatch.kt index 01902ff6a..9ce2382e1 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/BypassImageRegionRestrictionsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/BypassImageRegionRestrictionsPatch.kt @@ -27,8 +27,6 @@ val bypassImageRegionRestrictionsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt index 2fab9db10..ad35f26d1 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/announcements/AnnouncementsPatch.kt @@ -23,8 +23,6 @@ val announcementsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt index 9953f5fc8..04aa54085 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt @@ -24,8 +24,6 @@ val autoRepeatPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/backgroundplayback/BackgroundPlaybackPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/backgroundplayback/BackgroundPlaybackPatch.kt index 3779f96f5..a817b68da 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/backgroundplayback/BackgroundPlaybackPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/backgroundplayback/BackgroundPlaybackPatch.kt @@ -48,8 +48,6 @@ val backgroundPlaybackPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/EnableDebuggingPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/EnableDebuggingPatch.kt index cebfd6b5e..6cbc47b7d 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/EnableDebuggingPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/debugging/EnableDebuggingPatch.kt @@ -8,7 +8,6 @@ import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPref import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPreference.Sorting import app.revanced.patches.shared.misc.settings.preference.SwitchPreference import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch -import app.revanced.patches.youtube.misc.playservice.is_19_16_or_greater import app.revanced.patches.youtube.misc.playservice.versionCheckPatch import app.revanced.patches.youtube.misc.settings.PreferenceScreen import app.revanced.patches.youtube.misc.settings.settingsPatch @@ -32,8 +31,6 @@ val enableDebuggingPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", @@ -95,22 +92,21 @@ val enableDebuggingPatch = bytecodePatch( ) } - if (is_19_16_or_greater) { - experimentalLongFeatureFlagFingerprint.match( - experimentalFeatureFlagParentFingerprint.originalClassDef - ).method.apply { - val insertIndex = indexOfFirstInstructionOrThrow(Opcode.MOVE_RESULT_WIDE) - addInstructions( - insertIndex, - """ - move-result-wide v0 - invoke-static/range { v0 .. v5 }, $EXTENSION_CLASS_DESCRIPTOR->isLongFeatureFlagEnabled(JJJ)J - move-result-wide v0 - return-wide v0 - """ - ) - } + experimentalLongFeatureFlagFingerprint.match( + experimentalFeatureFlagParentFingerprint.originalClassDef + ).method.apply { + val insertIndex = indexOfFirstInstructionOrThrow(Opcode.MOVE_RESULT_WIDE) + + addInstructions( + insertIndex, + """ + move-result-wide v0 + invoke-static/range { v0 .. v5 }, $EXTENSION_CLASS_DESCRIPTOR->isLongFeatureFlagEnabled(JJJ)J + move-result-wide v0 + return-wide v0 + """ + ) experimentalStringFeatureFlagFingerprint.match( experimentalFeatureFlagParentFingerprint.originalClassDef diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt index 724a0dfad..38a517010 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt @@ -24,8 +24,6 @@ val spoofDeviceDimensionsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dns/CheckWatchHistoryDomainNameResolutionPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dns/CheckWatchHistoryDomainNameResolutionPatch.kt index bf1277561..81b946e51 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dns/CheckWatchHistoryDomainNameResolutionPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/dns/CheckWatchHistoryDomainNameResolutionPatch.kt @@ -21,8 +21,6 @@ val checkWatchHistoryDomainNameResolutionPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt index 9030fa66e..e9dc66521 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt @@ -35,8 +35,6 @@ val gmsCoreSupportPatch = gmsCoreSupportPatch( compatibleWith( YOUTUBE_PACKAGE_NAME( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt index 6c90a0b8f..53e761564 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt @@ -30,8 +30,6 @@ val bypassURLRedirectsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt index 857c5da8a..4a971e058 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt @@ -41,8 +41,6 @@ val openLinksExternallyPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt index 49b7beb5d..bb1e3558e 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/playservice/VersionCheckPatch.kt @@ -5,10 +5,13 @@ package app.revanced.patches.youtube.misc.playservice import app.revanced.patcher.patch.resourcePatch import app.revanced.util.findElementByAttributeValueOrThrow +@Deprecated("19.16.39 is the lowest supported version") var is_19_03_or_greater = false private set +@Deprecated("19.16.39 is the lowest supported version") var is_19_04_or_greater = false private set +@Deprecated("19.16.39 is the lowest supported version") var is_19_16_or_greater = false private set var is_19_17_or_greater = false diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatch.kt index 28598bb51..9de31f30c 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatch.kt @@ -30,8 +30,6 @@ val removeTrackingQueryParameterPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt index 60f9bb742..683062863 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/settings/SettingsPatch.kt @@ -19,7 +19,6 @@ import app.revanced.patches.shared.misc.settings.settingsPatch import app.revanced.patches.youtube.misc.check.checkEnvironmentPatch import app.revanced.patches.youtube.misc.extension.sharedExtensionPatch import app.revanced.patches.youtube.misc.fix.playbackspeed.fixPlaybackSpeedWhilePlayingPatch -import app.revanced.patches.youtube.misc.playservice.is_19_04_or_greater import app.revanced.patches.youtube.misc.playservice.is_19_34_or_greater import app.revanced.patches.youtube.misc.playservice.versionCheckPatch import app.revanced.util.* @@ -249,13 +248,10 @@ val settingsPatch = bytecodePatch( } // Add setting to force cairo settings fragment on/off. - if (is_19_04_or_greater) { - cairoFragmentConfigFingerprint.method.insertFeatureFlagBooleanOverride( - CAIRO_CONFIG_LITERAL_VALUE, - "$activityHookClassDescriptor->useCairoSettingsFragment(Z)Z" - ) - } - + cairoFragmentConfigFingerprint.method.insertFeatureFlagBooleanOverride( + CAIRO_CONFIG_LITERAL_VALUE, + "$activityHookClassDescriptor->useCairoSettingsFragment(Z)Z" + ) } finalize { diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/spoof/SpoofVideoStreamsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/spoof/SpoofVideoStreamsPatch.kt index fec8800cf..c538bcecd 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/spoof/SpoofVideoStreamsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/spoof/SpoofVideoStreamsPatch.kt @@ -12,8 +12,6 @@ import app.revanced.patches.youtube.misc.settings.settingsPatch val spoofVideoStreamsPatch = spoofVideoStreamsPatch({ compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/ZoomHapticsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/ZoomHapticsPatch.kt index f4decc798..cbf524865 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/ZoomHapticsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/zoomhaptics/ZoomHapticsPatch.kt @@ -21,8 +21,6 @@ val zoomHapticsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/video/audio/ForceOriginalAudioPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/video/audio/ForceOriginalAudioPatch.kt index 80b91f139..32bfeadd6 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/audio/ForceOriginalAudioPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/audio/ForceOriginalAudioPatch.kt @@ -41,8 +41,6 @@ val forceOriginalAudioPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrPatch.kt index 8e1eb7c96..c9f4383f0 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/hdr/DisableHdrPatch.kt @@ -28,8 +28,6 @@ val disableHdrPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt index 3a4abc3b5..f4299dc65 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt @@ -35,8 +35,6 @@ val rememberVideoQualityPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt index 3f1f75b5b..476d43157 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt @@ -19,8 +19,6 @@ val playbackSpeedPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42", diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/RestoreOldVideoQualityMenuPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/RestoreOldVideoQualityMenuPatch.kt index fefe03a69..a10e916f7 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/RestoreOldVideoQualityMenuPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/RestoreOldVideoQualityMenuPatch.kt @@ -74,8 +74,6 @@ val restoreOldVideoQualityMenuPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( - "18.38.44", - "18.49.37", "19.16.39", "19.25.37", "19.34.42",