From c6d6c81c68ffa76a0956477426f55249abe6cd13 Mon Sep 17 00:00:00 2001
From: inotia00 <108592928+inotia00@users.noreply.github.com>
Date: Fri, 7 Feb 2025 19:29:25 +0900
Subject: [PATCH] fix(YouTube - Settings): HTML tags are not applied to some
 settings

---
 .../preference/HtmlSwitchPreference.java      | 35 +++++++++++++++++++
 .../youtube/settings/host/values/strings.xml  | 16 +++------
 .../youtube/settings/xml/revanced_prefs.xml   |  4 +--
 3 files changed, 41 insertions(+), 14 deletions(-)
 create mode 100644 extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/HtmlSwitchPreference.java

diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/HtmlSwitchPreference.java b/extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/HtmlSwitchPreference.java
new file mode 100644
index 000000000..382e898f7
--- /dev/null
+++ b/extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/HtmlSwitchPreference.java
@@ -0,0 +1,35 @@
+package app.revanced.extension.shared.settings.preference;
+
+import static android.text.Html.FROM_HTML_MODE_COMPACT;
+
+import android.content.Context;
+import android.preference.SwitchPreference;
+import android.text.Html;
+import android.util.AttributeSet;
+
+/**
+ * Allows using basic html for the summary text.
+ */
+@SuppressWarnings({"unused", "deprecation"})
+public class HtmlSwitchPreference extends SwitchPreference {
+    {
+        setSummaryOn(Html.fromHtml(getSummaryOn().toString(), FROM_HTML_MODE_COMPACT));
+        setSummaryOff(Html.fromHtml(getSummaryOff().toString(), FROM_HTML_MODE_COMPACT));
+    }
+
+    public HtmlSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public HtmlSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public HtmlSwitchPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public HtmlSwitchPreference(Context context) {
+        super(context);
+    }
+}
\ No newline at end of file
diff --git a/patches/src/main/resources/youtube/settings/host/values/strings.xml b/patches/src/main/resources/youtube/settings/host/values/strings.xml
index b80dde06f..6627eaf54 100644
--- a/patches/src/main/resources/youtube/settings/host/values/strings.xml
+++ b/patches/src/main/resources/youtube/settings/host/values/strings.xml
@@ -288,12 +288,8 @@ Store"</string>
     <string name="revanced_hide_feed_flyout_menu_summary_on">Feed flyout menu filter is enabled.</string>
     <string name="revanced_hide_feed_flyout_menu_summary_off">Feed flyout menu filter is disabled.</string>
     <string name="revanced_hide_feed_flyout_menu_filter_type_title">Feed flyout menu filter type</string>
-    <string name="revanced_hide_feed_flyout_menu_filter_type_summary_on">"Filter if contains.
-
-To hide the <b>Play next in queue</b> menu, you can use <b>Play next</b> or <b>in queue</b> as keywords."</string>
-    <string name="revanced_hide_feed_flyout_menu_filter_type_summary_off">"Filter if matches.
-
-To hide the <b>Play next in queue</b> menu, you can only use <b>Play next in queue</b> as keywords."</string>
+    <string name="revanced_hide_feed_flyout_menu_filter_type_summary_on">Filter if contains.\n\nTo hide the &lt;b>\'Play next in queue\'&lt;/b> menu, you can use &lt;b>\'Play next\'&lt;/b> or &lt;b>\'in queue\'&lt;/b> as keywords.</string>
+    <string name="revanced_hide_feed_flyout_menu_filter_type_summary_off">Filter if matches.\n\nTo hide the &lt;b>\'Play next in queue\'&lt;/b> menu, you can only use &lt;b>\'Play next in queue\'&lt;/b> as keywords.</string>
     <string name="revanced_hide_feed_flyout_menu_filter_strings_title">Feed flyout menu filter</string>
     <string name="revanced_hide_feed_flyout_menu_filter_strings_summary">List of flyout menu names to filter, separated by new lines.</string>
 
@@ -481,12 +477,8 @@ If later turned off, it is recommended to clear the app data to prevent UI bugs.
     <string name="revanced_hide_account_menu_summary">"Hide elements of the account menu and You tab.
 Some components may not be hidden."</string>
     <string name="revanced_hide_account_menu_filter_type_title">Account menu filter type</string>
