From 77b73cff80ab7b7ae86f89eba3367008916fc075 Mon Sep 17 00:00:00 2001
From: inotia00 <ars258000@gmail.com>
Date: Mon, 8 May 2023 04:22:49 +0900
Subject: [PATCH] feat(youtube/overlay-buttons): fix button size and padding

---
 .../resource/patch/OverlayButtonsPatch.kt     | 65 ++++++++++++-------
 .../youtube_controls_bottom_ui_container.xml  | 10 +--
 2 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/src/main/kotlin/app/revanced/patches/youtube/button/overlaybuttons/resource/patch/OverlayButtonsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/button/overlaybuttons/resource/patch/OverlayButtonsPatch.kt
index 1ded8d6e8..cba5aa6a6 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/button/overlaybuttons/resource/patch/OverlayButtonsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/button/overlaybuttons/resource/patch/OverlayButtonsPatch.kt
@@ -1,5 +1,6 @@
 package app.revanced.patches.youtube.button.overlaybuttons.resource.patch
 
+import app.revanced.extensions.doRecursively
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
@@ -17,10 +18,11 @@ import app.revanced.patches.youtube.misc.settings.resource.patch.SettingsPatch
 import app.revanced.util.resources.ResourceUtils
 import app.revanced.util.resources.ResourceUtils.copyResources
 import app.revanced.util.resources.ResourceUtils.copyXmlNode
+import org.w3c.dom.Element
 
 @Patch
 @Name("overlay-buttons")
