diff --git a/CHANGELOG.md b/CHANGELOG.md index fb0158d80..ef513ef33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [5.40.0-dev.7](https://github.com/ReVanced/revanced-patches/compare/v5.40.0-dev.6...v5.40.0-dev.7) (2025-09-20) + + +### Features + +* **YouTube - Hide video action buttons:** Add "Hide comments" button ([db796fb](https://github.com/ReVanced/revanced-patches/commit/db796fb8830b813e1ed626d491c4a797171e69e7)) + # [5.40.0-dev.6](https://github.com/ReVanced/revanced-patches/compare/v5.40.0-dev.5...v5.40.0-dev.6) (2025-09-20) diff --git a/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java b/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java index b120672c5..431ec7de0 100644 --- a/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java +++ b/extensions/music/src/main/java/app/revanced/extension/music/settings/Settings.java @@ -18,7 +18,7 @@ public class Settings extends BaseSettings { public static final BooleanSetting HIDE_UPGRADE_BUTTON = new BooleanSetting("revanced_music_hide_upgrade_button", TRUE, true); // General - public static final BooleanSetting HIDE_CAST_BUTTON = new BooleanSetting("revanced_music_hide_cast_button", FALSE, false); + public static final BooleanSetting HIDE_CAST_BUTTON = new BooleanSetting("revanced_music_hide_cast_button", TRUE, false); public static final BooleanSetting HIDE_CATEGORY_BAR = new BooleanSetting("revanced_music_hide_category_bar", FALSE, true); public static final BooleanSetting HIDE_NAVIGATION_BAR_HOME_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_home_button", FALSE, true); public static final BooleanSetting HIDE_NAVIGATION_BAR_SAMPLES_BUTTON = new BooleanSetting("revanced_music_hide_navigation_bar_samples_button", FALSE, true); diff --git a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java index 6f8574f8b..a71037ec7 100644 --- a/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java +++ b/extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java @@ -118,7 +118,7 @@ public class Utils { } /** - * @return The version name of the app, such as 19.11.43 + * @return The version name of the app, such as 20.13.41 */ public static String getAppVersionName() { if (versionName == null) { diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java index 0f6ca53e5..ffe86195a 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/patches/components/ButtonsFilter.java @@ -8,6 +8,10 @@ final class ButtonsFilter extends Filter { private static final String COMPACT_CHANNEL_BAR_PATH_PREFIX = "compact_channel_bar.eml"; private static final String VIDEO_ACTION_BAR_PATH_PREFIX = "video_action_bar.eml"; private static final String VIDEO_ACTION_BAR_PATH = "video_action_bar.eml"; + /** + * Video bar path when the video information is collapsed. Seems to shown only with 20.14+ + */ + private static final String COMPACTIFY_VIDEO_ACTION_BAR_PATH = "compactify_video_action_bar.eml"; private static final String ANIMATED_VECTOR_TYPE_PATH = "AnimatedVectorType"; private final StringFilterGroup likeSubscribeGlow; @@ -88,6 +92,16 @@ final class ButtonsFilter extends Filter { Settings.HIDE_STOP_ADS_BUTTON, "yt_outline_slash_circle_left" ), + new ByteArrayFilterGroup( + Settings.HIDE_COMMENTS_BUTTON, + "yt_outline_message_bubble_right" + ), + // Check for clip button both here and using a path filter, + // as there's a chance the path is a generic action button and won't contain 'clip_button' + new ByteArrayFilterGroup( + Settings.HIDE_CLIP_BUTTON, + "yt_outline_scissors" + ), new ByteArrayFilterGroup( Settings.HIDE_HYPE_BUTTON, "yt_outline_star_shooting" @@ -126,9 +140,8 @@ final class ButtonsFilter extends Filter { } if (matchedGroup == bufferFilterPathGroup) { - // Make sure the current path is the right one - // to avoid false positives. - return path.startsWith(VIDEO_ACTION_BAR_PATH) + // Make sure the current path is the right one to avoid false positives. + return (path.startsWith(VIDEO_ACTION_BAR_PATH) || path.startsWith(COMPACTIFY_VIDEO_ACTION_BAR_PATH)) && bufferButtonsGroupList.check(buffer).isFiltered(); } diff --git a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java index d7fd10a3d..3c24f617b 100644 --- a/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java +++ b/extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/Settings.java @@ -34,6 +34,7 @@ import static app.revanced.extension.youtube.sponsorblock.objects.CategoryBehavi import android.graphics.Color; import app.revanced.extension.shared.Logger; +import app.revanced.extension.shared.Utils; import app.revanced.extension.shared.settings.BaseSettings; import app.revanced.extension.shared.settings.BooleanSetting; import app.revanced.extension.shared.settings.EnumSetting; @@ -224,6 +225,7 @@ public class Settings extends BaseSettings { public static final BooleanSetting DISABLE_LIKE_SUBSCRIBE_GLOW = new BooleanSetting("revanced_disable_like_subscribe_glow", FALSE); public static final BooleanSetting HIDE_ASK_BUTTON = new BooleanSetting("revanced_hide_ask_button", FALSE); public static final BooleanSetting HIDE_CLIP_BUTTON = new BooleanSetting("revanced_hide_clip_button", TRUE); + public static final BooleanSetting HIDE_COMMENTS_BUTTON = new BooleanSetting("revanced_hide_comments_button", TRUE); public static final BooleanSetting HIDE_DOWNLOAD_BUTTON = new BooleanSetting("revanced_hide_download_button", FALSE); public static final BooleanSetting HIDE_HYPE_BUTTON = new BooleanSetting("revanced_hide_hype_button", FALSE); public static final BooleanSetting HIDE_LIKE_DISLIKE_BUTTON = new BooleanSetting("revanced_hide_like_dislike_button", FALSE); @@ -524,10 +526,14 @@ public class Settings extends BaseSettings { DEPRECATED_SWIPE_OVERLAY_BACKGROUND_ALPHA.resetToDefault(); } - // Old spoof versions that no longer work. - if (SPOOF_APP_VERSION_TARGET.get().compareTo(SPOOF_APP_VERSION_TARGET.defaultValue) < 0) { - Logger.printInfo(() -> "Resetting spoof app version target"); + // Old spoof versions that no longer work, + // or is spoofing to a version the same or newer than this app. + if (!SPOOF_APP_VERSION_TARGET.isSetToDefault() && + (SPOOF_APP_VERSION_TARGET.get().compareTo(SPOOF_APP_VERSION_TARGET.defaultValue) < 0 + || (Utils.getAppVersionName().compareTo(SPOOF_APP_VERSION_TARGET.get()) <= 0))) { + Logger.printInfo(() -> "Resetting spoof app version"); SPOOF_APP_VERSION_TARGET.resetToDefault(); + SPOOF_APP_VERSION.resetToDefault(); } // RYD requires manually migrating old settings since the lack of diff --git a/gradle.properties b/gradle.properties index 67e71bb03..6f587b080 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,4 +3,4 @@ org.gradle.jvmargs = -Xms512M -Xmx2048M org.gradle.parallel = true android.useAndroidX = true kotlin.code.style = official -version = 5.40.0-dev.6 +version = 5.40.0-dev.7 diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/Fingerprints.kt index 35f818348..18bef477d 100644 --- a/patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/Fingerprints.kt @@ -1,11 +1,15 @@ package app.revanced.patches.shared.misc.spoof import app.revanced.patcher.fingerprint +import app.revanced.util.getReference +import app.revanced.util.indexOfFirstInstruction import app.revanced.patcher.literal import app.revanced.patcher.methodCall import app.revanced.patcher.string import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode +import com.android.tools.smali.dexlib2.iface.Method +import com.android.tools.smali.dexlib2.iface.reference.MethodReference internal val buildInitPlaybackRequestFingerprint by fingerprint { returns("Lorg/chromium/net/UrlRequest\$Builder;") @@ -42,10 +46,6 @@ internal val buildRequestFingerprint by fingerprint { methodCall(name = "newUrlRequestBuilder") ) // UrlRequest; or UrlRequest$Builder; custom { methodDef, _ -> - if (indexOfNewUrlRequestBuilderInstruction(methodDef) < 0) { - return@custom false - } - // Different targets have slightly different parameters // Earlier targets have parameters: @@ -79,10 +79,10 @@ internal val buildRequestFingerprint by fingerprint { val parameterTypesSize = parameterTypes.size (parameterTypesSize == 6 || parameterTypesSize == 7 || parameterTypesSize == 8) && parameterTypes[1] == "Ljava/util/Map;" // URL headers. + && indexOfNewUrlRequestBuilderInstruction(methodDef) >= 0 } } - internal val protobufClassParseByteBufferFingerprint by fingerprint { accessFlags(AccessFlags.PROTECTED, AccessFlags.STATIC) returns("L") @@ -194,3 +194,13 @@ internal val playbackStartDescriptorFeatureFlagFingerprint by fingerprint { literal(45665455L) ) } + +internal fun indexOfNewUrlRequestBuilderInstruction(method: Method) = method.indexOfFirstInstruction { + val reference = getReference() + opcode == Opcode.INVOKE_VIRTUAL && reference?.definingClass == "Lorg/chromium/net/CronetEngine;" + && reference.name == "newUrlRequestBuilder" + && reference.parameterTypes.size == 3 + && reference.parameterTypes[0] == "Ljava/lang/String;" + && reference.parameterTypes[1] == "Lorg/chromium/net/UrlRequest\$Callback;" + && reference.parameterTypes[2] == "Ljava/util/concurrent/Executor;" +} diff --git a/patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/SpoofVideoStreamsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/SpoofVideoStreamsPatch.kt index aa38ad350..1a348c447 100644 --- a/patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/SpoofVideoStreamsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/shared/misc/spoof/SpoofVideoStreamsPatch.kt @@ -16,20 +16,17 @@ import app.revanced.patches.all.misc.resources.addResourcesPatch import app.revanced.util.findFreeRegister import app.revanced.util.findInstructionIndicesReversedOrThrow import app.revanced.util.getReference -import app.revanced.util.indexOfFirstInstruction import app.revanced.util.indexOfFirstInstructionOrThrow import app.revanced.util.insertLiteralOverride import app.revanced.util.returnEarly 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.Method 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.ReferenceInstruction import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction import com.android.tools.smali.dexlib2.iface.reference.FieldReference -import com.android.tools.smali.dexlib2.iface.reference.MethodReference import com.android.tools.smali.dexlib2.immutable.ImmutableMethod import com.android.tools.smali.dexlib2.immutable.ImmutableMethodParameter @@ -351,12 +348,3 @@ fun spoofVideoStreamsPatch( executeBlock() } } - -internal fun indexOfNewUrlRequestBuilderInstruction(method: Method) = method.indexOfFirstInstruction { - opcode == Opcode.INVOKE_VIRTUAL && getReference().toString() == - "Lorg/chromium/net/CronetEngine;" + - "->newUrlRequestBuilder(" + - "Ljava/lang/String;Lorg/chromium/net/UrlRequest${'$'}Callback;" + - "Ljava/util/concurrent/Executor;" + - ")Lorg/chromium/net/UrlRequest${'$'}Builder;" -} 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 8d952d3df..068251230 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,10 +78,9 @@ val hideAdsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 10e79d168..4cc92c89e 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 @@ -27,10 +27,9 @@ val hideGetPremiumPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 81d19d698..aad7f8cc3 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 @@ -25,10 +25,9 @@ val videoAdsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 fdf55ce0d..5ad7c89c1 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 @@ -55,10 +55,9 @@ val copyVideoUrlPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 21519fc80..1187e9050 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 @@ -28,10 +28,9 @@ val removeViewerDiscretionDialogPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/doubletap/DisableChapterSkipDoubleTapPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/doubletap/DisableChapterSkipDoubleTapPatch.kt index 38b742cf8..bfb79ec02 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/doubletap/DisableChapterSkipDoubleTapPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/doubletap/DisableChapterSkipDoubleTapPatch.kt @@ -29,8 +29,8 @@ val disableDoubleTapActionsPatch = bytecodePatch( compatibleWith( "com.google.android.youtube"( "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 1947a97f7..6db4fb975 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 @@ -75,10 +75,9 @@ val downloadsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarPatch.kt index fc2b9b998..e0fb2ea61 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/SeekbarPatch.kt @@ -22,10 +22,9 @@ val seekbarPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) } 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 f0efb9cc9..38efd3d89 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 @@ -97,10 +97,9 @@ val swipeControlsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 29e9b7af2..afc20ba5b 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 @@ -26,10 +26,9 @@ val autoCaptionsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 94e804575..8c3a75272 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 @@ -45,10 +45,9 @@ val customBrandingPatch = resourcePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 e2833e5b7..77e8074c3 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 @@ -95,10 +95,9 @@ val changeHeaderPatch = resourcePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 46210654e..e861dcb42 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 @@ -27,10 +27,9 @@ val hideButtonsPatch = resourcePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) @@ -41,7 +40,8 @@ val hideButtonsPatch = resourcePatch( SwitchPreference("revanced_disable_like_subscribe_glow"), SwitchPreference("revanced_hide_download_button"), SwitchPreference("revanced_hide_like_dislike_button"), - SwitchPreference("revanced_hide_save_button"), + SwitchPreference("revanced_hide_comments_button"), + SwitchPreference("revanced_hide_save_button"), ) if (!is_20_22_or_greater) { 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 1f1cf7850..d0b6dcf10 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,10 +40,9 @@ val navigationButtonsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 239fdd37d..070c3ab94 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 @@ -47,10 +47,9 @@ val hidePlayerOverlayButtonsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 a0f14a06d..5cbc0ade1 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 @@ -34,10 +34,9 @@ val changeFormFactorPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 fabf558d9..166362920 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 @@ -61,10 +61,9 @@ val hideEndscreenCardsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreensuggestion/HideEndScreenSuggestedVideoPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreensuggestion/HideEndScreenSuggestedVideoPatch.kt index d5e16b126..06f6ab1ee 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreensuggestion/HideEndScreenSuggestedVideoPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreensuggestion/HideEndScreenSuggestedVideoPatch.kt @@ -33,10 +33,9 @@ val hideEndScreenSuggestedVideoPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 f2b87d5be..f75bd9cbd 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 @@ -31,10 +31,9 @@ val disableFullscreenAmbientModePatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 750f1e682..f49feb03d 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 @@ -111,10 +111,9 @@ val hideLayoutComponentsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 a7d9a73b6..ff5c6c408 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 @@ -52,10 +52,9 @@ val hideInfoCardsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 b18525c4c..f8f32b8e8 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 @@ -26,10 +26,9 @@ val hidePlayerFlyoutMenuPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/relatedvideooverlay/HideRelatedVideoOverlayPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/relatedvideooverlay/HideRelatedVideoOverlayPatch.kt index 9eaef0254..c18e649c1 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/relatedvideooverlay/HideRelatedVideoOverlayPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/relatedvideooverlay/HideRelatedVideoOverlayPatch.kt @@ -31,10 +31,9 @@ val hideRelatedVideoOverlayPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 cf2660963..6a992f0db 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 @@ -31,10 +31,9 @@ val disableRollingNumberAnimationPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 ea979a07d..7c874382c 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 @@ -173,10 +173,9 @@ val hideShortsComponentsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/signintotvpopup/DisableSignInToTvPatchPopup.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/signintotvpopup/DisableSignInToTvPatchPopup.kt index da5fbce3f..efdeaa398 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/signintotvpopup/DisableSignInToTvPatchPopup.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/signintotvpopup/DisableSignInToTvPatchPopup.kt @@ -28,10 +28,9 @@ val disableSignInToTvPopupPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 ca54de32b..a2ed51445 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 @@ -25,10 +25,9 @@ val hideTimestampPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 2112acd68..605e99f5d 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 @@ -85,10 +85,9 @@ val miniplayerPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 56bdac659..b95e81ba1 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 @@ -23,10 +23,9 @@ val playerPopupPanelsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 2c61ce596..148427a95 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 @@ -23,10 +23,9 @@ internal val exitFullscreenPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreenPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreenPatch.kt index 7b5aa145f..fba4a9dba 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreenPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/layout/player/fullscreen/OpenVideosFullscreenPatch.kt @@ -25,8 +25,8 @@ val openVideosFullscreenPatch = bytecodePatch( "19.43.41", "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 b96b36ea4..24d96e8da 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 @@ -29,10 +29,9 @@ val customPlayerOverlayOpacityPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 5d5a7360c..2e7bbd67e 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 @@ -63,10 +63,9 @@ val returnYouTubeDislikePatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 61dc648e4..3bb3d31b1 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 @@ -41,10 +41,9 @@ val wideSearchbarPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 e2039e29e..b7e43d209 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 @@ -46,10 +46,9 @@ val shortsAutoplayPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 db3eece85..811979565 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 @@ -47,10 +47,9 @@ val openShortsInRegularPlayerPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 22068bf1a..ac94de144 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 @@ -134,10 +134,9 @@ val sponsorBlockPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 e4482be7f..92d61e976 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 @@ -14,6 +14,7 @@ import app.revanced.patches.shared.misc.settings.preference.PreferenceScreenPref 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_43_or_greater +import app.revanced.patches.youtube.misc.playservice.is_20_14_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 @@ -39,10 +40,9 @@ val spoofAppVersionPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) @@ -58,13 +58,19 @@ val spoofAppVersionPatch = bytecodePatch( tag = "app.revanced.extension.shared.settings.preference.NoTitlePreferenceCategory", preferences = setOf( SwitchPreference("revanced_spoof_app_version"), - if (is_19_43_or_greater) { + if (is_20_14_or_greater) { ListPreference("revanced_spoof_app_version_target") + } else if (is_19_43_or_greater) { + ListPreference( + key = "revanced_spoof_app_version_target", + entriesKey = "revanced_spoof_app_version_target_legacy_20_13_entries", + entryValuesKey = "revanced_spoof_app_version_target_legacy_20_13_entry_values" + ) } else { ListPreference( key = "revanced_spoof_app_version_target", - entriesKey = "revanced_spoof_app_version_target_legacy_entries", - entryValuesKey = "revanced_spoof_app_version_target_legacy_entry_values" + entriesKey = "revanced_spoof_app_version_target_legacy_19_34_entries", + entryValuesKey = "revanced_spoof_app_version_target_legacy_19_34_entry_values" ) } ) 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 91eee1b75..1b3b9ec16 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 @@ -34,10 +34,9 @@ val changeStartPagePatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 0c3b4099e..3f459bb35 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 @@ -36,10 +36,9 @@ val disableResumingShortsOnStartupPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 26488779a..226fcd0cc 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 @@ -206,10 +206,9 @@ val themePatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 bd883935e..4b3ebf9ad 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 @@ -35,10 +35,9 @@ val alternativeThumbnailsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 1f2547720..65b95b7a6 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 @@ -29,10 +29,9 @@ val bypassImageRegionRestrictionsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 5a7d976df..26a74c5b9 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 @@ -25,10 +25,9 @@ val announcementsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 e90fc619a..324006c05 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 @@ -26,10 +26,9 @@ val autoRepeatPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 c1c920767..ac962ae8f 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 @@ -45,10 +45,9 @@ val backgroundPlaybackPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 e2e4bc4fb..21a7c048b 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 @@ -19,10 +19,9 @@ val enableDebuggingPatch = enableDebuggingPatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) }, 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 53ab2e832..b8a92269b 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 @@ -26,10 +26,9 @@ val spoofDeviceDimensionsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 f9ee7849b..dc2aaf258 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 @@ -23,10 +23,9 @@ val checkWatchHistoryDomainNameResolutionPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/FixBackToExitGesturePatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/FixBackToExitGesturePatch.kt index f299aab38..af3ca8ca9 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/FixBackToExitGesturePatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/fix/backtoexitgesture/FixBackToExitGesturePatch.kt @@ -25,7 +25,7 @@ internal val fixBackToExitGesturePatch = bytecodePatch( scrollPositionFingerprint.let { navigate(it.originalMethod) - .to(it.instructionMatches.first().index + 1) + .to(it.patternMatch!!.startIndex + 1) .stop().apply { val index = indexOfFirstInstructionOrThrow { opcode == Opcode.INVOKE_VIRTUAL && getReference()?.definingClass == 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 5ffd49cb4..5dc87ad94 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 @@ -37,10 +37,9 @@ val gmsCoreSupportPatch = gmsCoreSupportPatch( YOUTUBE_PACKAGE_NAME( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) } diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/hapticfeedback/DisableHapticFeedbackPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/hapticfeedback/DisableHapticFeedbackPatch.kt index 363fea9c2..cd50847fd 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/misc/hapticfeedback/DisableHapticFeedbackPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/misc/hapticfeedback/DisableHapticFeedbackPatch.kt @@ -28,10 +28,9 @@ val disableHapticFeedbackPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 ea9e27380..29f200e52 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 @@ -28,10 +28,9 @@ val bypassURLRedirectsPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 428b606ff..70e5b8dbc 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 @@ -43,10 +43,9 @@ val openLinksExternallyPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 bee7b2790..6a2cd30a6 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 @@ -32,10 +32,9 @@ val removeTrackingQueryParameterPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 3981e7db1..9981a8fe6 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 @@ -24,10 +24,9 @@ val spoofVideoStreamsPatch = spoofVideoStreamsPatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 eee6c0e45..3aec4a62e 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 @@ -46,10 +46,9 @@ val forceOriginalAudioPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 abea2c22c..96192517b 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 @@ -56,10 +56,9 @@ val disableHdrPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt index 55a449647..ca51614b3 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/video/quality/VideoQualityPatch.kt @@ -26,10 +26,9 @@ val videoQualityPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) 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 7ab9d2e0b..3da73226b 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 @@ -30,10 +30,9 @@ val playbackSpeedPatch = bytecodePatch( "com.google.android.youtube"( "19.34.42", "19.43.41", - "19.47.53", "20.07.39", - "20.12.46", "20.13.41", + "20.14.43", ) ) diff --git a/patches/src/main/resources/addresources/values/arrays.xml b/patches/src/main/resources/addresources/values/arrays.xml index 77ac078ac..7ffef6e7a 100644 --- a/patches/src/main/resources/addresources/values/arrays.xml +++ b/patches/src/main/resources/addresources/values/arrays.xml @@ -173,15 +173,25 @@ @string/revanced_spoof_app_version_target_entry_1 @string/revanced_spoof_app_version_target_entry_2 + @string/revanced_spoof_app_version_target_entry_3 + 20.13.41 19.35.36 19.01.34 - + + @string/revanced_spoof_app_version_target_entry_2 + @string/revanced_spoof_app_version_target_entry_3 + + + 19.35.36 19.01.34 - + + 19.01.34 + + 19.01.34 diff --git a/patches/src/main/resources/addresources/values/strings.xml b/patches/src/main/resources/addresources/values/strings.xml index ebb3e2b38..d0f3edac0 100644 --- a/patches/src/main/resources/addresources/values/strings.xml +++ b/patches/src/main/resources/addresources/values/strings.xml @@ -649,6 +649,10 @@ Adjust volume by swiping vertically on the right side of the screen" Hide Stop ads Stop ads button is hidden Stop ads button is shown + + Hide Comments + Comments button is hidden + Comments button is shown Hide Report @@ -1317,8 +1321,9 @@ This will change the appearance and features of the app, but unknown side effect If later turned off, it is recommended to clear the app data to prevent UI bugs." Spoof app version target - 19.35.36 - Restore old Shorts player icons - 19.01.34 - Restore old navigation icons + 20.13.41 - Restore non collapsed video action bar + 19.35.36 - Restore old Shorts player icons + 19.01.34 - Restore old navigation icons Change start page