feat(youtube): minor improvement

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"
+    }
 )

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

src/main/resources/youtube/settings/host/values/strings.xml

@@ -22,17 +22,17 @@
     <string name="revanced_custom_filter_summary_off">Custom filter is disabled</string>
     <string name="revanced_custom_filter_summary_on">Custom filter is enabled</string>
     <string name="revanced_custom_filter_title">Enable custom filter</string>
-    <string name="revanced_custom_seekbar_color_value_summary">Type the hex code of the seekbar color</string>
+    <string name="revanced_custom_playback_speeds_invalid">Invalid custom playback speeds. Reset to default values.</string>
-    <string name="revanced_custom_seekbar_color_value_title">Custom seekbar color value</string>
-    <string name="revanced_custom_playback_speeds_invalid">Invalid custom video speeds. Reset to default values.</string>
     <string name="revanced_custom_playback_speeds_warning" formatted="false">Custom speeds must be less than %sx. Reset to default values.</string>
     <string name="revanced_custom_playback_speeds_summary">Add or change the playback speeds available</string>
     <string name="revanced_custom_playback_speeds_title">Edit custom playback speeds</string>
+    <string name="revanced_custom_seekbar_color_value_summary">Type the hex code of the seekbar color</string>
+    <string name="revanced_custom_seekbar_color_value_title">Custom seekbar color value</string>
     <string name="revanced_default_app_settings_summary">To open RVX in an external browser, turn on \'Open supported links\' and enable supported web addresses</string>
     <string name="revanced_default_app_settings_title">Open default app settings</string>
+    <string name="revanced_default_playback_speed_title">Default playback speed</string>
     <string name="revanced_default_video_quality_mobile_title">Default video quality on Mobile network</string>
     <string name="revanced_default_video_quality_wifi_title">Default video quality on Wi-Fi network</string>
-    <string name="revanced_default_playback_speed_title">Default playback speed</string>
     <string name="revanced_description_title">Description</string>
     <string name="revanced_disable_auto_captions_summary_off">Forced auto captions are enabled</string>
     <string name="revanced_disable_auto_captions_summary_on">Forced auto captions are disabled</string>
@@ -109,12 +109,12 @@
     <string name="revanced_enable_save_brightness_summary_off">Don\'t save and restore brightness when exiting or entering fullscreen</string>
     <string name="revanced_enable_save_brightness_summary_on">Save and restore brightness when exiting or entering fullscreen</string>
     <string name="revanced_enable_save_brightness_title">Enable save and restore brightness</string>
-    <string name="revanced_enable_save_video_quality_summary_off">Does not save video quality values even when changing video quality</string>
-    <string name="revanced_enable_save_video_quality_summary_on">Save the video quality value whenever you change the video quality</string>
-    <string name="revanced_enable_save_video_quality_title">Enable save video quality</string>
     <string name="revanced_enable_save_playback_speed_summary_off">Does not save playback speed values even when changing playback speed</string>
     <string name="revanced_enable_save_playback_speed_summary_on">Save the playback speed value whenever you change the playback speed</string>
     <string name="revanced_enable_save_playback_speed_title">Enable save playback speed</string>
+    <string name="revanced_enable_save_video_quality_summary_off">Does not save video quality values even when changing video quality</string>
+    <string name="revanced_enable_save_video_quality_summary_on">Save the video quality value whenever you change the video quality</string>
+    <string name="revanced_enable_save_video_quality_title">Enable save video quality</string>
     <string name="revanced_enable_seekbar_tapping_summary_off">Seekbar tapping is disabled</string>
     <string name="revanced_enable_seekbar_tapping_summary_on">Seekbar tapping is enabled</string>
     <string name="revanced_enable_seekbar_tapping_title">Enable seekbar tapping</string>
@@ -531,7 +531,7 @@ Tap and hold to copy video timestamp"</string>
     <string name="revanced_overlay_button_external_downloader_title">Show external download button</string>
     <string name="revanced_overlay_button_speed_dialog_reset">Playback speed reseted (1.0x)</string>
     <string name="revanced_overlay_button_speed_dialog_summary">"Tap to open speed dialog
-Tap and hold to set Playback speed to 1.0x"</string>
+Tap and hold to set playback speed to 1.0x"</string>
     <string name="revanced_overlay_button_speed_dialog_title">Show speed dialog button</string>
     <string name="revanced_override_premium_header_summary_off">Current Header: Default Header</string>
     <string name="revanced_override_premium_header_summary_on">Current Header: Premium Header</string>
@@ -572,10 +572,10 @@ Since these setting is quite outdated, it may not be valid"</string>
     <string name="revanced_ryd_shorts_summary_on">Dislikes shown on Shorts</string>
     <string name="revanced_ryd_shorts_title">Show dislikes on Shorts</string>
     <string name="revanced_ryd_video_likes_hidden_by_video_owner">Hidden</string>
+    <string name="revanced_save_playback_speed">Changing default speed to:</string>
     <string name="revanced_save_video_quality_mobile">Changing default mobile data quality to:</string>
     <string name="revanced_save_video_quality_none">Failed to set quality</string>
     <string name="revanced_save_video_quality_wifi">Changing default Wi-Fi quality to:</string>
