fix(YouTube/Settings): move Hide cast button setting to General settings

This commit is contained in:
inotia00 2024-01-27 04:33:50 +09:00
parent aa6d8106c5
commit 5f68438d54
3 changed files with 11 additions and 11 deletions

View File

@ -1,18 +1,18 @@
package app.revanced.patches.youtube.player.castbutton package app.revanced.patches.youtube.general.castbutton
import app.revanced.patcher.data.BytecodeContext import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.CompatiblePackage
import app.revanced.patcher.patch.annotation.Patch import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patches.youtube.player.castbutton.fingerprints.CastButtonFingerprint import app.revanced.patches.youtube.general.castbutton.fingerprints.CastButtonFingerprint
import app.revanced.patches.youtube.utils.integrations.Constants.PLAYER import app.revanced.patches.youtube.utils.integrations.Constants.GENERAL
import app.revanced.patches.youtube.utils.settings.SettingsPatch import app.revanced.patches.youtube.utils.settings.SettingsPatch
import app.revanced.util.exception import app.revanced.util.exception
@Patch( @Patch(
name = "Hide cast button", name = "Hide cast button",
description = "Hides the cast button in the video player.", description = "Adds an option to hide the cast button.",
dependencies = [SettingsPatch::class], dependencies = [SettingsPatch::class],
compatiblePackages = [ compatiblePackages = [
CompatiblePackage( CompatiblePackage(
@ -55,7 +55,7 @@ object HideCastButtonPatch : BytecodePatch(
it.mutableMethod.apply { it.mutableMethod.apply {
addInstructions( addInstructions(
0, """ 0, """
invoke-static {p1}, $PLAYER->hideCastButton(I)I invoke-static {p1}, $GENERAL->hideCastButton(I)I
move-result p1 move-result p1
""" """
) )
@ -67,7 +67,7 @@ object HideCastButtonPatch : BytecodePatch(
*/ */
SettingsPatch.addPreference( SettingsPatch.addPreference(
arrayOf( arrayOf(
"PREFERENCE: PLAYER_SETTINGS", "PREFERENCE: GENERAL_SETTINGS",
"SETTINGS: HIDE_CAST_BUTTON" "SETTINGS: HIDE_CAST_BUTTON"
) )
) )

View File

@ -1,4 +1,4 @@
package app.revanced.patches.youtube.player.castbutton.fingerprints package app.revanced.patches.youtube.general.castbutton.fingerprints
import app.revanced.patcher.fingerprint.MethodFingerprint import app.revanced.patcher.fingerprint.MethodFingerprint

View File

@ -216,6 +216,9 @@
<!-- SETTINGS: HIDE_AUTO_PLAYER_POPUP_PANELS <!-- SETTINGS: HIDE_AUTO_PLAYER_POPUP_PANELS
<SwitchPreference android:title="@string/revanced_hide_auto_player_popup_panels_title" android:key="revanced_hide_auto_player_popup_panels" android:defaultValue="true" android:summaryOn="@string/revanced_hide_auto_player_popup_panels_summary_on" android:summaryOff="@string/revanced_hide_auto_player_popup_panels_summary_off" />SETTINGS: HIDE_AUTO_PLAYER_POPUP_PANELS --> <SwitchPreference android:title="@string/revanced_hide_auto_player_popup_panels_title" android:key="revanced_hide_auto_player_popup_panels" android:defaultValue="true" android:summaryOn="@string/revanced_hide_auto_player_popup_panels_summary_on" android:summaryOff="@string/revanced_hide_auto_player_popup_panels_summary_off" />SETTINGS: HIDE_AUTO_PLAYER_POPUP_PANELS -->
<!-- SETTINGS: HIDE_CAST_BUTTON
<SwitchPreference android:title="@string/revanced_hide_cast_button_title" android:key="revanced_hide_cast_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_cast_button_summary_on" android:summaryOff="@string/revanced_hide_cast_button_summary_off" />SETTINGS: HIDE_CAST_BUTTON -->
<!-- SETTINGS: HIDE_CATEGORY_BAR <!-- SETTINGS: HIDE_CATEGORY_BAR
<SwitchPreference android:title="@string/revanced_hide_category_bar_in_feed_title" android:key="revanced_hide_category_bar_in_feed" android:defaultValue="false" android:summaryOn="@string/revanced_hide_category_bar_summary_on" android:summaryOff="@string/revanced_hide_category_bar_summary_off" /> <SwitchPreference android:title="@string/revanced_hide_category_bar_in_feed_title" android:key="revanced_hide_category_bar_in_feed" android:defaultValue="false" android:summaryOn="@string/revanced_hide_category_bar_summary_on" android:summaryOff="@string/revanced_hide_category_bar_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_category_bar_in_related_video_title" android:key="revanced_hide_category_bar_in_related_video" android:defaultValue="false" android:summaryOn="@string/revanced_hide_category_bar_summary_on" android:summaryOff="@string/revanced_hide_category_bar_summary_off" /> <SwitchPreference android:title="@string/revanced_hide_category_bar_in_related_video_title" android:key="revanced_hide_category_bar_in_related_video" android:defaultValue="false" android:summaryOn="@string/revanced_hide_category_bar_summary_on" android:summaryOff="@string/revanced_hide_category_bar_summary_off" />
@ -431,6 +434,7 @@
<Preference android:title="Enable wide search bar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/> <Preference android:title="Enable wide search bar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="Hide account menu" android:summary="@string/revanced_patches_excluded" android:selectable="false"/> <Preference android:title="Hide account menu" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="Hide auto player popup panels" android:summary="@string/revanced_patches_excluded" android:selectable="false"/> <Preference android:title="Hide auto player popup panels" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="Hide cast button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="Hide category bar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/> <Preference android:title="Hide category bar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="Hide channel avatar section" android:summary="@string/revanced_patches_excluded" android:selectable="false"/> <Preference android:title="Hide channel avatar section" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="Hide crowdfunding box" android:summary="@string/revanced_patches_excluded" android:selectable="false"/> <Preference android:title="Hide crowdfunding box" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
@ -479,7 +483,6 @@
<Preference android:title="Disable speed overlay" android:summary="@string/revanced_patches_excluded" android:selectable="false"/> <Preference android:title="Disable speed overlay" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="Hide autoplay button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/> <Preference android:title="Hide autoplay button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="Hide captions button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/> <Preference android:title="Hide captions button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="Hide cast button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="Hide channel watermark" android:summary="@string/revanced_patches_excluded" android:selectable="false"/> <Preference android:title="Hide channel watermark" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="Hide collapse button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/> <Preference android:title="Hide collapse button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
<Preference android:title="Hide end screen cards" android:summary="@string/revanced_patches_excluded" android:selectable="false"/> <Preference android:title="Hide end screen cards" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
@ -592,9 +595,6 @@
<!-- SETTINGS: HIDE_CAPTIONS_BUTTON <!-- SETTINGS: HIDE_CAPTIONS_BUTTON
<SwitchPreference android:title="@string/revanced_hide_captions_button_title" android:key="revanced_hide_captions_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_captions_button_summary_on" android:summaryOff="@string/revanced_hide_captions_button_summary_off" />SETTINGS: HIDE_CAPTIONS_BUTTON --> <SwitchPreference android:title="@string/revanced_hide_captions_button_title" android:key="revanced_hide_captions_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_captions_button_summary_on" android:summaryOff="@string/revanced_hide_captions_button_summary_off" />SETTINGS: HIDE_CAPTIONS_BUTTON -->
<!-- SETTINGS: HIDE_CAST_BUTTON
<SwitchPreference android:title="@string/revanced_hide_cast_button_title" android:key="revanced_hide_cast_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_cast_button_summary_on" android:summaryOff="@string/revanced_hide_cast_button_summary_off" />SETTINGS: HIDE_CAST_BUTTON -->
<!-- SETTINGS: HIDE_CHANNEL_WATERMARK <!-- SETTINGS: HIDE_CHANNEL_WATERMARK
<SwitchPreference android:title="@string/revanced_hide_channel_watermark_title" android:key="revanced_hide_channel_watermark" android:defaultValue="true" android:summaryOn="@string/revanced_hide_channel_watermark_summary_on" android:summaryOff="@string/revanced_hide_channel_watermark_summary_off" />SETTINGS: HIDE_CHANNEL_WATERMARK --> <SwitchPreference android:title="@string/revanced_hide_channel_watermark_title" android:key="revanced_hide_channel_watermark" android:defaultValue="true" android:summaryOn="@string/revanced_hide_channel_watermark_summary_on" android:summaryOff="@string/revanced_hide_channel_watermark_summary_off" />SETTINGS: HIDE_CHANNEL_WATERMARK -->