ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-06-12 13:17:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(YouTube - Overlay buttons): Allow setting patch options Bottom margin and Wider between-buttons space for YouTube 19.17+ (#129)

Browse Source 
* allow using bottom margin and wider buttons options for 19.16+

* allow using bottom margin and wider buttons options for 19.16+

* update old and add some res under play_all generated playlist

* fix: Build error

* chore: Lint code

---------

Co-authored-by: inotia00 <108592928+inotia00@users.noreply.github.com>
This commit is contained in:
MondayNitro
2025-01-19 11:42:29 +05:30
committed by GitHub
parent 66b7761e77
commit 4892b701e6
46 changed files with 39 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
patches/src/main/kotlin/app/revanced/patches/youtube/player/overlaybuttons/OverlayButtonsPatch.kt
View File

@ -15,15 +15,12 @@ import app.revanced.patches.youtube.utils.patch.PatchList.OVERLAY_BUTTONS
import app.revanced.patches.youtube.utils.pip.pipStateHookPatch
import app.revanced.patches.youtube.utils.playercontrols.hookBottomControlButton
import app.revanced.patches.youtube.utils.playercontrols.playerControlsPatch
import app.revanced.patches.youtube.utils.playservice.is_19_17_or_greater
import app.revanced.patches.youtube.utils.playservice.versionCheckPatch
import app.revanced.patches.youtube.utils.resourceid.sharedResourceIdPatch
import app.revanced.patches.youtube.utils.settings.ResourceUtils.addPreference
import app.revanced.patches.youtube.utils.settings.settingsPatch
import app.revanced.patches.youtube.video.information.videoEndMethod
import app.revanced.patches.youtube.video.information.videoInformationPatch
import app.revanced.util.ResourceGroup
import app.revanced.util.Utils.printWarn
import app.revanced.util.copyResources
import app.revanced.util.copyXmlNode
import app.revanced.util.doRecursively
@ -78,7 +75,6 @@ val overlayButtonsPatch = resourcePatch(
playerControlsPatch,
sharedResourceIdPatch,
settingsPatch,
versionCheckPatch,
)
val iconTypeOption = stringOption(
@ -103,7 +99,7 @@ val overlayButtonsPatch = resourcePatch(
"Wider" to MARGIN_WIDER,
),
title = "Bottom margin",
description = "The bottom margin for the overlay buttons and timestamp. Supports from YouTube 18.29.38 to YouTube 19.16.39.",
description = "The bottom margin for the overlay buttons and timestamp.",
required = true
)
@ -111,7 +107,7 @@ val overlayButtonsPatch = resourcePatch(
key = "widerButtonsSpace",
default = false,
title = "Wider between-buttons space",
description = "Prevent adjacent button presses by increasing the horizontal spacing between buttons. Supports from YouTube 18.29.38 to YouTube 19.16.39.",
description = "Prevent adjacent button presses by increasing the horizontal spacing between buttons.",
required = true
)
@ -129,18 +125,10 @@ val overlayButtonsPatch = resourcePatch(
val iconType = iconTypeOption
.lowerCaseOrThrow()
var marginBottom = bottomMarginOption
val marginBottom = bottomMarginOption
.lowerCaseOrThrow()
if (marginBottom != MARGIN_DEFAULT && is_19_17_or_greater) {
printWarn("\"Bottom margin\" is not supported in this version. Use YouTube 19.16.39 or earlier.")
marginBottom = MARGIN_DEFAULT
}
if (widerButtonsSpace == true && is_19_17_or_greater) {
printWarn("\"Wider between-buttons space\" is not supported in this version. Use YouTube 19.16.39 or earlier.")
}
val useWiderButtonsSpace = widerButtonsSpace == true && !is_19_17_or_greater
val useWiderButtonsSpace = widerButtonsSpace == true
// Inject hooks for overlay buttons.
setOf(
@ -196,10 +184,13 @@ val overlayButtonsPatch = resourcePatch(
"yt_fill_arrow_repeat_white_24.png",
"yt_outline_arrow_repeat_1_white_24.png",
"yt_outline_arrow_shuffle_1_white_24.png",
"yt_outline_arrow_shuffle_black_24.png",
"yt_outline_list_play_arrow_black_24.png",
"yt_outline_list_play_arrow_white_24.png",
"yt_outline_screen_full_exit_white_24.png",
"yt_outline_screen_full_white_24.png",
"yt_outline_screen_full_vd_theme_24.png",
"yt_outline_screen_vertical_vd_theme_24.png"
"yt_outline_screen_full_white_24.png",
"yt_outline_screen_vertical_vd_theme_24.png",
),
ResourceGroup(
"drawable",
@ -215,15 +206,11 @@ val overlayButtonsPatch = resourcePatch(
"android.support.constraint.ConstraintLayout"
)
var xmlFiles = arrayOf(
"youtube_controls_bottom_ui_container.xml"
)
if (!is_19_17_or_greater) {
xmlFiles += "youtube_controls_fullscreen_button.xml"
xmlFiles += "youtube_controls_cf_fullscreen_button.xml"
}
xmlFiles.forEach { xmlFile ->
arrayOf(
"youtube_controls_bottom_ui_container.xml",
"youtube_controls_fullscreen_button.xml",
"youtube_controls_cf_fullscreen_button.xml"
).forEach { xmlFile ->
val targetXml = get("res").resolve("layout").resolve(xmlFile)
if (targetXml.exists()) {
document("res/layout/$xmlFile").use { document ->
@ -238,6 +225,13 @@ val overlayButtonsPatch = resourcePatch(
}
}
node.getAttributeNode("yt:layout_constraintBottom_toTopOf")
?.let { attribute ->
if (attribute.textContent == "@id/quick_actions_container") {
attribute.textContent = "@+id/bottom_margin"
}
}
val (id, height, width) = Triple(
node.getAttribute("android:id"),
node.getAttribute("android:layout_height"),
@ -248,11 +242,7 @@ val overlayButtonsPatch = resourcePatch(
width != "0.0dip",
)
val isButton = if (is_19_17_or_greater)
// Note: Do not modify fullscreen button and multiview button
id.endsWith("_button") && id != "@id/multiview_button"
else
id.endsWith("_button") || id == "@id/youtube_controls_fullscreen_button_stub"
val isButton = id.endsWith("_button") && id != "@id/multiview_button" || id == "@id/youtube_controls_fullscreen_button_stub"
// Adjust TimeBar and Chapter bottom padding
val timBarItem = mutableMapOf(
@ -266,7 +256,6 @@ val overlayButtonsPatch = resourcePatch(
"48.0dip"
if (isButton) {
node.setAttribute("android:layout_marginBottom", marginBottom)
node.setAttribute("android:paddingLeft", "0.0dip")
node.setAttribute("android:paddingRight", "0.0dip")
node.setAttribute("android:paddingBottom", "22.0dip")
@ -275,14 +264,15 @@ val overlayButtonsPatch = resourcePatch(
node.setAttribute("android:layout_width", layoutHeightWidth)
}
} else if (timBarItem.containsKey(id)) {
node.setAttribute("android:layout_marginBottom", marginBottom)
if (!useWiderButtonsSpace) {
node.setAttribute("android:paddingBottom", timBarItem.getValue(id))
}
}
if (!is_19_17_or_greater && id.equals("@id/youtube_controls_fullscreen_button_stub")) {
node.setAttribute("android:layout_width", layoutHeightWidth)
if (id.equals("@+id/bottom_margin")) {
node.setAttribute("android:layout_height", marginBottom)
} else if (id.equals("@id/time_bar_reference_view")) {
node.setAttribute("yt:layout_constraintBottom_toTopOf", "@id/quick_actions_container")
}
}
}