feat(youtube): move video settings to Video settings category (ReVa…

…nced#2010) Co-authored-by: LisoUseInAIKyrios <[email protected]> Co-authored-by: oSumAtrIX <[email protected]>
Slenderman00 · May 12, 2023 · f4b9180 · f4b9180
1 parent 1bbb05d
commit f4b9180
Show file tree

Hide file tree

Showing 40 changed files with 87 additions and 115 deletions.
diff --git a/...nced/patches/youtube/interaction/copyvideourl/bytecode/patch/CopyVideoUrlBytecodePatch.kt b/...nced/patches/youtube/interaction/copyvideourl/bytecode/patch/CopyVideoUrlBytecodePatch.kt
@@ -12,7 +12,7 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.interaction.copyvideourl.annotation.CopyVideoUrlCompatibility
 import app.revanced.patches.youtube.interaction.copyvideourl.resource.patch.CopyVideoUrlResourcePatch
 import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
-import app.revanced.patches.youtube.misc.video.information.patch.VideoInformationPatch
+import app.revanced.patches.youtube.video.information.patch.VideoInformationPatch
 
 @Patch
 @Name("copy-video-url")

diff --git a/...p/revanced/patches/youtube/interaction/downloads/bytecode/patch/DownloadsBytecodePatch.kt b/...p/revanced/patches/youtube/interaction/downloads/bytecode/patch/DownloadsBytecodePatch.kt
@@ -12,7 +12,7 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patches.youtube.interaction.downloads.annotation.DownloadsCompatibility
 import app.revanced.patches.youtube.interaction.downloads.resource.patch.DownloadsResourcePatch
 import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
-import app.revanced.patches.youtube.misc.video.information.patch.VideoInformationPatch
+import app.revanced.patches.youtube.video.information.patch.VideoInformationPatch
 
 @Patch
 @Name("downloads")

diff --git a/...p/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt b/...p/revanced/patches/youtube/layout/returnyoutubedislike/patch/ReturnYouTubeDislikePatch.kt
@@ -25,7 +25,7 @@ import app.revanced.patches.youtube.layout.returnyoutubedislike.fingerprints.*
 import app.revanced.patches.youtube.layout.returnyoutubedislike.resource.patch.ReturnYouTubeDislikeResourcePatch
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
-import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
+import app.revanced.patches.youtube.video.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.builder.instruction.BuilderInstruction35c
 import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction

diff --git a/.../revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt b/.../revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
@@ -31,8 +31,8 @@ import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatParen
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
 import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
-import app.revanced.patches.youtube.misc.video.information.patch.VideoInformationPatch
-import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
+import app.revanced.patches.youtube.video.information.patch.VideoInformationPatch
+import app.revanced.patches.youtube.video.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.iface.instruction.*
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c

diff --git a/...n/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt b/...n/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt
@@ -21,7 +21,7 @@ import app.revanced.patches.youtube.misc.fix.playback.fingerprints.SubtitleWindo
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
+import app.revanced.patches.youtube.video.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Name("spoof-signature-verification")

diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/bytecode/patch/SettingsPatch.kt
@@ -137,6 +137,7 @@ class SettingsPatch : BytecodePatch(
         val ADS = Screen("ads", "Ads", "Ad related settings")
         val INTERACTIONS = Screen("interactions", "Interaction", "Settings related to interactions")
         val LAYOUT = Screen("layout", "Layout", "Settings related to the layout")
+        val VIDEO = Screen("video", "Video", "Settings related to the video player")
         val MISC = Screen("misc", "Misc", "Miscellaneous patches")
 
         override fun commit(screen: app.revanced.patches.shared.settings.preference.impl.PreferenceScreen) {

diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/VideoSpeeds.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/video/speed/VideoSpeeds.kt
diff --git a/...annotations/HDRBrightnessCompatibility.kt → ...annotations/HDRBrightnessCompatibility.kt b/...annotations/HDRBrightnessCompatibility.kt → ...annotations/HDRBrightnessCompatibility.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.hdrbrightness.annotations
+package app.revanced.patches.youtube.video.hdrbrightness.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

diff --git a/.../fingerprints/HDRBrightnessFingerprint.kt → .../fingerprints/HDRBrightnessFingerprint.kt b/.../fingerprints/HDRBrightnessFingerprint.kt → .../fingerprints/HDRBrightnessFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.hdrbrightness.fingerprints
+package app.revanced.patches.youtube.video.hdrbrightness.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.Opcode

diff --git a/...hdrbrightness/patch/HDRBrightnessPatch.kt → ...hdrbrightness/patch/HDRBrightnessPatch.kt b/...hdrbrightness/patch/HDRBrightnessPatch.kt → ...hdrbrightness/patch/HDRBrightnessPatch.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.hdrbrightness.patch
+package app.revanced.patches.youtube.video.hdrbrightness.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -10,8 +10,8 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.misc.hdrbrightness.annotations.HDRBrightnessCompatibility
-import app.revanced.patches.youtube.misc.hdrbrightness.fingerprints.HDRBrightnessFingerprint
+import app.revanced.patches.youtube.video.hdrbrightness.annotations.HDRBrightnessCompatibility
+import app.revanced.patches.youtube.video.hdrbrightness.fingerprints.HDRBrightnessFingerprint
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
@@ -30,7 +30,7 @@ class HDRBrightnessPatch : BytecodePatch(
     listOf(HDRBrightnessFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.MISC.addPreferences(
+        SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
             SwitchPreference(
                 "revanced_pref_hdr_autobrightness",
                 StringResource("revanced_hdr_autobrightness_enabled_title", "Enable auto HDR brightness"),

diff --git a/...notation/VideoInformationCompatibility.kt → ...notation/VideoInformationCompatibility.kt b/...notation/VideoInformationCompatibility.kt → ...notation/VideoInformationCompatibility.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.information.annotation
+package app.revanced.patches.youtube.video.information.annotation
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

diff --git a/...ts/CreateVideoPlayerSeekbarFingerprint.kt → ...ts/CreateVideoPlayerSeekbarFingerprint.kt b/...ts/CreateVideoPlayerSeekbarFingerprint.kt → ...ts/CreateVideoPlayerSeekbarFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.information.fingerprints
+package app.revanced.patches.youtube.video.information.fingerprints
 
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

diff --git a/...ts/OnPlaybackSpeedItemClickFingerprint.kt → ...ts/OnPlaybackSpeedItemClickFingerprint.kt b/...ts/OnPlaybackSpeedItemClickFingerprint.kt → ...ts/OnPlaybackSpeedItemClickFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.information.fingerprints
+package app.revanced.patches.youtube.video.information.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.Opcode

diff --git a/...rControllerSetTimeReferenceFingerprint.kt → ...rControllerSetTimeReferenceFingerprint.kt b/...rControllerSetTimeReferenceFingerprint.kt → ...rControllerSetTimeReferenceFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.information.fingerprints
+package app.revanced.patches.youtube.video.information.fingerprints
 
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

diff --git a/...ion/fingerprints/PlayerInitFingerprint.kt → ...ion/fingerprints/PlayerInitFingerprint.kt b/...ion/fingerprints/PlayerInitFingerprint.kt → ...ion/fingerprints/PlayerInitFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.information.fingerprints
+package app.revanced.patches.youtube.video.information.fingerprints
 
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

diff --git a/...formation/fingerprints/SeekFingerprint.kt → ...formation/fingerprints/SeekFingerprint.kt b/...formation/fingerprints/SeekFingerprint.kt → ...formation/fingerprints/SeekFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.information.fingerprints
+package app.revanced.patches.youtube.video.information.fingerprints
 
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

diff --git a/...on/fingerprints/VideoLengthFingerprint.kt → ...on/fingerprints/VideoLengthFingerprint.kt b/...on/fingerprints/VideoLengthFingerprint.kt → ...on/fingerprints/VideoLengthFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.information.fingerprints
+package app.revanced.patches.youtube.video.information.fingerprints
 
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

diff --git a/...tion/fingerprints/VideoTimeFingerprint.kt → ...tion/fingerprints/VideoTimeFingerprint.kt b/...tion/fingerprints/VideoTimeFingerprint.kt → ...tion/fingerprints/VideoTimeFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.information.fingerprints
+package app.revanced.patches.youtube.video.information.fingerprints
 
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

diff --git a/...nformation/patch/VideoInformationPatch.kt → ...nformation/patch/VideoInformationPatch.kt b/...nformation/patch/VideoInformationPatch.kt → ...nformation/patch/VideoInformationPatch.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.information.patch
+package app.revanced.patches.youtube.video.information.patch
 
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
@@ -19,10 +19,10 @@ import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.video.information.annotation.VideoInformationCompatibility
-import app.revanced.patches.youtube.misc.video.information.fingerprints.*
-import app.revanced.patches.youtube.misc.video.speed.remember.patch.RememberPlaybackSpeedPatch
-import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
+import app.revanced.patches.youtube.video.information.annotation.VideoInformationCompatibility
+import app.revanced.patches.youtube.video.information.fingerprints.*
+import app.revanced.patches.youtube.video.speed.remember.patch.RememberPlaybackSpeedPatch
+import app.revanced.patches.youtube.video.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.BuilderInstruction

diff --git a/...otations/OldQualityLayoutCompatibility.kt → ...otations/OldQualityLayoutCompatibility.kt b/...otations/OldQualityLayoutCompatibility.kt → ...otations/OldQualityLayoutCompatibility.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.oldqualitylayout.annotations
+package app.revanced.patches.youtube.video.oldqualitylayout.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

diff --git a/...ints/QualityMenuViewInflateFingerprint.kt → ...ints/QualityMenuViewInflateFingerprint.kt b/...ints/QualityMenuViewInflateFingerprint.kt → ...ints/QualityMenuViewInflateFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.oldqualitylayout.fingerprints
+package app.revanced.patches.youtube.video.oldqualitylayout.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

diff --git a/...litylayout/patch/OldQualityLayoutPatch.kt → ...litylayout/patch/OldQualityLayoutPatch.kt b/...litylayout/patch/OldQualityLayoutPatch.kt → ...litylayout/patch/OldQualityLayoutPatch.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.layout.oldqualitylayout.patch
+package app.revanced.patches.youtube.video.oldqualitylayout.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -10,12 +10,12 @@ import app.revanced.patcher.patch.PatchResult
 import app.revanced.patcher.patch.PatchResultSuccess
 import app.revanced.patcher.patch.annotations.DependsOn
 import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.youtube.layout.oldqualitylayout.annotations.OldQualityLayoutCompatibility
-import app.revanced.patches.youtube.layout.oldqualitylayout.fingerprints.QualityMenuViewInflateFingerprint
-import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
-import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
+import app.revanced.patches.youtube.video.oldqualitylayout.annotations.OldQualityLayoutCompatibility
+import app.revanced.patches.youtube.video.oldqualitylayout.fingerprints.QualityMenuViewInflateFingerprint
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
 import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
 
 @Patch
@@ -30,7 +30,7 @@ class OldQualityLayoutPatch : BytecodePatch(
     listOf(QualityMenuViewInflateFingerprint)
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.LAYOUT.addPreferences(
+        SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
             SwitchPreference(
                 "revanced_use_old_style_quality_settings",
                 StringResource("revanced_old_style_quality_settings_enabled_title", "Use old video quality player menu"),

diff --git a/...ions/RememberVideoQualityCompatibility.kt → ...ions/RememberVideoQualityCompatibility.kt b/...ions/RememberVideoQualityCompatibility.kt → ...ions/RememberVideoQualityCompatibility.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.quality.annotations
+package app.revanced.patches.youtube.video.quality.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

diff --git a/...exMethodClassFieldReferenceFingerprint.kt → ...exMethodClassFieldReferenceFingerprint.kt b/...exMethodClassFieldReferenceFingerprint.kt → ...exMethodClassFieldReferenceFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.quality.fingerprints
+package app.revanced.patches.youtube.video.quality.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 import org.jf.dexlib2.Opcode

diff --git a/...deoQualityItemOnClickParentFingerprint.kt → ...deoQualityItemOnClickParentFingerprint.kt b/...deoQualityItemOnClickParentFingerprint.kt → ...deoQualityItemOnClickParentFingerprint.kt
@@ -1,5 +1,5 @@
 
-package app.revanced.patches.youtube.misc.video.quality.fingerprints
+package app.revanced.patches.youtube.video.quality.fingerprints
 
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
 

diff --git a/...erprints/VideoQualitySetterFingerprint.kt → ...erprints/VideoQualitySetterFingerprint.kt b/...erprints/VideoQualitySetterFingerprint.kt → ...erprints/VideoQualitySetterFingerprint.kt
@@ -1,5 +1,5 @@
 
-package app.revanced.patches.youtube.misc.video.quality.fingerprints
+package app.revanced.patches.youtube.video.quality.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

diff --git a/...uality/patch/RememberVideoQualityPatch.kt → ...uality/patch/RememberVideoQualityPatch.kt b/...uality/patch/RememberVideoQualityPatch.kt → ...uality/patch/RememberVideoQualityPatch.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.quality.patch
+package app.revanced.patches.youtube.video.quality.patch
 
 import app.revanced.extensions.toErrorResult
 import app.revanced.patcher.annotation.Description
@@ -20,11 +20,11 @@ import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.SwitchPreference
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.misc.video.information.patch.VideoInformationPatch
-import app.revanced.patches.youtube.misc.video.quality.annotations.RememberVideoQualityCompatibility
-import app.revanced.patches.youtube.misc.video.quality.fingerprints.SetQualityByIndexMethodClassFieldReferenceFingerprint
-import app.revanced.patches.youtube.misc.video.quality.fingerprints.VideoQualityItemOnClickParentFingerprint
-import app.revanced.patches.youtube.misc.video.quality.fingerprints.VideoQualitySetterFingerprint
+import app.revanced.patches.youtube.video.information.patch.VideoInformationPatch
+import app.revanced.patches.youtube.video.quality.annotations.RememberVideoQualityCompatibility
+import app.revanced.patches.youtube.video.quality.fingerprints.SetQualityByIndexMethodClassFieldReferenceFingerprint
+import app.revanced.patches.youtube.video.quality.fingerprints.VideoQualityItemOnClickParentFingerprint
+import app.revanced.patches.youtube.video.quality.fingerprints.VideoQualitySetterFingerprint
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction
 import org.jf.dexlib2.iface.reference.FieldReference
 
@@ -41,25 +41,6 @@ class RememberVideoQualityPatch : BytecodePatch(
     )
 ) {
     override fun execute(context: BytecodeContext): PatchResult {
-        SettingsPatch.PreferenceScreen.MISC.addPreferences(
-            SwitchPreference(
-                "revanced_remember_video_quality_last_selected",
-                StringResource(
-                    "revanced_remember_video_quality_last_selected_title",
-                    "Remember video quality changes"
-                ),
-                true,
-                StringResource(
-                    "revanced_remember_video_quality_last_selected_summary_on",
-                    "Quality changes apply to all videos"
-                ),
-                StringResource(
-                    "revanced_remember_video_quality_last_selected_summary_off",
-                    "Quality changes only apply to the current video"
-                )
-            )
-        )
-
         // This is bloated as each value has it's own String key/value
         // ideally the entries would be raw values (and not a key to a String resource)
         val entries = listOf(
@@ -84,7 +65,24 @@ class RememberVideoQualityPatch : BytecodePatch(
             StringResource("revanced_default_quality_entry_value_8", "280"),
             StringResource("revanced_default_quality_entry_value_9", "144"),
         )
-        SettingsPatch.PreferenceScreen.MISC.addPreferences(
+
+        SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
+            SwitchPreference(
+                "revanced_remember_video_quality_last_selected",
+                StringResource(
+                    "revanced_remember_video_quality_last_selected_title",
+                    "Remember video quality changes"
+                ),
+                false,
+                StringResource(
+                    "revanced_remember_video_quality_last_selected_summary_on",
+                    "Quality changes apply to all videos"
+                ),
+                StringResource(
+                    "revanced_remember_video_quality_last_selected_summary_off",
+                    "Quality changes only apply to the current video"
+                )
+            ),
             ListPreference(
                 "revanced_default_video_quality_wifi",
                 StringResource(

diff --git a/src/main/kotlin/app/revanced/patches/youtube/video/speed/VideoSpeeds.kt b/src/main/kotlin/app/revanced/patches/youtube/video/speed/VideoSpeeds.kt
diff --git a/...tions/CustomPlaybackSpeedCompatibility.kt → ...tions/CustomPlaybackSpeedCompatibility.kt b/...tions/CustomPlaybackSpeedCompatibility.kt → ...tions/CustomPlaybackSpeedCompatibility.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.speed.custom.annotations
+package app.revanced.patches.youtube.video.speed.custom.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

diff --git a/...rprints/SpeedArrayGeneratorFingerprint.kt → ...rprints/SpeedArrayGeneratorFingerprint.kt b/...rprints/SpeedArrayGeneratorFingerprint.kt → ...rprints/SpeedArrayGeneratorFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.speed.custom.fingerprints
+package app.revanced.patches.youtube.video.speed.custom.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.annotation.FuzzyPatternScanMethod

diff --git a/...m/fingerprints/SpeedLimiterFingerprint.kt → ...m/fingerprints/SpeedLimiterFingerprint.kt b/...m/fingerprints/SpeedLimiterFingerprint.kt → ...m/fingerprints/SpeedLimiterFingerprint.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.speed.custom.fingerprints
+package app.revanced.patches.youtube.video.speed.custom.fingerprints
 
 import app.revanced.patcher.extensions.or
 import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

diff --git a/...pp/revanced/patches/youtube/video/speed/custom/fingerprints/VideoSpeedPatchFingerprint.kt b/...pp/revanced/patches/youtube/video/speed/custom/fingerprints/VideoSpeedPatchFingerprint.kt
diff --git a/...eed/custom/patch/CustomVideoSpeedPatch.kt → ...eed/custom/patch/CustomVideoSpeedPatch.kt b/...eed/custom/patch/CustomVideoSpeedPatch.kt → ...eed/custom/patch/CustomVideoSpeedPatch.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.speed.custom.patch
+package app.revanced.patches.youtube.video.speed.custom.patch
 
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
@@ -13,9 +13,9 @@ import app.revanced.patches.shared.settings.preference.impl.StringResource
 import app.revanced.patches.shared.settings.preference.impl.TextPreference
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
-import app.revanced.patches.youtube.misc.video.speed.custom.annotations.CustomPlaybackSpeedCompatibility
-import app.revanced.patches.youtube.misc.video.speed.custom.fingerprints.SpeedArrayGeneratorFingerprint
-import app.revanced.patches.youtube.misc.video.speed.custom.fingerprints.SpeedLimiterFingerprint
+import app.revanced.patches.youtube.video.speed.custom.annotations.CustomPlaybackSpeedCompatibility
+import app.revanced.patches.youtube.video.speed.custom.fingerprints.SpeedArrayGeneratorFingerprint
+import app.revanced.patches.youtube.video.speed.custom.fingerprints.SpeedLimiterFingerprint
 import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 import org.jf.dexlib2.iface.instruction.ReferenceInstruction

diff --git a/...ion/RememberPlaybackSpeedCompatibility.kt → ...ion/RememberPlaybackSpeedCompatibility.kt b/...ion/RememberPlaybackSpeedCompatibility.kt → ...ion/RememberPlaybackSpeedCompatibility.kt
@@ -1,4 +1,4 @@
-package app.revanced.patches.youtube.misc.video.speed.remember.annotation
+package app.revanced.patches.youtube.video.speed.remember.annotation
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package