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

fix(YouTube - Overlay buttons): Restrict the version that can use the patch options Bottom margin and Wider between-buttons space to YouTube 19.16.39 (Close https://github.com/inotia00/ReVanced_Extended/issues/2608)

Browse Source
This commit is contained in:
inotia00 2024-12-31 20:39:52 +09:00
parent 4b0e9504c9
commit fd9670fcae
1 changed files with 82 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,12 +15,14 @@ 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.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
@ -99,7 +101,7 @@ val overlayButtonsPatch = resourcePatch(
"Wider" to MARGIN_WIDER,
),
title = "Bottom margin",
description = "The bottom margin for the overlay buttons and timestamp.",
description = "The bottom margin for the overlay buttons and timestamp. Supports from YouTube 18.29.38 to YouTube 19.16.39.",
required = true
)
@ -107,7 +109,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.",
description = "Prevent adjacent button presses by increasing the horizontal spacing between buttons. Supports from YouTube 18.29.38 to YouTube 19.16.39.",
required = true
)
@ -125,9 +127,19 @@ val overlayButtonsPatch = resourcePatch(
val iconType = iconTypeOption
.lowerCaseOrThrow()
val marginBottom = bottomMarginOption
var 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
// Inject hooks for overlay buttons.
setOf(
"AlwaysRepeat;",
@ -201,8 +213,18 @@ val overlayButtonsPatch = resourcePatch(
"android.support.constraint.ConstraintLayout"
)
// Note: Do not modify fullscreen button and multiview button
document("res/layout/youtube_controls_bottom_ui_container.xml").use { document ->
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 ->
val targetXml = get("res").resolve("layout").resolve(xmlFile)
if (targetXml.exists()) {
document("res/layout/$xmlFile").use { document ->
document.doRecursively loop@{ node ->
if (node !is Element) return@loop
@ -219,19 +241,24 @@ val overlayButtonsPatch = resourcePatch(
node.getAttribute("android:layout_height"),
node.getAttribute("android:layout_width")
)
val (heightIsNotZero, widthIsNotZero, isButton) = Triple(
val (heightIsNotZero, widthIsNotZero) = Pair(
height != "0.0dip",
width != "0.0dip",
id.endsWith("_button") && id != "@id/multiview_button"
)
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"
// Adjust TimeBar and Chapter bottom padding
val timBarItem = mutableMapOf(
"@id/time_bar_chapter_title" to "16.0dip",
"@id/timestamps_container" to "14.0dip"
)
val layoutHeightWidth = if (widerButtonsSpace == true)
val layoutHeightWidth = if (useWiderButtonsSpace)
"56.0dip"
else
"48.0dip"
@ -247,16 +274,18 @@ val overlayButtonsPatch = resourcePatch(
}
} else if (timBarItem.containsKey(id)) {
node.setAttribute("android:layout_marginBottom", marginBottom)
if (widerButtonsSpace != true) {
if (!useWiderButtonsSpace) {
node.setAttribute("android:paddingBottom", timBarItem.getValue(id))
}
}
if (id.equals("@id/youtube_controls_fullscreen_button_stub")) {
if (!is_19_17_or_greater && id.equals("@id/youtube_controls_fullscreen_button_stub")) {
node.setAttribute("android:layout_width", layoutHeightWidth)
}
}
}
}
}
if (changeTopButtons == true) {
// Apply the selected icon type to the top buttons.