From fd3611c862638e15b99ff3dc0d864d7dd945852e Mon Sep 17 00:00:00 2001
From: inotia00 <ars258000@gmail.com>
Date: Tue, 21 Feb 2023 23:34:15 +0900
Subject: [PATCH] refactor: ReVanced settings UI (remove `settings` label in
 title and remove summary)

---
 .../app/revanced/util/resources/MusicResourceHelper.kt    | 1 -
 src/main/resources/music/settings/host/values/strings.xml | 3 +--
 .../resources/youtube/settings/host/values/strings.xml    | 5 -----
 .../resources/youtube/settings/values-v21/strings.xml     | 8 ++++++++
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/app/revanced/util/resources/MusicResourceHelper.kt b/src/main/kotlin/app/revanced/util/resources/MusicResourceHelper.kt
index 86698e309..da7600eff 100644
--- a/src/main/kotlin/app/revanced/util/resources/MusicResourceHelper.kt
+++ b/src/main/kotlin/app/revanced/util/resources/MusicResourceHelper.kt
@@ -87,7 +87,6 @@ internal object MusicResourceHelper {
                 .forEach {
                     it.adoptChild(YOUTUBE_MUSIC_PREFERENCE_TAG_NAME) {
                         setAttribute("android:title", "@string/$key" + "_title")
-                        setAttribute("android:summary", "@string/$key" + "_summary")
                         setAttribute("android:key", key)
                         setAttribute("android:defaultValue", defaultValue)
                     }
diff --git a/src/main/resources/music/settings/host/values/strings.xml b/src/main/resources/music/settings/host/values/strings.xml
index 15da64399..1450e89cc 100644
--- a/src/main/resources/music/settings/host/values/strings.xml
+++ b/src/main/resources/music/settings/host/values/strings.xml
@@ -21,8 +21,7 @@
     <string name="revanced_enable_tablet_mode_title">Enable tablet mode</string>
     <string name="revanced_enable_zen_mode_summary">Adds a grey tint to the video player to reduce eye strain.</string>
     <string name="revanced_enable_zen_mode_title">Enable zen mode</string>
-    <string name="revanced_extended_settings_summary">ReVanced Extended specific settings</string>
-    <string name="revanced_extended_settings_title">ReVanced Extended settings</string>
+    <string name="revanced_extended_settings_title">ReVanced Extended</string>
     <string name="revanced_hide_cast_button_summary">Hides the cast button at the top of the homepage and at the top of the player.</string>
     <string name="revanced_hide_cast_button_title">Hide cast button</string>
     <string name="revanced_hide_compact_header_summary">"Hides the music category bar at the top of the homepage.
diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 8dac29a61..db7793440 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -49,7 +49,6 @@
 2. ReVanced needs to be shown as registered under Cloud Messaging.
 3. Current State in Cloud Messaging must be Connected."</string>
     <string name="microg_notification_settings_title">Notification</string>
-    <string name="microg_settings_title">MicroG</string>
     <string name="minutes">min</string>
     <string name="new_segment_choose_category">Choose the segment category</string>
     <string name="new_segment_confirm_content" formatted="false">"The segment lasts from %02d:%02d to %02d:%02d (%d minutes %02d seconds)
@@ -262,7 +261,6 @@ Is it ready to submit?"</string>
     <string name="revanced_export_settings_title">Export settings</string>
     <string name="revanced_extended_issue_center_summary">Report issues or leave suggestions here</string>
     <string name="revanced_extended_issue_center_title">ReVanced Extended Issue Center</string>
-    <string name="revanced_extended_settings_title">ReVanced Extended</string>
     <string name="revanced_general_layout_settings_summary">General layout related settings</string>
     <string name="revanced_general_layout_settings_title">General layout</string>
     <string name="revanced_hide_auto_captions_summary_off">Captions are enabled when playing a video with captioning is enforced</string>
@@ -499,7 +497,6 @@ If you enable this setting, the following features are not available:
 
 Since these setting is quite outdated, it may not be valid"</string>
     <string name="revanced_ryd_attribution_summary">Dislike data is provided by the Return YouTube Dislike API.  Tap here to learn more.</string>
-    <string name="revanced_ryd_attribution_title">ReturnYouTubeDislike.com</string>
     <string name="revanced_ryd_dislike_percentage_summary_off">Dislikes shown as number</string>
     <string name="revanced_ryd_dislike_percentage_summary_on">Dislikes shown as percentage</string>
     <string name="revanced_ryd_dislike_percentage_title">Dislikes as percentage</string>
@@ -510,7 +507,6 @@ Since these setting is quite outdated, it may not be valid"</string>
     <string name="revanced_ryd_enable_summary_on">Dislikes are shown</string>
     <string name="revanced_ryd_enable_title">Enable Return YouTube Dislike</string>
     <string name="revanced_ryd_failure_client_rate_limit_requested">Dislikes not available (client API limit reached)</string>
-    <string name="revanced_ryd_settings_title">Return YouTube Dislike</string>
     <string name="revanced_ryd_video_likes_hidden_by_video_owner">Hidden</string>
     <string name="revanced_save_video_quality_common_error">Failed to set quality</string>
     <string name="revanced_save_video_quality_internet_error">No internet connection</string>
@@ -520,7 +516,6 @@ Since these setting is quite outdated, it may not be valid"</string>
     <string name="revanced_save_video_quality_wifi_error">Failed to change default WI-FI quality</string>
     <string name="revanced_save_video_speed">Changing default speed to:</string>
     <string name="revanced_sponsorblock_settings_summary">SponsorBlock related settings</string>
-    <string name="revanced_sponsorblock_settings_title">SponsorBlock</string>
     <string name="revanced_swipe_controls_summary">Swipe controls related settings</string>
     <string name="revanced_swipe_controls_title">Swipe controls</string>
     <string name="revanced_swipe_magnitude_threshold_summary">The amount of threshold for swipe to occur</string>
diff --git a/src/main/resources/youtube/settings/values-v21/strings.xml b/src/main/resources/youtube/settings/values-v21/strings.xml
index e0d37caa8..3912c0d2e 100644
--- a/src/main/resources/youtube/settings/values-v21/strings.xml
+++ b/src/main/resources/youtube/settings/values-v21/strings.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Translation Exception Language Resources -->
+    <string name="microg_settings_title">MicroG</string>
+
     <string name="revanced_backup_settings_title">@string/settings_ie</string>
+    <string name="revanced_extended_settings_title">ReVanced Extended</string>
     <string name="revanced_hide_live_chat_button_summary_off">@string/revanced_hide_button_live_chat_summary_off</string>
     <string name="revanced_hide_live_chat_button_summary_on">@string/revanced_hide_button_live_chat_summary_on</string>
     <string name="revanced_hide_live_chat_button_title">@string/revanced_hide_button_live_chat_title</string>
@@ -13,6 +16,11 @@
     <string name="revanced_labels_default">stock</string>
     <string name="revanced_patches_excluded">Excluded</string>
     <string name="revanced_patches_included">Included</string>
+
+    <string name="revanced_ryd_attribution_title">ReturnYouTubeDislike.com</string>
+    <string name="revanced_ryd_settings_title">Return YouTube Dislike</string>
+    <string name="revanced_sponsorblock_settings_title">SponsorBlock</string>
+
     <string name="revanced_themes_amoled">amoled</string>
     <string name="revanced_themes_default">stock</string>
     <string name="revanced_themes_materialyou">materialyou</string>