-    <string name="revanced_save_playback_speed">Changing default speed to:</string>
     <string name="revanced_seekbar">Seekbar</string>
     <string name="revanced_shorts">Shorts</string>
     <string name="revanced_shorts_player_title">Shorts player</string>

src/main/resources/youtube/settings/xml/revanced_prefs.xml

@@ -380,9 +380,9 @@
             <Preference android:title="swipe-controls" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_video" />
+            <Preference android:title="default-playback-speed" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="default-video-quality" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
-            <Preference android:title="default-video-speed" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
+            <Preference android:title="custom-playback-speed" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
-            <Preference android:title="custom-video-speed" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="disable-hdr-video" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_others" />
@@ -601,13 +601,13 @@
     <PreferenceScreen android:title="@string/revanced_video" android:key="video">
         <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_video" />PREFERENCE: VIDEO_SETTINGS -->
 
+        <!-- SETTINGS: DEFAULT_PLAYBACK_SPEED
+        <ListPreference android:title="@string/revanced_default_playback_speed_title" android:key="revanced_default_playback_speed" android:defaultValue="-2.0" />SETTINGS: DEFAULT_PLAYBACK_SPEED -->
+
         <!-- SETTINGS: DEFAULT_VIDEO_QUALITY
         <ListPreference android:title="@string/revanced_default_video_quality_mobile_title" android:key="revanced_default_video_quality_mobile" android:entries="@array/revanced_default_video_quality_entry" android:defaultValue="-2" android:entryValues="@array/revanced_default_video_quality_entry_value" />
         <ListPreference android:title="@string/revanced_default_video_quality_wifi_title" android:key="revanced_default_video_quality_wifi" android:entries="@array/revanced_default_video_quality_entry" android:defaultValue="-2" android:entryValues="@array/revanced_default_video_quality_entry_value" />SETTINGS: DEFAULT_VIDEO_QUALITY -->
 
-        <!-- SETTINGS: DEFAULT_PLAYBACK_SPEED
-        <ListPreference android:title="@string/revanced_default_playback_speed_title" android:key="revanced_default_playback_speed" android:defaultValue="-2.0" />SETTINGS: DEFAULT_PLAYBACK_SPEED -->
-
         <!-- SETTINGS: DISABLE_HDR_VIDEO
         <SwitchPreference android:title="@string/revanced_disable_hdr_video_title" android:key="revanced_disable_hdr_video" android:defaultValue="false" android:summaryOn="@string/revanced_disable_hdr_video_summary_on" android:summaryOff="@string/revanced_disable_hdr_video_summary_off" />SETTINGS: DISABLE_HDR_VIDEO -->
 
@@ -618,12 +618,12 @@
         <SwitchPreference android:title="@string/revanced_enable_custom_playback_speed_title" android:key="revanced_enable_custom_playback_speed" android:defaultValue="false" android:summaryOn="@string/revanced_enable_custom_playback_speed_summary_on" android:summaryOff="@string/revanced_enable_custom_playback_speed_summary_off" />
         <app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_custom_playback_speeds_title" android:key="revanced_custom_playback_speeds" android:summary="@string/revanced_custom_playback_speeds_summary" android:defaultValue="0.25\n0.5\n0.75\n1.0\n1.25\n1.5\n1.75\n2.0\n2.25\n2.5" android:inputType="textMultiLine" />SETTINGS: CUSTOM_PLAYBACK_SPEED -->
 
-        <!-- SETTINGS: DEFAULT_VIDEO_QUALITY
-        <SwitchPreference android:title="@string/revanced_enable_save_video_quality_title" android:key="revanced_enable_save_video_quality" android:defaultValue="true" android:summaryOn="@string/revanced_enable_save_video_quality_summary_on" android:summaryOff="@string/revanced_enable_save_video_quality_summary_off" />SETTINGS: DEFAULT_VIDEO_QUALITY -->
-
         <!-- SETTINGS: DEFAULT_PLAYBACK_SPEED
         <SwitchPreference android:title="@string/revanced_enable_save_playback_speed_title" android:key="revanced_enable_save_playback_speed" android:defaultValue="true" android:summaryOn="@string/revanced_enable_save_playback_speed_summary_on" android:summaryOff="@string/revanced_enable_save_playback_speed_summary_off" />SETTINGS: DEFAULT_PLAYBACK_SPEED -->
 
+        <!-- SETTINGS: DEFAULT_VIDEO_QUALITY
+        <SwitchPreference android:title="@string/revanced_enable_save_video_quality_title" android:key="revanced_enable_save_video_quality" android:defaultValue="true" android:summaryOn="@string/revanced_enable_save_video_quality_summary_on" android:summaryOff="@string/revanced_enable_save_video_quality_summary_off" />SETTINGS: DEFAULT_VIDEO_QUALITY -->
+
     <!-- PREFERENCE: VIDEO_SETTINGS
     </PreferenceScreen>PREFERENCE: VIDEO_SETTINGS -->