-@Description("Add overlay buttons for ReVanced Extended.")
+@Description("Add overlay buttons to the player such as copy video link, auto-repeat, download and speed control.")
 @DependsOn(
     [
         AutoRepeatPatch::class,
@@ -37,7 +39,6 @@ class OverlayButtonsPatch : ResourcePatch {
         /**
          * Copy arrays
          */
-
         context.copyXmlNode("youtube/overlaybuttons/host", "values/arrays.xml", "resources")
 
 
@@ -74,31 +75,47 @@ class OverlayButtonsPatch : ResourcePatch {
         }
 
         /**
-         * Copy preference fragments
+         * Merge xml nodes from the host to their real xml files
          */
-
         context.copyXmlNode("youtube/overlaybuttons/host", "layout/youtube_controls_bottom_ui_container.xml", "android.support.constraint.ConstraintLayout")
 
-        val container = context["res/layout/youtube_controls_bottom_ui_container.xml"]
-        container.writeText(
-            container.readText()
-            .replace(
-                "yt:layout_constraintRight_toLeftOf=\"@id/fullscreen_button",
-                "yt:layout_constraintRight_toLeftOf=\"@+id/speed_button"
-            ).replace(
-                "60",
-                "42"
-            ).replace(
-                "paddingBottom=\"16",
-                "paddingBottom=\"34"
-            ).replace(
-                "paddingLeft=\"12",
-                "paddingLeft=\"0"
-            ).replace(
-                "paddingRight=\"12",
-                "paddingRight=\"0"
-            )
-        )
+        context.xmlEditor["res/layout/youtube_controls_bottom_ui_container.xml"].use { editor ->
+            editor.file.doRecursively loop@{
+                if (it !is Element) return@loop
+
+                // Change the relationship between buttons
+                it.getAttributeNode("yt:layout_constraintRight_toLeftOf")?.let { attribute ->
+                    if (attribute.textContent == "@id/fullscreen_button") {
+                        attribute.textContent = "@+id/speed_button"
+                    }
+                }
+
+                // Adjust Fullscreen Button size and padding
+                val paddingH = "0.0dip" to arrayOf("paddingLeft", "paddingRight")
+                val paddingV = "22.0dip" to arrayOf("paddingTop", "paddingBottom")
+                val size = "45.0dip" to arrayOf("layout_width", "layout_height")
+                it.getAttributeNode("android:id")?.let { attribute ->
+                    if (attribute.textContent == "@id/fullscreen_button") {
+                        arrayOf(paddingH, paddingV, size).forEach { (replace, attributes) ->
+                            attributes.forEach { name ->
+                                it.getAttributeNode("android:$name").textContent = replace
+                            }
+                        }
+                    }
+                }
+
+                // Adjust TimeBar and Chapter bottom padding
+                val timeBarChapter = "@id/time_bar_chapter_title" to "14.0dip"
+                val timeStampContainer = "@id/timestamps_container" to "12.0dip"
+                arrayOf(timeBarChapter, timeStampContainer).forEach { (id, replace) ->
+                    it.getAttributeNode("android:id")?.let { attribute ->
+                        if (attribute.textContent == id) {
+                            it.getAttributeNode("android:paddingBottom").textContent = replace
+                        }
+                    }
+                }
+            }
+        }
 
         /**
          * Add settings
diff --git a/src/main/resources/youtube/overlaybuttons/host/layout/youtube_controls_bottom_ui_container.xml b/src/main/resources/youtube/overlaybuttons/host/layout/youtube_controls_bottom_ui_container.xml
index 48dfe834c..f58cc572e 100644
--- a/src/main/resources/youtube/overlaybuttons/host/layout/youtube_controls_bottom_ui_container.xml
+++ b/src/main/resources/youtube/overlaybuttons/host/layout/youtube_controls_bottom_ui_container.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:yt="http://schemas.android.com/apk/res-auto" android:id="@+id/youtube_controls_bottom_ui_container" android:layout_width="match_parent" android:layout_height="wrap_content" android:layoutDirection="ltr">
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/speed_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_speed_icon" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/copy_button" style="@style/YouTubePlayerButton"/>
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/copy_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_copy_icon" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/copy_with_timestamp_button" style="@style/YouTubePlayerButton"/>
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/copy_with_timestamp_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_copy_icon_with_time" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/autoreplay_button" style="@style/YouTubePlayerButton"/>
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/autoreplay_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_repeat_icon" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/download_button" style="@style/YouTubePlayerButton"/>
-    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/download_button" android:paddingLeft="12dp" android:paddingTop="22dp" android:paddingRight="12dp" android:paddingBottom="16dp" android:longClickable="false" android:layout_width="60dp" android:layout_height="60dp" android:src="@drawable/revanced_download_icon" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/speed_button" android:paddingLeft="0dp" android:paddingTop="22dp" android:paddingRight="0dp" android:paddingBottom="22dp" android:longClickable="false" android:layout_width="45dp" android:layout_height="45dp" android:src="@drawable/revanced_speed_icon" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/copy_button" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/copy_button" android:paddingLeft="0dp" android:paddingTop="22dp" android:paddingRight="0dp" android:paddingBottom="22dp" android:longClickable="false" android:layout_width="45dp" android:layout_height="45dp" android:src="@drawable/revanced_copy_icon" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/copy_with_timestamp_button" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/copy_with_timestamp_button" android:paddingLeft="0dp" android:paddingTop="22dp" android:paddingRight="0dp" android:paddingBottom="22dp" android:longClickable="false" android:layout_width="45dp" android:layout_height="45dp" android:src="@drawable/revanced_copy_icon_with_time" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/autoreplay_button" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/autoreplay_button" android:paddingLeft="0dp" android:paddingTop="22dp" android:paddingRight="0dp" android:paddingBottom="22dp" android:longClickable="false" android:layout_width="45dp" android:layout_height="45dp" android:src="@drawable/revanced_repeat_icon" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/download_button" style="@style/YouTubePlayerButton"/>
+    <com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/download_button" android:paddingLeft="0dp" android:paddingTop="22dp" android:paddingRight="0dp" android:paddingBottom="22dp" android:longClickable="false" android:layout_width="45dp" android:layout_height="45dp" android:src="@drawable/revanced_download_icon" android:scaleType="center" yt:layout_constraintBottom_toTopOf="@+id/quick_actions_container" yt:layout_constraintRight_toLeftOf="@+id/fullscreen_button" style="@style/YouTubePlayerButton"/>
 </android.support.constraint.ConstraintLayout>