ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-05-28 04:40:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(YouTube/Overlay buttons): add Hide fullscreen button settings

Browse Source
This commit is contained in:
inotia00 2024-03-23 20:12:37 +09:00
parent 08eb59e276
commit d895abd41a
7 changed files with 69 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/kotlin/app/revanced/patches/shared/patch/mapping/ResourceType.kt
View File

@ -7,6 +7,7 @@ enum class ResourceType(val value: String) {
DIMEN("dimen"),
DRAWABLE("drawable"),
ID("id"),
INTEGER("integer"),
LAYOUT("layout"),
STRING("string"),
STYLE("style")

39
src/main/kotlin/app/revanced/patches/youtube/overlaybutton/fullscreen/FullscreenButtonPatch.kt Normal file
View File

@ -0,0 +1,39 @@
package app.revanced.patches.youtube.overlaybutton.fullscreen
import app.revanced.patcher.data.BytecodeContext
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patcher.util.smali.ExternalLabel
import app.revanced.patches.youtube.overlaybutton.fullscreen.fingerprints.FullScreenButtonFingerprint
import app.revanced.patches.youtube.utils.integrations.Constants.UTILS_PATH
import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch
import app.revanced.util.exception
import app.revanced.util.getTargetIndexWithReference
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
@Patch(dependencies = [SharedResourceIdPatch::class])
object FullscreenButtonPatch : BytecodePatch(
setOf(FullScreenButtonFingerprint)
) {
override fun execute(context: BytecodeContext) {
FullScreenButtonFingerprint.result?.let {
it.mutableMethod.apply {
val viewIndex = getTargetIndexWithReference("Landroid/widget/ImageView;->getResources()Landroid/content/res/Resources;")
val viewRegister = getInstruction<FiveRegisterInstruction>(viewIndex).registerC
addInstructionsWithLabels(
viewIndex, """
invoke-static {v$viewRegister}, $UTILS_PATH/FullscreenButtonPatch;->hideFullscreenButton(Landroid/widget/ImageView;)Landroid/widget/ImageView;
move-result-object v$viewRegister
if-nez v$viewRegister, :show
return-void
""", ExternalLabel("show", getInstruction(viewIndex))
)
}
} ?: throw FullScreenButtonFingerprint.exception
}
}

18
src/main/kotlin/app/revanced/patches/youtube/overlaybutton/fullscreen/fingerprints/FullScreenButtonFingerprint.kt Normal file
View File

@ -0,0 +1,18 @@
package app.revanced.patches.youtube.overlaybutton.fullscreen.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.MethodFingerprint
import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.FadeDurationFast
import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.FullScreenButton
import app.revanced.util.containsWideLiteralInstructionIndex
import com.android.tools.smali.dexlib2.AccessFlags
object FullScreenButtonFingerprint : MethodFingerprint(
returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.FINAL,
parameters = listOf("Landroid/view/View;"),
customFingerprint = { methodDef, _ ->
methodDef.containsWideLiteralInstructionIndex(FadeDurationFast)
&& methodDef.containsWideLiteralInstructionIndex(FullScreenButton)
},
)

2
src/main/kotlin/app/revanced/patches/youtube/overlaybutton/general/OverlayButtonsPatch.kt
View File

@ -8,6 +8,7 @@ import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.booleanPat
import app.revanced.patches.youtube.overlaybutton.alwaysrepeat.AlwaysRepeatPatch
import app.revanced.patches.youtube.overlaybutton.download.hook.DownloadButtonHookPatch
import app.revanced.patches.youtube.overlaybutton.download.pip.DisablePiPPatch
import app.revanced.patches.youtube.overlaybutton.fullscreen.FullscreenButtonPatch
import app.revanced.patches.youtube.utils.integrations.Constants.OVERLAY_BUTTONS_PATH
import app.revanced.patches.youtube.utils.overridespeed.OverrideSpeedHookPatch
import app.revanced.patches.youtube.utils.playerbutton.PlayerButtonHookPatch
@ -28,6 +29,7 @@ import org.w3c.dom.Element
AlwaysRepeatPatch::class,
DisablePiPPatch::class,
DownloadButtonHookPatch::class,
FullscreenButtonPatch::class,
OverrideSpeedHookPatch::class,
PlayerButtonHookPatch::class,
PlayerControlsPatch::class,

5
src/main/kotlin/app/revanced/patches/youtube/utils/resourceid/SharedResourceIdPatch.kt
View File

@ -9,6 +9,7 @@ import app.revanced.patches.shared.patch.mapping.ResourceType.COLOR
import app.revanced.patches.shared.patch.mapping.ResourceType.DIMEN
import app.revanced.patches.shared.patch.mapping.ResourceType.DRAWABLE
import app.revanced.patches.shared.patch.mapping.ResourceType.ID
import app.revanced.patches.shared.patch.mapping.ResourceType.INTEGER
import app.revanced.patches.shared.patch.mapping.ResourceType.LAYOUT
import app.revanced.patches.shared.patch.mapping.ResourceType.STRING
@ -42,8 +43,10 @@ object SharedResourceIdPatch : ResourcePatch() {
var EmojiPickerIcon: Long = -1
var ExpandButtonDown: Long = -1
var Fab: Long = -1
var FadeDurationFast: Long = -1
var FilterBarHeight: Long = -1
var FloatyBarTopMargin: Long = -1
var FullScreenButton: Long = -1
var FullScreenEngagementOverlay: Long = -1
var FullScreenEngagementPanel: Long = -1
var HorizontalCardList: Long = -1
@ -125,8 +128,10 @@ object SharedResourceIdPatch : ResourcePatch() {
EmojiPickerIcon = find(ID, "emoji_picker_icon")
ExpandButtonDown = find(LAYOUT, "expand_button_down")
Fab = find(ID, "fab")
FadeDurationFast = find(INTEGER, "fade_duration_fast")
FilterBarHeight = find(DIMEN, "filter_bar_height")
FloatyBarTopMargin = find(DIMEN, "floaty_bar_button_top_margin")
FullScreenButton = find(ID, "fullscreen_button")
FullScreenEngagementOverlay = find(LAYOUT, "fullscreen_engagement_overlay")
FullScreenEngagementPanel = find(ID, "fullscreen_engagement_panel_holder")
HorizontalCardList = find(LAYOUT, "horizontal_card_list")

3
src/main/resources/youtube/settings/host/values/strings.xml
View File

@ -423,6 +423,9 @@ Some components may not be hidden."</string>
<string name="revanced_hide_for_you_shelf_summary_off">"'For You' shelves are shown."</string>
<string name="revanced_hide_for_you_shelf_summary_on">"'For You' shelves are hidden."</string>
<string name="revanced_hide_for_you_shelf_title">"Hide 'For You' shelf"</string>
<string name="revanced_hide_fullscreen_button_summary_off">Fullscreen button is shown.</string>
<string name="revanced_hide_fullscreen_button_summary_on">Fullscreen button is hidden.</string>
<string name="revanced_hide_fullscreen_button_title">Hide fullscreen button</string>
<string name="revanced_hide_fullscreen_panels_summary_off">Fullscreen panels are shown.</string>
<string name="revanced_hide_fullscreen_panels_summary_on">Fullscreen panels are hidden.</string>
<string name="revanced_hide_fullscreen_panels_title">Hide fullscreen panels</string>

1
src/main/resources/youtube/settings/xml/revanced_prefs.xml
View File

@ -564,6 +564,7 @@
<!-- PREFERENCE: OVERLAY_BUTTONS
<PreferenceScreen android:title="@string/revanced_overlay_button" android:key="overlay_button">
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_overlay_button" />
<SwitchPreference android:title="@string/revanced_hide_fullscreen_button_title" android:key="revanced_hide_fullscreen_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_fullscreen_button_summary_on" android:summaryOff="@string/revanced_hide_fullscreen_button_summary_off" />
<SwitchPreference android:title="@string/revanced_overlay_button_always_repeat_title" android:key="revanced_overlay_button_always_repeat" android:defaultValue="false" android:summary="@string/revanced_overlay_button_always_repeat_summary" />
<SwitchPreference android:title="@string/revanced_overlay_button_copy_video_url_timestamp_title" android:key="revanced_overlay_button_copy_video_url_timestamp" android:defaultValue="false" android:summary="@string/revanced_overlay_button_copy_video_url_timestamp_summary" />
<SwitchPreference android:title="@string/revanced_overlay_button_copy_video_url_title" android:key="revanced_overlay_button_copy_video_url" android:defaultValue="false" android:summary="@string/revanced_overlay_button_copy_video_url_summary" />