From eaced9527e656060c5e2bb04e925b7c2616af6af Mon Sep 17 00:00:00 2001 From: inotia00 Date: Sat, 22 Jul 2023 02:43:47 +0900 Subject: [PATCH] feat(youtube): minor improvement --- .../PlaybackSpeedPatchFingerprint.kt | 5 ++++- .../patch/OverrideSpeedHookPatch.kt | 13 +++++++++---- .../youtube/settings/host/values/strings.xml | 18 +++++++++--------- .../youtube/settings/xml/revanced_prefs.xml | 16 ++++++++-------- 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/overridespeed/fingerprints/PlaybackSpeedPatchFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/overridespeed/fingerprints/PlaybackSpeedPatchFingerprint.kt index d777f7777..fefdafe41 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/overridespeed/fingerprints/PlaybackSpeedPatchFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/overridespeed/fingerprints/PlaybackSpeedPatchFingerprint.kt @@ -8,5 +8,8 @@ object PlaybackSpeedPatchFingerprint : MethodFingerprint( returnType = "V", accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC, parameters = listOf("F"), - customFingerprint = { methodDef, _ -> methodDef.definingClass.endsWith("/PlaybackSpeedPatch;") && methodDef.name == "overrideSpeed" } + customFingerprint = { methodDef, _ -> + methodDef.definingClass.endsWith("/PlaybackSpeedPatch;") + && methodDef.name == "overrideSpeed" + } ) \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/utils/overridespeed/patch/OverrideSpeedHookPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/utils/overridespeed/patch/OverrideSpeedHookPatch.kt index c1986af81..74fe5d384 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/utils/overridespeed/patch/OverrideSpeedHookPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/utils/overridespeed/patch/OverrideSpeedHookPatch.kt @@ -17,10 +17,10 @@ import app.revanced.patcher.util.proxy.mutableTypes.MutableField.Companion.toMut import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable import app.revanced.patcher.util.smali.toInstructions -import app.revanced.patches.youtube.utils.overridespeed.fingerprints.SpeedClassFingerprint import app.revanced.patches.youtube.utils.overridespeed.fingerprints.PlaybackSpeedChangedFingerprint import app.revanced.patches.youtube.utils.overridespeed.fingerprints.PlaybackSpeedParentFingerprint import app.revanced.patches.youtube.utils.overridespeed.fingerprints.PlaybackSpeedPatchFingerprint +import app.revanced.patches.youtube.utils.overridespeed.fingerprints.SpeedClassFingerprint import app.revanced.util.integrations.Constants.INTEGRATIONS_PATH import app.revanced.util.integrations.Constants.VIDEO_PATH import org.jf.dexlib2.AccessFlags @@ -34,9 +34,9 @@ import org.jf.dexlib2.immutable.ImmutableMethodParameter class OverrideSpeedHookPatch : BytecodePatch( listOf( - SpeedClassFingerprint, PlaybackSpeedPatchFingerprint, - PlaybackSpeedParentFingerprint + PlaybackSpeedParentFingerprint, + SpeedClassFingerprint ) ) { override fun execute(context: BytecodeContext): PatchResult { @@ -44,7 +44,12 @@ class OverrideSpeedHookPatch : BytecodePatch( PlaybackSpeedParentFingerprint.result?.let { parentResult -> val parentClassDef = parentResult.classDef - PlaybackSpeedChangedFingerprint.also { it.resolve(context, parentClassDef) }.result?.let { + PlaybackSpeedChangedFingerprint.also { + it.resolve( + context, + parentClassDef + ) + }.result?.let { it.mutableMethod.apply { playbackSpeedChangedResult = it val startIndex = it.scanResult.patternScanResult!!.startIndex diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml index 33305afe2..5e1a48e95 100644 --- a/src/main/resources/youtube/settings/host/values/strings.xml +++ b/src/main/resources/youtube/settings/host/values/strings.xml @@ -22,17 +22,17 @@ Custom filter is disabled Custom filter is enabled Enable custom filter - Type the hex code of the seekbar color - Custom seekbar color value - Invalid custom video speeds. Reset to default values. + Invalid custom playback speeds. Reset to default values. Custom speeds must be less than %sx. Reset to default values. Add or change the playback speeds available Edit custom playback speeds + Type the hex code of the seekbar color + Custom seekbar color value To open RVX in an external browser, turn on \'Open supported links\' and enable supported web addresses Open default app settings + Default playback speed Default video quality on Mobile network Default video quality on Wi-Fi network - Default playback speed Description Forced auto captions are enabled Forced auto captions are disabled @@ -109,12 +109,12 @@ Don\'t save and restore brightness when exiting or entering fullscreen Save and restore brightness when exiting or entering fullscreen Enable save and restore brightness - Does not save video quality values even when changing video quality - Save the video quality value whenever you change the video quality - Enable save video quality Does not save playback speed values even when changing playback speed Save the playback speed value whenever you change the playback speed Enable save playback speed + Does not save video quality values even when changing video quality + Save the video quality value whenever you change the video quality + Enable save video quality Seekbar tapping is disabled Seekbar tapping is enabled Enable seekbar tapping @@ -531,7 +531,7 @@ Tap and hold to copy video timestamp" Show external download button Playback speed reseted (1.0x) "Tap to open speed dialog -Tap and hold to set Playback speed to 1.0x" +Tap and hold to set playback speed to 1.0x" Show speed dialog button Current Header: Default Header Current Header: Premium Header @@ -572,10 +572,10 @@ Since these setting is quite outdated, it may not be valid" Dislikes shown on Shorts Show dislikes on Shorts Hidden + Changing default speed to: Changing default mobile data quality to: Failed to set quality Changing default Wi-Fi quality to: - Changing default speed to: Seekbar Shorts Shorts player diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml index 61fb79184..286c92bb2 100644 --- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml +++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml @@ -380,9 +380,9 @@ + - - + @@ -601,13 +601,13 @@ PREFERENCE: VIDEO_SETTINGS --> + + - - @@ -618,12 +618,12 @@ SETTINGS: CUSTOM_PLAYBACK_SPEED --> - - + +