From 231f897bcc4ec72ce7f5db856e94cac4c07048e7 Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Sun, 15 Dec 2024 14:26:18 +0900 Subject: [PATCH] feat(YouTube - Seekbar components): Remove `Enable Cairo seekbar` setting, which is no longer needed (Enabled by default in YouTube 19.34.42) --- .../youtube/patches/player/PlayerPatch.java | 4 ---- .../extension/youtube/settings/Settings.java | 1 - .../patches/youtube/player/seekbar/Fingerprints.kt | 7 ------- .../player/seekbar/SeekbarComponentsPatch.kt | 14 -------------- .../youtube/settings/host/values/strings.xml | 5 ----- .../youtube/settings/xml/revanced_prefs.xml | 4 ---- 6 files changed, 35 deletions(-) diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/PlayerPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/PlayerPatch.java index 688a9901a..deb2bb5b8 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/PlayerPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/PlayerPatch.java @@ -714,10 +714,6 @@ public class PlayerPatch { return !Settings.RESTORE_OLD_SEEKBAR_THUMBNAILS.get(); } - public static boolean enableCairoSeekbar() { - return Settings.ENABLE_CAIRO_SEEKBAR.get(); - } - // endregion public static int getQuickActionsTopMargin() { diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java index 99cd0c2ec..5db00585b 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/settings/Settings.java @@ -400,7 +400,6 @@ public class Settings extends BaseSettings { public static final BooleanSetting RESTORE_OLD_SEEKBAR_THUMBNAILS = new BooleanSetting("revanced_restore_old_seekbar_thumbnails", PatchStatus.OldSeekbarThumbnailsDefaultBoolean(), true); public static final BooleanSetting ENABLE_SEEKBAR_THUMBNAILS_HIGH_QUALITY = new BooleanSetting("revanced_enable_seekbar_thumbnails_high_quality", FALSE, true, "revanced_enable_seekbar_thumbnails_high_quality_dialog_message"); - public static final BooleanSetting ENABLE_CAIRO_SEEKBAR = new BooleanSetting("revanced_enable_cairo_seekbar", FALSE, true); // PreferenceScreen: Player - Video description public static final BooleanSetting DISABLE_ROLLING_NUMBER_ANIMATIONS = new BooleanSetting("revanced_disable_rolling_number_animations", FALSE); diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/Fingerprints.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/Fingerprints.kt index 089e7a15b..34240c475 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/Fingerprints.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/Fingerprints.kt @@ -6,13 +6,6 @@ import app.revanced.util.or import com.android.tools.smali.dexlib2.AccessFlags import com.android.tools.smali.dexlib2.Opcode -internal val cairoSeekbarConfigFingerprint = legacyFingerprint( - name = "cairoSeekbarConfigFingerprint", - returnType = "Z", - parameters = emptyList(), - literals = listOf(45617850L), -) - internal val controlsOverlayStyleFingerprint = legacyFingerprint( name = "controlsOverlayStyleFingerprint", opcodes = listOf(Opcode.CONST_HIGH16), diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/SeekbarComponentsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/SeekbarComponentsPatch.kt index ac85fd1bb..b55f7febd 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/SeekbarComponentsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/player/seekbar/SeekbarComponentsPatch.kt @@ -17,7 +17,6 @@ import app.revanced.patches.youtube.utils.patch.PatchList.SEEKBAR_COMPONENTS import app.revanced.patches.youtube.utils.playerButtonsResourcesFingerprint import app.revanced.patches.youtube.utils.playerButtonsVisibilityFingerprint import app.revanced.patches.youtube.utils.playerSeekbarColorFingerprint -import app.revanced.patches.youtube.utils.playservice.is_19_23_or_greater import app.revanced.patches.youtube.utils.playservice.versionCheckPatch import app.revanced.patches.youtube.utils.resourceid.inlineTimeBarColorizedBarPlayedColorDark import app.revanced.patches.youtube.utils.resourceid.inlineTimeBarPlayedNotHighlightedColor @@ -303,19 +302,6 @@ val seekbarComponentsPatch = bytecodePatch( // endregion - // region patch for enable cairo seekbar - - if (is_19_23_or_greater) { - cairoSeekbarConfigFingerprint.injectLiteralInstructionBooleanCall( - 45617850L, - "$PLAYER_CLASS_DESCRIPTOR->enableCairoSeekbar()Z" - ) - - settingArray += "SETTINGS: ENABLE_CAIRO_SEEKBAR" - } - - // endregion - // region add settings addPreference(settingArray, SEEKBAR_COMPONENTS) diff --git a/patches/src/main/resources/youtube/settings/host/values/strings.xml b/patches/src/main/resources/youtube/settings/host/values/strings.xml index 262ca9922..c05f0c50a 100644 --- a/patches/src/main/resources/youtube/settings/host/values/strings.xml +++ b/patches/src/main/resources/youtube/settings/host/values/strings.xml @@ -1141,11 +1141,6 @@ Tap and hold to toggle the appended information type." Internet data usage may be higher, and seekbar thumbnails will have a slight delay before showing. This feature works best with a very fast internet connection." - Enable Cairo seekbar - "Cairo seekbar is enabled. - -Side effect: Cairo theme is also applied to notification dots." - Cairo seekbar is disabled. Video description diff --git a/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml index bbec93d49..fc3ed7607 100644 --- a/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml +++ b/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml @@ -481,10 +481,6 @@ - -