From 2024e0105786b5f786493a29910b586931052529 Mon Sep 17 00:00:00 2001
From: inotia00 <108592928+inotia00@users.noreply.github.com>
Date: Tue, 17 Oct 2023 15:59:37 +0900
Subject: [PATCH] fix(YouTube/Hide layout components): move `Hide join button`
 to the `Channel bar` subpreference in the `Bottom player` category

---
 .../patches/youtube/general/layout/LayoutComponentsPatch.kt  | 2 ++
 src/main/resources/youtube/settings/host/values/strings.xml  | 1 +
 src/main/resources/youtube/settings/xml/revanced_prefs.xml   | 5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/app/revanced/patches/youtube/general/layout/LayoutComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/general/layout/LayoutComponentsPatch.kt
index 2778c637c..19c54a135 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/general/layout/LayoutComponentsPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/general/layout/LayoutComponentsPatch.kt
@@ -47,10 +47,12 @@ object LayoutComponentsPatch : BytecodePatch() {
          */
         SettingsPatch.addPreference(
             arrayOf(
+                "PREFERENCE: BOTTOM_PLAYER_SETTINGS",
                 "PREFERENCE: GENERAL_SETTINGS",
                 "PREFERENCE: PLAYER_SETTINGS",
 
                 "SETTINGS: HIDE_AUDIO_TRACK_BUTTON",
+                "SETTINGS: HIDE_CHANNEL_BAR_JOIN_BUTTON",
                 "SETTINGS: HIDE_LAYOUT_COMPONENTS"
             )
         )
diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 2bc178e98..eb565781f 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -38,6 +38,7 @@
     <string name="revanced_change_homepage_summary_off">Current homepage: Home</string>
     <string name="revanced_change_homepage_summary_on">Current homepage: Subscriptions</string>
     <string name="revanced_change_homepage_title">Change homepage to subscriptions</string>
+    <string name="revanced_channel_bar_title">Channel bar</string>
     <string name="revanced_comments_title">Comments</string>
     <string name="revanced_copy_video_timestamp_success">Time Stamp copied to clipboard</string>
     <string name="revanced_custom_filter_strings_summary">Filter component names by line-seperated</string>
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index b492c94cc..533fa7f1f 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -41,6 +41,10 @@
     <!-- PREFERENCE: BOTTOM_PLAYER_SETTINGS
     <PreferenceScreen android:title="@string/revanced_bottom_player" android:key="bottom_player">PREFERENCE: BOTTOM_PLAYER_SETTINGS -->
 
+        <!-- SETTINGS: HIDE_CHANNEL_BAR_JOIN_BUTTON
+        <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_channel_bar_title" />
+        <SwitchPreference android:title="@string/revanced_hide_join_button_title" android:key="revanced_hide_join_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_join_button_summary_on" android:summaryOff="@string/revanced_hide_join_button_summary_off" />SETTINGS: HIDE_CHANNEL_BAR_JOIN_BUTTON -->
+
         <!-- SETTINGS: BUTTON_CONTAINER
         <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_button_container_title" />
         <SwitchPreference android:title="@string/revanced_hide_button_create_clip_title" android:key="revanced_hide_button_create_clip" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_create_clip_summary_on" android:summaryOff="@string/revanced_hide_button_create_clip_summary_off" />
@@ -217,7 +221,6 @@
         <SwitchPreference android:title="@string/revanced_hide_gray_description_title" android:key="revanced_hide_gray_description" android:defaultValue="true" android:summaryOn="@string/revanced_hide_gray_description_summary_on" android:summaryOff="@string/revanced_hide_gray_description_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_gray_separator_title" android:key="revanced_hide_gray_separator" android:defaultValue="true" android:summaryOn="@string/revanced_hide_gray_separator_summary_on" android:summaryOff="@string/revanced_hide_gray_separator_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_info_panel_title" android:key="revanced_hide_info_panel" android:defaultValue="true" android:summaryOn="@string/revanced_hide_info_panel_summary_on" android:summaryOff="@string/revanced_hide_info_panel_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_join_button_title" android:key="revanced_hide_join_button" android:defaultValue="true" android:summaryOn="@string/revanced_hide_join_button_summary_on" android:summaryOff="@string/revanced_hide_join_button_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_notify_me_button_title" android:key="revanced_hide_notify_me_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_notify_me_button_summary_on" android:summaryOff="@string/revanced_hide_notify_me_button_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_latest_posts_title" android:key="revanced_hide_latest_posts" android:defaultValue="true" android:summaryOn="@string/revanced_hide_latest_posts_summary_on" android:summaryOff="@string/revanced_hide_latest_posts_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_medical_panel_title" android:key="revanced_hide_medical_panel" android:defaultValue="true" android:summaryOn="@string/revanced_hide_medical_panel_summary_on" android:summaryOff="@string/revanced_hide_medical_panel_summary_off" />