From 0568e7f088f5363ed2c6ad3467d4471ca702b933 Mon Sep 17 00:00:00 2001
From: inotia00 <ars258000@gmail.com>
Date: Mon, 20 Feb 2023 01:25:41 +0900
Subject: [PATCH] refactor: ReVanced settings UI

---
 .../revanced/util/resources/ResourceHelper.kt |  1 -
 .../youtube/settings/host/values/strings.xml  | 42 +++++++++----------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/main/kotlin/app/revanced/util/resources/ResourceHelper.kt b/src/main/kotlin/app/revanced/util/resources/ResourceHelper.kt
index b722bb9d5..9ec28652d 100644
--- a/src/main/kotlin/app/revanced/util/resources/ResourceHelper.kt
+++ b/src/main/kotlin/app/revanced/util/resources/ResourceHelper.kt
@@ -127,7 +127,6 @@ internal object ResourceHelper {
                         if (attribute.textContent == "@string/about_key" && it.getAttributeNode("app:iconSpaceReserved").textContent == "false") {
                             it.insertNode("Preference", it) {
                                 setAttribute("android:title", "@string/revanced_" + key + "_title")
-                                setAttribute("android:summary", "@string/revanced_" + key + "_summary")
                                 this.appendChild(ownerDocument.createElement("intent").also { intentNode ->
                                     intentNode.setAttribute("android:targetPackage", targetPackage)
                                     intentNode.setAttribute("android:data", key)
diff --git a/src/main/resources/youtube/settings/host/values/strings.xml b/src/main/resources/youtube/settings/host/values/strings.xml
index 55b6eeaa2..8dac29a61 100644
--- a/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/src/main/resources/youtube/settings/host/values/strings.xml
@@ -41,16 +41,16 @@
     <string name="general_time_without_sb_sum">This time appears in brackets next to the current time. This shows the total video duration minus any segments.</string>
     <string name="general_uuid">Your private user id</string>
     <string name="general_uuid_sum">This should be kept private. This is like a password and should not be shared with anyone. If someone has this, they can impersonate you</string>
-    <string name="hours">hours</string>
+    <string name="hours">hrs</string>
     <string name="microg_not_installed_notice">Please install MicroG</string>
     <string name="microg_not_installed_warning">MicroG is not found</string>
     <string name="microg_not_running_warning">MicroG does not run in the background</string>
     <string name="microg_notification_settings_summary">"1. Google device registration and Cloud Messaging need to be enabled for notifications.
 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 settings</string>
-    <string name="microg_settings_title">MicroG settings</string>
-    <string name="minutes">minutes</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)
 Is it ready to submit?"</string>
@@ -72,7 +72,7 @@ Is it ready to submit?"</string>
     <string name="new_segment_title">New SponsorBlock segment</string>
     <string name="reset">Reset</string>
     <string name="revanced_ads_settings_summary">Ads related settings</string>
-    <string name="revanced_ads_settings_title">Ads settings</string>
+    <string name="revanced_ads_settings_title">Ads</string>
     <string name="revanced_adremover_album_card_in_search_summary_off">Album cards are shown from search results</string>
     <string name="revanced_adremover_album_card_in_search_summary_on">Album cards are hidden from search results</string>
     <string name="revanced_adremover_album_card_in_search_title">Hide album cards</string>
@@ -262,10 +262,9 @@ 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_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_general_layout_settings_summary">General layout related settings</string>
-    <string name="revanced_general_layout_settings_title">General layout 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>
     <string name="revanced_hide_auto_captions_summary_on">"Captions aren't enabled when playing a video with captioning is enforced"</string>
     <string name="revanced_hide_auto_captions_title">Hide auto captions</string>
@@ -443,16 +442,16 @@ Is it ready to submit?"</string>
     <string name="revanced_hide_time_and_seekbar_title">Hide time and seekbar</string>
     <string name="revanced_import_settings_summary">Fetch ReVanced settings from saved file</string>
     <string name="revanced_import_settings_title">Import settings</string>
-    <string name="revanced_layout_settings_bottomplayer">Bottom player layout settings</string>
-    <string name="revanced_layout_settings_flyoutmenu">Flyout menu layout settings</string>
-    <string name="revanced_layout_settings_fullscreen">Fullscreen layout settings</string>
-    <string name="revanced_layout_settings_player">Player layout settings</string>
-    <string name="revanced_layout_settings_seekbar">Seekbar layout settings</string>
+    <string name="revanced_layout_settings_bottomplayer">Bottom player layout</string>
+    <string name="revanced_layout_settings_flyoutmenu">Flyout menu layout</string>
+    <string name="revanced_layout_settings_fullscreen">Fullscreen layout</string>
+    <string name="revanced_layout_settings_player">Player layout</string>
+    <string name="revanced_layout_settings_seekbar">Seekbar layout</string>
     <string name="revanced_misc_settings_summary">Miscellaneous related settings</string>
-    <string name="revanced_misc_settings_title">Miscellaneous settings</string>
+    <string name="revanced_misc_settings_title">Miscellaneous</string>
     <string name="revanced_others_title">Others</string>
     <string name="revanced_other_layout_settings_summary">Other layout related settings</string>
-    <string name="revanced_other_layout_settings_title">Other layout settings</string>
+    <string name="revanced_other_layout_settings_title">Other layout</string>
     <string name="revanced_overlay_button_auto_repeat_summary_off">Auto repeat button is hidden</string>
     <string name="revanced_overlay_button_auto_repeat_summary_on">Auto repeat button is shown</string>
     <string name="revanced_overlay_button_auto_repeat_title">Show auto repeat button</string>
@@ -466,7 +465,7 @@ Is it ready to submit?"</string>
     <string name="revanced_overlay_button_downloads_summary_on">Download button is shown</string>
     <string name="revanced_overlay_button_downloads_title">Show download button</string>
     <string name="revanced_overlay_button_summary">Overlay button related settings</string>
-    <string name="revanced_overlay_button_title">Overlay button settings</string>
+    <string name="revanced_overlay_button_title">Overlay button</string>
     <string name="revanced_overlay_button_speed_reset">Video speed reseted (1.0x)</string>
     <string name="revanced_overlay_button_speed_summary_off">Speed button is hidden</string>
     <string name="revanced_overlay_button_speed_summary_on">Speed button is shown</string>
@@ -509,9 +508,8 @@ Since these setting is quite outdated, it may not be valid"</string>
     <string name="revanced_ryd_compact_layout_title">Compact like button</string>
     <string name="revanced_ryd_enable_summary_off">Dislikes are not shown</string>
     <string name="revanced_ryd_enable_summary_on">Dislikes are shown</string>
-    <string name="revanced_ryd_enable_title">Return YouTube Dislike</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_summary">Settings for Return YouTube Dislike</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>
@@ -522,9 +520,9 @@ 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 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 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>
     <string name="revanced_swipe_magnitude_threshold_title">Swipe magnitude threshold</string>
     <string name="revanced_swipe_overlay_background_alpha_summary">The visibility of swipe overlay background</string>
@@ -538,7 +536,7 @@ Since these setting is quite outdated, it may not be valid"</string>
     <string name="revanced_video_ads_removal_summary_on">Video ads are hidden</string>
     <string name="revanced_video_ads_removal_title">Hide video ads</string>
     <string name="revanced_video_settings_summary">Video related settings</string>
-    <string name="revanced_video_settings_title">Video settings</string>
+    <string name="revanced_video_settings_title">Video</string>
     <string name="revanced_whitelisting_add_failed" formatted="false">Failed to add channel %s to the %s whitelist</string>
     <string name="revanced_whitelisting_added" formatted="false">Channel %s was added to the %s whitelist</string>
     <string name="revanced_whitelisting_ads">Video Ads</string>
@@ -567,7 +565,7 @@ Since these setting is quite outdated, it may not be valid"</string>
     <string name="sb_guidelines_preference_title">View guidelines</string>
     <string name="sb_switching_success">Switched successfully. reload the video</string>
     <string name="sb_switching_to_mirror">Switching mirror API server to main API server..</string>
-    <string name="seconds">seconds</string>
+    <string name="seconds">sec</string>
     <string name="segments_endcards">Endcards/Credits</string>
     <string name="segments_endcards_sum">Credits or when the YouTube endcards appear. Not for spoken conclusions</string>
     <string name="segments_filler">Filler Tangent/Jokes</string>