From bf4f5f82064bf32fcb84d72e2b2906a2e6e88ac8 Mon Sep 17 00:00:00 2001
From: inotia00 <ars258000@gmail.com>
Date: Thu, 23 Mar 2023 22:41:33 +0900
Subject: [PATCH] refactor(hide-button-container): Integrate `Hide share
 button` into `Hide action buttons`

---
 .../resources/youtube/settings/host/values/strings.xml   | 9 +++------
 .../resources/youtube/settings/xml/revanced_prefs.xml    | 5 ++---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 7e0c71c16..cb2a8f1d0 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -262,9 +262,9 @@ Is it ready to submit?"</string>
     <string name="revanced_fullscreen_layout">Fullscreen layout</string>
     <string name="revanced_general_layout">General layout</string>
     <string name="revanced_haptic_feedback_title">Haptic feedback</string>
-    <string name="revanced_hide_action_button_summary_off">Buttons are shown</string>
-    <string name="revanced_hide_action_button_summary_on">Buttons are hidden</string>
-    <string name="revanced_hide_action_button_title">Hide create, clip and thanks buttons</string>
+    <string name="revanced_hide_action_buttons_summary_off">Action buttons are shown</string>
+    <string name="revanced_hide_action_buttons_summary_on">Action buttons are hidden</string>
+    <string name="revanced_hide_action_buttons_title">Hide action buttons</string>
     <string name="revanced_hide_autoplay_button_summary_off">Autoplay button is shown</string>
     <string name="revanced_hide_autoplay_button_summary_on">Autoplay button is hidden</string>
     <string name="revanced_hide_autoplay_button_title">Hide autoplay button</string>
@@ -289,9 +289,6 @@ Is it ready to submit?"</string>
     <string name="revanced_hide_button_playlist_summary_off">Playlist button is shown</string>
     <string name="revanced_hide_button_playlist_summary_on">Playlist button is hidden</string>
     <string name="revanced_hide_button_playlist_title">Hide playlist button</string>
-    <string name="revanced_hide_button_share_summary_off">Share button is shown</string>
-    <string name="revanced_hide_button_share_summary_on">Share button is hidden</string>
-    <string name="revanced_hide_button_share_title">Hide share button</string>
     <string name="revanced_hide_captions_button_summary_off">Captions button is shown</string>
     <string name="revanced_hide_captions_button_summary_on">Captions button is hidden</string>
     <string name="revanced_hide_captions_button_title">Hide captions button</string>
diff --git a/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index 526d5828c..085977aa7 100644
--- a/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -235,8 +235,7 @@
         <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_button_container_title" />
         <SwitchPreference android:title="@string/revanced_hide_button_like_title" android:key="revanced_hide_button_like" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_like_summary_on" android:summaryOff="@string/revanced_hide_button_like_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_button_dislike_title" android:key="revanced_hide_button_dislike" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_dislike_summary_on" android:summaryOff="@string/revanced_hide_button_dislike_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_button_share_title" android:key="revanced_hide_button_share" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_share_summary_on" android:summaryOff="@string/revanced_hide_button_share_summary_off" />
-        <SwitchPreference android:title="@string/revanced_hide_action_button_title" android:key="revanced_hide_action_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_action_button_summary_on" android:summaryOff="@string/revanced_hide_action_button_summary_off" />
+        <SwitchPreference android:title="@string/revanced_hide_action_buttons_title" android:key="revanced_hide_action_buttons" android:defaultValue="false" android:summaryOn="@string/revanced_hide_action_buttons_summary_on" android:summaryOff="@string/revanced_hide_action_buttons_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_button_download_title" android:key="revanced_hide_button_download" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_download_summary_on" android:summaryOff="@string/revanced_hide_button_download_summary_off" />
         <SwitchPreference android:title="@string/revanced_hide_button_playlist_title" android:key="revanced_hide_button_playlist" android:defaultValue="false" android:summaryOn="@string/revanced_hide_button_playlist_summary_on" android:summaryOff="@string/revanced_hide_button_playlist_summary_off" />SETTINGS: BUTTON_CONTAINER -->
 
@@ -406,6 +405,7 @@
 
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_general_layout" />
             <Preference android:title="hide-stories" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
+            <Preference android:title="switch-create-notification" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-create-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-shorts-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-shorts-component" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
@@ -421,7 +421,6 @@
             <Preference android:title="hide-snackbar" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="hide-floating-microphone" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
             <Preference android:title="header-switch" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
-            <Preference android:title="switch-create-notification" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>
 
             <Preference android:title=" " android:selectable="false" android:summary="@string/revanced_player_layout" />
             <Preference android:title="hide-collapse-button" android:summary="@string/revanced_patches_excluded" android:selectable="false"/>