feat(YouTube - Hide Shorts components): Add patch option to hide Shor…

…ts app shortcut (long press app icon) (#3699) Co-authored-by: oSumAtrIX <[email protected]>
ReVanced · Sep 27, 2024 · 0d4e1f5 · 0d4e1f5
1 parent aa01578
commit 0d4e1f5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt
@@ -6,6 +6,7 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
 import app.revanced.patcher.patch.BytecodePatch
 import app.revanced.patcher.patch.annotation.CompatiblePackage
 import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.booleanPatchOption
 import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
 import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
 import app.revanced.patches.youtube.layout.hide.shorts.fingerprints.*
@@ -76,6 +77,13 @@ object HideShortsComponentsPatch : BytecodePatch(
 ) {
     private const val FILTER_CLASS_DESCRIPTOR = "Lapp/revanced/integrations/youtube/patches/components/ShortsFilter;"
 
+    internal val hideShortsAppShortcut by booleanPatchOption(
+        key = "hideShortsAppShortcut",
+        default = false,
+        title = "Hide Shorts app shortcut",
+        description = "Permanently hides the shortcut to open Shorts from long pressing the app icon in your launcher."
+    )
+
     override fun execute(context: BytecodeContext) {
         // region Hide the Shorts shelf.
 

diff --git a/...tlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt b/...tlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsResourcePatch.kt
@@ -6,7 +6,10 @@ import app.revanced.patcher.patch.annotation.Patch
 import app.revanced.patches.all.misc.resources.AddResourcesPatch
 import app.revanced.patches.shared.misc.mapping.ResourceMappingPatch
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
+import app.revanced.patches.youtube.layout.hide.shorts.HideShortsComponentsPatch.hideShortsAppShortcut
 import app.revanced.patches.youtube.misc.settings.SettingsPatch
+import app.revanced.util.findElementByAttributeValueOrThrow
+import org.w3c.dom.Element
 
 @Patch(dependencies = [SettingsPatch::class, ResourceMappingPatch::class, AddResourcesPatch::class])
 object HideShortsComponentsResourcePatch : ResourcePatch() {
@@ -52,6 +55,19 @@ object HideShortsComponentsResourcePatch : ResourcePatch() {
             SwitchPreference("revanced_hide_shorts_navigation_bar"),
         )
 
+        if (hideShortsAppShortcut == true) {
+            context.xmlEditor["res/xml/main_shortcuts.xml"].use { editor ->
+                val shortcuts = editor.file.getElementsByTagName("shortcuts").item(0) as Element
+                val shortsItem =
+                    shortcuts.getElementsByTagName("shortcut").findElementByAttributeValueOrThrow(
+                        "android:shortcutId",
+                        "shorts-shortcut"
+                    )
+
+                shortsItem.parentNode.removeChild(shortsItem)
+            }
+        }
+
         reelPlayerRightCellButtonHeight = ResourceMappingPatch[
             "dimen",
             "reel_player_right_cell_button_height",