-    <string name="revanced_hide_account_menu_filter_type_summary_on">"Filter if contains.
-
-To hide the <b>Get YouTube Premium</b> menu, you can use <b>YouTube Premium</b> or <b>Premium</b> as keywords."</string>
-    <string name="revanced_hide_account_menu_filter_type_summary_off">"Filter if matches.
-
-To hide the <b>Get YouTube Premium</b> menu, you can only use <b>Get YouTube Premium</b> as keywords."</string>
+    <string name="revanced_hide_account_menu_filter_type_summary_on">Filter if contains.\n\nTo hide the &lt;b>\'Get YouTube Premium\'&lt;/b> menu, you can use &lt;b>\'YouTube Premium\'&lt;/b> or &lt;b>\'Premium\'&lt;/b> as keywords.</string>
+    <string name="revanced_hide_account_menu_filter_type_summary_off">Filter if matches.\n\nTo hide the &lt;b>\'Get YouTube Premium\'&lt;/b> menu, you can only use &lt;b>\'Get YouTube Premium\'&lt;/b> as keywords.</string>
     <string name="revanced_hide_account_menu_filter_strings_title">Account menu filter</string>
     <string name="revanced_hide_account_menu_filter_strings_summary">List of account menu names to filter, separated by new lines.</string>
     <string name="revanced_hide_handle_title">Hide handle</string>
diff --git a/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml b/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml
index 26c29f0ca..79744f686 100644
--- a/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml
+++ b/patches/src/main/resources/youtube/settings/xml/revanced_prefs.xml
@@ -69,7 +69,7 @@
         <!-- SETTINGS: HIDE_FEED_FLYOUT_MENU
         <PreferenceScreen android:title="@string/revanced_preference_screen_feed_flyout_menu_title" android:key="revanced_preference_screen_feed_flyout_menu" android:summary="@string/revanced_preference_screen_feed_flyout_menu_summary">
             <SwitchPreference android:title="@string/revanced_hide_feed_flyout_menu_title" android:key="revanced_hide_feed_flyout_menu" android:summaryOn="@string/revanced_hide_feed_flyout_menu_summary_on" android:summaryOff="@string/revanced_hide_feed_flyout_menu_summary_off" />
-            <SwitchPreference android:title="@string/revanced_hide_feed_flyout_menu_filter_type_title" android:key="revanced_hide_feed_flyout_menu_filter_type" android:summaryOn="@string/revanced_hide_feed_flyout_menu_filter_type_summary_on" android:summaryOff="@string/revanced_hide_feed_flyout_menu_filter_type_summary_off" />
+            <app.revanced.extension.shared.settings.preference.HtmlSwitchPreference android:title="@string/revanced_hide_feed_flyout_menu_filter_type_title" android:key="revanced_hide_feed_flyout_menu_filter_type" android:summaryOn="@string/revanced_hide_feed_flyout_menu_filter_type_summary_on" android:summaryOff="@string/revanced_hide_feed_flyout_menu_filter_type_summary_off" />
             <app.revanced.extension.shared.settings.preference.ResettableEditTextPreference android:title="@string/revanced_hide_feed_flyout_menu_filter_strings_title" android:key="revanced_hide_feed_flyout_menu_filter_strings" android:summary="@string/revanced_hide_feed_flyout_menu_filter_strings_summary" android:inputType="textMultiLine" />
         </PreferenceScreen>SETTINGS: HIDE_FEED_FLYOUT_MENU -->
 
@@ -132,7 +132,7 @@
         <!-- SETTINGS: HIDE_LAYOUT_COMPONENTS
         <PreferenceScreen android:title="@string/revanced_preference_screen_account_menu_title" android:key="revanced_preference_screen_account_menu" android:summary="@string/revanced_preference_screen_account_menu_summary">
             <SwitchPreference android:title="@string/revanced_hide_account_menu_title" android:key="revanced_hide_account_menu" android:summary="@string/revanced_hide_account_menu_summary" />
-            <SwitchPreference android:title="@string/revanced_hide_account_menu_filter_type_title" android:key="revanced_hide_account_menu_filter_type" android:summaryOn="@string/revanced_hide_account_menu_filter_type_summary_on" android:summaryOff="@string/revanced_hide_account_menu_filter_type_summary_off" />
+            <app.revanced.extension.shared.settings.preference.HtmlSwitchPreference android:title="@string/revanced_hide_account_menu_filter_type_title" android:key="revanced_hide_account_menu_filter_type" android:summaryOn="@string/revanced_hide_account_menu_filter_type_summary_on" android:summaryOff="@string/revanced_hide_account_menu_filter_type_summary_off" />
             <app.revanced.extension.shared.settings.preference.ResettableEditTextPreference android:title="@string/revanced_hide_account_menu_filter_strings_title" android:key="revanced_hide_account_menu_filter_strings" android:summary="@string/revanced_hide_account_menu_filter_strings_summary" android:inputType="textMultiLine" />
             <SwitchPreference android:title="@string/revanced_hide_handle_title" android:key="revanced_hide_handle" android:summaryOn="@string/revanced_hide_handle_summary_on" android:summaryOff="@string/revanced_hide_handle_summary_off" />
         </PreferenceScreen>