Merge remote-tracking branch 'upstream/dev' into feat_youtube_19_05

# Conflicts:
#	src/main/kotlin/app/revanced/patches/youtube/video/hdrbrightness/HDRBrightnessPatch.kt

CHANGELOG.md

@@ -1,3 +1,10 @@
+# [4.4.0-dev.4](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.3...v4.4.0-dev.4) (2024-03-11)
+
+
+### Features
+
+* **YouTube :** Remove `HDR auto brightness` patch ([#2863](https://github.com/ReVanced/revanced-patches/issues/2863)) ([b4c7bf4](https://github.com/ReVanced/revanced-patches/commit/b4c7bf48084184e5f031f7f5139a9a29341d8ebf))
+
 # [4.4.0-dev.3](https://github.com/ReVanced/revanced-patches/compare/v4.4.0-dev.2...v4.4.0-dev.3) (2024-03-08)
 
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.4.0-dev.3
+version = 4.4.0-dev.4

src/main/kotlin/app/revanced/patches/youtube/video/hdrbrightness/HDRBrightnessPatch.kt

@@ -15,13 +15,14 @@ import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
 import com.android.tools.smali.dexlib2.iface.instruction.TwoRegisterInstruction
 import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 
+@Deprecated("Patch is obsolete and the hooked code is no longer present in 19.09+")
 @Patch(
-    name = "HDR auto brightness",
     description = "Adds an option to make the brightness of HDR videos follow the system default.",
     dependencies = [IntegrationsPatch::class, SettingsPatch::class, AddResourcesPatch::class],
     compatiblePackages = [
         CompatiblePackage(
-            "com.google.android.youtube", [
+            "com.google.android.youtube",
+            [
                 "18.32.39",
                 "18.37.36",
                 "18.38.44",
@@ -45,15 +46,15 @@ import com.android.tools.smali.dexlib2.iface.reference.FieldReference
 )
 @Suppress("unused")
 object HDRBrightnessPatch : BytecodePatch(
-    setOf(HDRBrightnessFingerprint)
+    setOf(HDRBrightnessFingerprint),
 ) {
     override fun execute(context: BytecodeContext) {
         AddResourcesPatch(this::class)
 
         if (HDRBrightnessFingerprint.result == null) throw HDRBrightnessFingerprint.exception
 
         SettingsPatch.PreferenceScreen.VIDEO.addPreferences(
-            SwitchPreference("revanced_hdr_auto_brightness")
+            SwitchPreference("revanced_hdr_auto_brightness"),
         )
 
         // FIXME
@@ -72,7 +73,7 @@ object HDRBrightnessPatch : BytecodePatch(
                     """
                         invoke-static {v$register}, Lapp/revanced/integrations/youtube/patches/HDRAutoBrightnessPatch;->getHDRBrightness(F)F
                         move-result v$register
-                    """
+                    """,
                 )
             }
         } ?: throw HDRBrightnessFingerprint.exception

src/main/resources/addresources/values/strings.xml

@@ -168,14 +168,6 @@
             <string name="revanced_custom_filter_strings_title">Custom filter</string>
             <string name="revanced_custom_filter_strings_summary">List of component path builder strings to filter separated by new line</string>
             <string name="revanced_custom_filter_toast_invalid_syntax">Invalid custom filter: %s</string>
-            <string name="revanced_hide_keyword_content_preference_screen_title">Hide keyword content</string>
-            <string name="revanced_hide_keyword_content_preference_screen_summary">Hide feed and search result videos using keyword filters</string>
-            <string name="revanced_hide_keyword_content_title">Enable keyword filtering</string>
-            <string name="revanced_hide_keyword_content_summary_on">Feed/search is filtered to hide content that matches keyword phrases\n\nLimitations\n• Some UI elements may not be hidden\n• Some Shorts may not be hidden\n• Searching for a keyword may show no results</string>
-            <string name="revanced_hide_keyword_content_summary_off">Feed/search results are not filtered by keywords</string>
-            <string name="revanced_hide_keyword_content_phrases_title">Keywords to hide</string>
-            <string name="revanced_hide_keyword_content_phrases_summary">Keywords and phrases to hide, separated by new lines\n\nWords with unusual upper/lower case usage must include the casing (ie: LeBlanc, DeAndre, TikTok)</string>
-            <string name="revanced_hide_keyword_toast_invalid_length" formatted="false">Invalid keyword length (must be at least %s characters): %s</string>
         </patch>
         <patch id="ad.general.HideAdsResourcePatch">
             <string name="revanced_hide_general_ads_title">Hide general ads</string>