diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/oldlayout/patch/OldLayoutPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/oldlayout/patch/OldLayoutPatch.kt index e05798222..0c9be3c28 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/oldlayout/patch/OldLayoutPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/oldlayout/patch/OldLayoutPatch.kt @@ -9,18 +9,13 @@ import app.revanced.patcher.extensions.addInstructions import app.revanced.patcher.patch.BytecodePatch 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.shared.annotation.YouTubeCompatibility import app.revanced.patches.youtube.misc.oldlayout.fingerprints.OldLayoutFingerprint -import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch import app.revanced.util.integrations.Constants.MISC_PATH import org.jf.dexlib2.iface.instruction.OneRegisterInstruction -@Patch @Name("enable-old-layout") @Description("Spoof the YouTube client version to use the old layout.") -@DependsOn([SettingsPatch::class]) @YouTubeCompatibility @Version("0.0.1") class OldLayoutPatch : BytecodePatch( @@ -44,17 +39,6 @@ class OldLayoutPatch : BytecodePatch( } } ?: return OldLayoutFingerprint.toErrorResult() - /* - * Add settings - */ - SettingsPatch.addPreference( - arrayOf( - "SETTINGS: ENABLE_OLD_LAYOUT" - ) - ) - - SettingsPatch.updatePatchStatus("enable-old-layout") - return PatchResultSuccess() } } \ No newline at end of file diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsPatch.kt index 424465b38..d1780d235 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/misc/settings/resource/patch/SettingsPatch.kt @@ -12,6 +12,7 @@ import app.revanced.patches.shared.annotation.YouTubeCompatibility import app.revanced.patches.shared.patch.options.PatchOptions import app.revanced.patches.shared.patch.settings.AbstractSettingsResourcePatch import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch +import app.revanced.patches.youtube.misc.oldlayout.patch.OldLayoutPatch import app.revanced.patches.youtube.misc.resourceid.patch.SharedResourcdIdPatch import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsBytecodePatch import app.revanced.util.resources.ResourceHelper.addPreference @@ -27,6 +28,7 @@ import org.w3c.dom.Element @DependsOn( [ IntegrationsPatch::class, + OldLayoutPatch::class, PatchOptions::class, SharedResourcdIdPatch::class, SettingsBytecodePatch::class @@ -101,12 +103,12 @@ class SettingsPatch : AbstractSettingsResourcePatch( contexts.addPreference(settingArray) } - internal fun updatePatchStatus(patchTitle: String) { - contexts.updatePatchStatus(patchTitle) - } - internal fun addReVancedPreference(key: String) { contexts.addReVancedPreference(key) } + + internal fun updatePatchStatus(patchTitle: String) { + contexts.updatePatchStatus(patchTitle) + } } } \ No newline at end of file diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml index 2aca63e23..32ce087f3 100644 --- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml +++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml @@ -343,8 +343,7 @@ SETTINGS: ENABLE_MINIMIZED_PLAYBACK --> - + @@ -429,7 +428,6 @@ -