2023-09-20 05:33:02 +02:00
|
|
|
package app.revanced.patches.youtube.layout.hide.general
|
2023-06-14 03:30:15 +02:00
|
|
|
|
2023-07-08 04:27:45 +02:00
|
|
|
import app.revanced.patcher.data.BytecodeContext
|
2024-04-04 23:09:28 +02:00
|
|
|
import app.revanced.patcher.extensions.InstructionExtensions.addInstruction
|
2023-10-13 17:13:48 +02:00
|
|
|
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
|
2023-07-08 04:27:45 +02:00
|
|
|
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
|
|
|
|
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
|
2023-08-27 21:40:49 +02:00
|
|
|
import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
|
2023-10-13 17:13:48 +02:00
|
|
|
import app.revanced.patcher.extensions.InstructionExtensions.removeInstruction
|
2023-07-08 04:27:45 +02:00
|
|
|
import app.revanced.patcher.patch.BytecodePatch
|
2023-09-20 05:33:02 +02:00
|
|
|
import app.revanced.patcher.patch.annotation.CompatiblePackage
|
|
|
|
import app.revanced.patcher.patch.annotation.Patch
|
2023-07-08 04:27:45 +02:00
|
|
|
import app.revanced.patcher.util.smali.ExternalLabel
|
2024-01-27 02:34:01 +01:00
|
|
|
import app.revanced.patches.all.misc.resources.AddResourcesPatch
|
2024-04-14 02:06:41 +02:00
|
|
|
import app.revanced.patches.shared.misc.settings.preference.*
|
2024-03-02 08:27:05 +01:00
|
|
|
import app.revanced.patches.shared.misc.settings.preference.PreferenceScreen.Sorting
|
2024-04-04 23:09:28 +02:00
|
|
|
import app.revanced.patches.youtube.layout.hide.general.fingerprints.HideShowMoreButtonFingerprint
|
2023-08-27 21:40:49 +02:00
|
|
|
import app.revanced.patches.youtube.layout.hide.general.fingerprints.ParseElementFromBufferFingerprint
|
2023-10-13 17:13:48 +02:00
|
|
|
import app.revanced.patches.youtube.layout.hide.general.fingerprints.PlayerOverlayFingerprint
|
|
|
|
import app.revanced.patches.youtube.layout.hide.general.fingerprints.ShowWatermarkFingerprint
|
2023-09-20 05:33:02 +02:00
|
|
|
import app.revanced.patches.youtube.misc.litho.filter.LithoFilterPatch
|
2024-03-27 08:26:40 +01:00
|
|
|
import app.revanced.patches.youtube.misc.navigation.NavigationBarHookPatch
|
2023-09-20 05:33:02 +02:00
|
|
|
import app.revanced.patches.youtube.misc.settings.SettingsPatch
|
2024-03-27 08:26:40 +01:00
|
|
|
import app.revanced.util.resultOrThrow
|
2023-08-27 21:40:49 +02:00
|
|
|
import com.android.tools.smali.dexlib2.Opcode
|
|
|
|
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
|
2024-04-04 23:09:28 +02:00
|
|
|
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
|
2023-11-12 16:23:57 +01:00
|
|
|
import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
|
2023-06-14 03:30:15 +02:00
|
|
|
|
2023-09-20 05:33:02 +02:00
|
|
|
@Patch(
|
|
|
|
name = "Hide layout components",
|
2024-01-01 16:30:04 +01:00
|
|
|
description = "Adds options to hide general layout components.",
|
2023-09-20 05:33:02 +02:00
|
|
|
dependencies = [
|
|
|
|
LithoFilterPatch::class,
|
2024-01-27 02:34:01 +01:00
|
|
|
SettingsPatch::class,
|
2024-03-02 08:27:05 +01:00
|
|
|
AddResourcesPatch::class,
|
2024-04-04 23:09:28 +02:00
|
|
|
HideLayoutComponentsResourcePatch::class,
|
2024-03-27 08:26:40 +01:00
|
|
|
NavigationBarHookPatch::class,
|
2023-09-20 05:33:02 +02:00
|
|
|
],
|
2023-09-28 01:28:25 +02:00
|
|
|
compatiblePackages = [
|
|
|
|
CompatiblePackage(
|
2024-03-02 08:27:05 +01:00
|
|
|
"com.google.android.youtube",
|
|
|
|
[
|
2023-09-28 01:28:25 +02:00
|
|
|
"18.32.39",
|
2023-10-08 03:37:42 +02:00
|
|
|
"18.37.36",
|
2023-11-12 16:43:11 +01:00
|
|
|
"18.38.44",
|
2023-11-12 17:01:49 +01:00
|
|
|
"18.43.45",
|
|
|
|
"18.44.41",
|
2024-01-16 19:54:06 +01:00
|
|
|
"18.45.43",
|
|
|
|
"18.48.39",
|
|
|
|
"18.49.37",
|
2024-01-17 21:24:55 +01:00
|
|
|
"19.01.34",
|
2024-01-24 14:19:02 +01:00
|
|
|
"19.02.39",
|
2024-02-04 18:38:19 +01:00
|
|
|
"19.03.36",
|
2024-03-11 14:20:07 +01:00
|
|
|
"19.04.38",
|
|
|
|
"19.05.36",
|
|
|
|
"19.06.39",
|
|
|
|
"19.07.40",
|
|
|
|
"19.08.36",
|
2024-04-17 18:06:03 +02:00
|
|
|
"19.09.38",
|
|
|
|
"19.10.39",
|
|
|
|
"19.11.43"
|
2024-03-02 08:27:05 +01:00
|
|
|
],
|
|
|
|
),
|
|
|
|
],
|
2023-09-20 05:33:02 +02:00
|
|
|
)
|
|
|
|
@Suppress("unused")
|
|
|
|
object HideLayoutComponentsPatch : BytecodePatch(
|
2024-04-04 23:09:28 +02:00
|
|
|
setOf(ParseElementFromBufferFingerprint, PlayerOverlayFingerprint, HideShowMoreButtonFingerprint),
|
2023-07-08 04:27:45 +02:00
|
|
|
) {
|
2023-11-18 04:34:17 +01:00
|
|
|
private const val LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR =
|
2024-01-01 16:33:07 +01:00
|
|
|
"Lapp/revanced/integrations/youtube/patches/components/LayoutComponentsFilter;"
|
2023-11-18 04:34:17 +01:00
|
|
|
private const val DESCRIPTION_COMPONENTS_FILTER_CLASS_NAME =
|
2024-01-01 16:33:07 +01:00
|
|
|
"Lapp/revanced/integrations/youtube/patches/components/DescriptionComponentsFilter;"
|
2024-02-02 09:15:34 +01:00
|
|
|
private const val CUSTOM_FILTER_CLASS_NAME =
|
|
|
|
"Lapp/revanced/integrations/youtube/patches/components/CustomFilter;"
|
2024-03-27 08:26:40 +01:00
|
|
|
private const val KEYWORD_FILTER_CLASS_NAME =
|
|
|
|
"Lapp/revanced/integrations/youtube/patches/components/KeywordContentFilter;"
|
2024-02-02 09:15:34 +01:00
|
|
|
|
2023-08-27 21:40:49 +02:00
|
|
|
override fun execute(context: BytecodeContext) {
|
2024-01-27 02:34:01 +01:00
|
|
|
AddResourcesPatch(this::class)
|
|
|
|
|
2024-03-02 08:27:05 +01:00
|
|
|
SettingsPatch.PreferenceScreen.PLAYER.addPreferences(
|
|
|
|
SwitchPreference("revanced_hide_channel_bar"),
|
2024-01-27 02:34:01 +01:00
|
|
|
SwitchPreference("revanced_hide_channel_guidelines"),
|
|
|
|
SwitchPreference("revanced_hide_channel_member_shelf"),
|
2024-03-02 08:27:05 +01:00
|
|
|
SwitchPreference("revanced_hide_channel_watermark"),
|
2024-01-27 02:34:01 +01:00
|
|
|
SwitchPreference("revanced_hide_chips_shelf"),
|
2024-03-02 08:27:05 +01:00
|
|
|
SwitchPreference("revanced_hide_community_guidelines"),
|
|
|
|
PreferenceScreen(
|
|
|
|
key = "revanced_hide_description_components_screen",
|
2024-01-27 02:34:01 +01:00
|
|
|
preferences = setOf(
|
2024-03-02 08:27:05 +01:00
|
|
|
SwitchPreference("revanced_hide_chapters"),
|
2024-01-27 02:34:01 +01:00
|
|
|
SwitchPreference("revanced_hide_info_cards_section"),
|
|
|
|
SwitchPreference("revanced_hide_game_section"),
|
|
|
|
SwitchPreference("revanced_hide_music_section"),
|
|
|
|
SwitchPreference("revanced_hide_podcast_section"),
|
|
|
|
SwitchPreference("revanced_hide_transcript_section"),
|
2024-03-02 08:27:05 +01:00
|
|
|
),
|
2023-11-18 04:34:17 +01:00
|
|
|
),
|
2024-03-02 08:27:05 +01:00
|
|
|
SwitchPreference("revanced_hide_emergency_box"),
|
|
|
|
SwitchPreference("revanced_hide_expandable_chip"),
|
|
|
|
SwitchPreference("revanced_hide_info_panels"),
|
2024-03-26 01:35:51 +01:00
|
|
|
SwitchPreference("revanced_hide_join_membership_button"),
|
2024-03-02 08:27:05 +01:00
|
|
|
SwitchPreference("revanced_hide_medical_panels"),
|
2024-04-14 02:06:41 +02:00
|
|
|
SwitchPreference("revanced_hide_playables"),
|
2024-03-02 08:27:05 +01:00
|
|
|
SwitchPreference("revanced_hide_quick_actions"),
|
|
|
|
SwitchPreference("revanced_hide_related_videos"),
|
|
|
|
SwitchPreference("revanced_hide_subscribers_community_guidelines"),
|
|
|
|
SwitchPreference("revanced_hide_timed_reactions"),
|
|
|
|
)
|
|
|
|
|
|
|
|
SettingsPatch.PreferenceScreen.FEED.addPreferences(
|
|
|
|
SwitchPreference("revanced_hide_artist_cards"),
|
|
|
|
SwitchPreference("revanced_hide_community_posts"),
|
|
|
|
SwitchPreference("revanced_hide_compact_banner"),
|
|
|
|
SwitchPreference("revanced_hide_feed_survey"),
|
|
|
|
SwitchPreference("revanced_hide_for_you_shelf"),
|
2024-04-06 20:49:03 +02:00
|
|
|
SwitchPreference("revanced_hide_horizontal_shelves"),
|
2024-03-02 08:27:05 +01:00
|
|
|
SwitchPreference("revanced_hide_image_shelf"),
|
|
|
|
SwitchPreference("revanced_hide_latest_posts_ads"),
|
|
|
|
SwitchPreference("revanced_hide_mix_playlists"),
|
|
|
|
SwitchPreference("revanced_hide_movies_section"),
|
|
|
|
SwitchPreference("revanced_hide_notify_me_button"),
|
|
|
|
SwitchPreference("revanced_hide_search_result_recommendations"),
|
|
|
|
SwitchPreference("revanced_hide_search_result_shelf_header"),
|
2024-04-04 23:09:28 +02:00
|
|
|
SwitchPreference("revanced_hide_show_more_button"),
|
2024-03-27 08:26:40 +01:00
|
|
|
PreferenceScreen(
|
|
|
|
key = "revanced_hide_keyword_content_screen",
|
|
|
|
sorting = Sorting.UNSORTED,
|
|
|
|
preferences = setOf(
|
|
|
|
SwitchPreference("revanced_hide_keyword_content_home"),
|
|
|
|
SwitchPreference("revanced_hide_keyword_content_subscriptions"),
|
|
|
|
SwitchPreference("revanced_hide_keyword_content_search"),
|
|
|
|
TextPreference("revanced_hide_keyword_content_phrases", inputType = InputType.TEXT_MULTI_LINE),
|
2024-04-06 20:49:03 +02:00
|
|
|
NonInteractivePreference("revanced_hide_keyword_content_about"),
|
|
|
|
),
|
|
|
|
),
|
2024-03-27 08:26:40 +01:00
|
|
|
)
|
|
|
|
|
2024-03-02 08:27:05 +01:00
|
|
|
SettingsPatch.PreferenceScreen.GENERAL_LAYOUT.addPreferences(
|
|
|
|
SwitchPreference("revanced_hide_gray_separator"),
|
|
|
|
PreferenceScreen(
|
|
|
|
key = "revanced_custom_filter_screen",
|
|
|
|
sorting = Sorting.UNSORTED,
|
2024-01-27 02:34:01 +01:00
|
|
|
preferences = setOf(
|
|
|
|
SwitchPreference("revanced_custom_filter"),
|
2023-06-14 03:30:15 +02:00
|
|
|
// TODO: This should be a dynamic ListPreference, which does not exist yet
|
2024-03-02 08:27:05 +01:00
|
|
|
TextPreference("revanced_custom_filter_strings", inputType = InputType.TEXT_MULTI_LINE),
|
|
|
|
),
|
|
|
|
),
|
|
|
|
)
|
|
|
|
|
|
|
|
SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
|
|
|
|
SwitchPreference("revanced_hide_video_quality_menu_footer"),
|
2023-06-14 03:30:15 +02:00
|
|
|
)
|
|
|
|
|
2023-11-18 04:34:17 +01:00
|
|
|
LithoFilterPatch.addFilter(LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR)
|
|
|
|
LithoFilterPatch.addFilter(DESCRIPTION_COMPONENTS_FILTER_CLASS_NAME)
|
2024-03-27 08:26:40 +01:00
|
|
|
LithoFilterPatch.addFilter(KEYWORD_FILTER_CLASS_NAME)
|
2024-02-02 09:15:34 +01:00
|
|
|
LithoFilterPatch.addFilter(CUSTOM_FILTER_CLASS_NAME)
|
2023-06-14 03:30:15 +02:00
|
|
|
|
2023-07-08 04:27:45 +02:00
|
|
|
// region Mix playlists
|
|
|
|
|
2024-03-27 08:26:40 +01:00
|
|
|
ParseElementFromBufferFingerprint.resultOrThrow().let { result ->
|
|
|
|
val consumeByteBufferIndex = result.scanResult.patternScanResult!!.startIndex
|
2023-07-08 04:27:45 +02:00
|
|
|
|
2023-08-27 21:40:49 +02:00
|
|
|
result.mutableMethod.apply {
|
2023-11-12 16:23:57 +01:00
|
|
|
val conversionContextRegister =
|
|
|
|
getInstruction<TwoRegisterInstruction>(consumeByteBufferIndex - 2).registerA
|
2024-01-27 02:34:01 +01:00
|
|
|
val byteBufferRegister = getInstruction<FiveRegisterInstruction>(consumeByteBufferIndex).registerD
|
2024-03-27 08:26:40 +01:00
|
|
|
val returnEmptyComponentInstruction = getInstructions().last { it.opcode == Opcode.INVOKE_STATIC }
|
2023-07-08 04:27:45 +02:00
|
|
|
|
|
|
|
addInstructionsWithLabels(
|
2024-03-02 08:27:05 +01:00
|
|
|
consumeByteBufferIndex,
|
|
|
|
"""
|
2023-11-18 04:34:17 +01:00
|
|
|
invoke-static {v$conversionContextRegister, v$byteBufferRegister}, $LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR->filterMixPlaylists(Ljava/lang/Object;[B)Z
|
2023-08-27 21:40:49 +02:00
|
|
|
move-result v0 # Conveniently same register happens to be free.
|
|
|
|
if-nez v0, :return_empty_component
|
2024-03-02 08:27:05 +01:00
|
|
|
""",
|
|
|
|
ExternalLabel("return_empty_component", returnEmptyComponentInstruction),
|
2023-07-08 04:27:45 +02:00
|
|
|
)
|
|
|
|
}
|
2024-03-27 08:26:40 +01:00
|
|
|
}
|
2023-07-08 04:27:45 +02:00
|
|
|
|
|
|
|
// endregion
|
2023-10-13 17:13:48 +02:00
|
|
|
|
|
|
|
// region Watermark (legacy code for old versions of YouTube)
|
|
|
|
|
|
|
|
ShowWatermarkFingerprint.also {
|
2024-03-27 08:26:40 +01:00
|
|
|
it.resolve(context, PlayerOverlayFingerprint.resultOrThrow().classDef)
|
|
|
|
}.resultOrThrow().mutableMethod.apply {
|
2023-10-13 17:13:48 +02:00
|
|
|
val index = implementation!!.instructions.size - 5
|
|
|
|
|
|
|
|
removeInstruction(index)
|
|
|
|
addInstructions(
|
2024-03-02 08:27:05 +01:00
|
|
|
index,
|
|
|
|
"""
|
2023-11-18 04:34:17 +01:00
|
|
|
invoke-static {}, $LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR->showWatermark()Z
|
2023-10-13 17:13:48 +02:00
|
|
|
move-result p2
|
2024-03-02 08:27:05 +01:00
|
|
|
""",
|
2023-10-13 17:13:48 +02:00
|
|
|
)
|
2024-03-27 08:26:40 +01:00
|
|
|
}
|
2023-10-13 17:13:48 +02:00
|
|
|
|
|
|
|
// endregion
|
2024-04-04 23:09:28 +02:00
|
|
|
|
|
|
|
// region Show more button
|
|
|
|
|
|
|
|
HideShowMoreButtonFingerprint.resultOrThrow().let {
|
|
|
|
it.mutableMethod.apply {
|
|
|
|
val moveRegisterIndex = it.scanResult.patternScanResult!!.endIndex
|
|
|
|
val viewRegister =
|
|
|
|
getInstruction<OneRegisterInstruction>(moveRegisterIndex).registerA
|
|
|
|
|
|
|
|
val insertIndex = moveRegisterIndex + 1
|
|
|
|
addInstruction(
|
|
|
|
insertIndex,
|
|
|
|
"invoke-static { v$viewRegister }, " +
|
2024-04-06 20:49:03 +02:00
|
|
|
"$LAYOUT_COMPONENTS_FILTER_CLASS_DESCRIPTOR->hideShowMoreButton(Landroid/view/View;)V",
|
2024-04-04 23:09:28 +02:00
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// endregion
|
2023-06-14 03:30:15 +02:00
|
|
|
}
|
|
|
|
}
|