chore(release): 2.171.0-dev.3 [skip ci]

# [2.171.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.171.0-dev.2...v2.171.0-dev.3) (2023-04-26)

### Features

* **youtube/sponsorblock:** automatically hide skip button ([#1956](https://github.com/revanced/revanced-patches/issues/1956)) ([1131b40](1131b40b11))

CHANGELOG.md

@@ -1,3 +1,52 @@
+# [2.171.0-dev.3](https://github.com/revanced/revanced-patches/compare/v2.171.0-dev.2...v2.171.0-dev.3) (2023-04-26)
+
+
+### Features
+
+* **youtube/sponsorblock:** automatically hide skip button ([#1956](https://github.com/revanced/revanced-patches/issues/1956)) ([c3c8ae6](https://github.com/revanced/revanced-patches/commit/c3c8ae6b4377b12838971cedc32779e12c07363c))
+
+# [2.171.0-dev.2](https://github.com/revanced/revanced-patches/compare/v2.171.0-dev.1...v2.171.0-dev.2) (2023-04-25)
+
+
+### Features
+
+* **youtube:** `hide-player-overlay` patch ([#1965](https://github.com/revanced/revanced-patches/issues/1965)) ([d233d96](https://github.com/revanced/revanced-patches/commit/d233d96faf838b22f4c458ad445af048362e7421))
+
+# [2.171.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.170.1-dev.1...v2.171.0-dev.1) (2023-04-25)
+
+
+### Features
+
+* **id-austria:** remove compatibility version constraint ([#1952](https://github.com/revanced/revanced-patches/issues/1952)) ([94ffd5a](https://github.com/revanced/revanced-patches/commit/94ffd5a26fe42f223a09ad6bd7f34f1fac0986ad))
+
+## [2.170.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.170.0...v2.170.1-dev.1) (2023-04-25)
+
+
+### Bug Fixes
+
+* **youtube/spoof-signature-verification:** additional fixes for subtitle window positions ([#1975](https://github.com/revanced/revanced-patches/issues/1975)) ([08584e6](https://github.com/revanced/revanced-patches/commit/08584e680fc658f37e8730499fa5197a08370776))
+
+# [2.170.0](https://github.com/revanced/revanced-patches/compare/v2.169.0...v2.170.0) (2023-04-24)
+
+
+### Bug Fixes
+
+* **enable-android-debugging:** don't include by default ([b2856f7](https://github.com/revanced/revanced-patches/commit/b2856f7f71640f78dfc11b3dff90a58add48d605))
+* **twitch/block-embedded-ads:** correct spelling mistake ([#1962](https://github.com/revanced/revanced-patches/issues/1962)) ([6138c2a](https://github.com/revanced/revanced-patches/commit/6138c2ac24f586137bc4ef974a6600d24ebdda3e))
+* **youtube/hide-video-action-buttons:** fix hide action buttons not working for some users ([#1959](https://github.com/revanced/revanced-patches/issues/1959)) ([3ab5842](https://github.com/revanced/revanced-patches/commit/3ab5842ebbee3381604efcaa454ea5c49d3a5363))
+* **youtube/sponsorblock:** correct spelling mistake ([#1941](https://github.com/revanced/revanced-patches/issues/1941)) ([d9d0fe7](https://github.com/revanced/revanced-patches/commit/d9d0fe7e236ccce348e8b3214454d29656a853c0))
+* **youtube/sponsorblock:** use lowercase letters for URL string ([#1942](https://github.com/revanced/revanced-patches/issues/1942)) ([b58842a](https://github.com/revanced/revanced-patches/commit/b58842a5f6f3fbcf06e87821bbc1ad3be7ca2fc0))
+* **youtube/tablet-mini-player:** throw if fingerprint fails to resolve ([642eef3](https://github.com/revanced/revanced-patches/commit/642eef39e8e8eeb1f95980f95b83e79faffe3a18))
+
+
+### Features
+
+* **youtube/wide-searchbar:** rename patch ([bb5885e](https://github.com/revanced/revanced-patches/commit/bb5885eca4b750f15776de9099fb4dd83f6d70f5))
+* **youtube:** bump compatibility to `18.15.40` ([ad82fcd](https://github.com/revanced/revanced-patches/commit/ad82fcdb63c7cc77e7387b7f0da95b005c90ce31))
+* **youtube:** constrain patches to `18.15.40` ([c0c10de](https://github.com/revanced/revanced-patches/commit/c0c10dec3446d35e20b17c25510cddcbe07b494f))
+* **youtube:** remove non working patch `hide-my-mix` ([6ae0f0b](https://github.com/revanced/revanced-patches/commit/6ae0f0b466322c4d60feb20ed0e809783452b9d4))
+* **youtube:** support version `18.15.40` ([c3614ab](https://github.com/revanced/revanced-patches/commit/c3614ab1d10a70fdb0813d7249866d696b28088f))
+
 # [2.170.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.169.1-dev.4...v2.170.0-dev.1) (2023-04-24)
 
 

README.md

@@ -38,6 +38,7 @@ The official Patch bundle provided by ReVanced and the community.
 | `hide-floating-microphone-button` | Hides the floating microphone button which appears in search. | 18.15.40 |
 | `hide-info-cards` | Hides info cards in videos. | 18.15.40 |
 | `hide-player-buttons` | Adds the option to hide video player previous and next buttons. | all |
+| `hide-player-overlay` | Hides the dark player overlay when player controls are visible. | all |
 | `hide-seekbar` | Hides the seekbar. | 18.15.40 |
 | `hide-shorts-button` | Hides the shorts button on the navigation bar. | 18.15.40 |
 | `hide-timestamp` | Hides timestamp in video player. | 18.15.40 |
@@ -181,8 +182,8 @@ The official Patch bundle provided by ReVanced and the community.
 
 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `remove-root-detection` | Removes the check for root permissions and unlocked bootloader. | 2.6.0 |
-| `spoof-signature` | Spoofs the signature of the app. | 2.6.0 |
+| `remove-root-detection` | Removes the check for root permissions and unlocked bootloader. | all |
+| `spoof-signature` | Spoofs the signature of the app. | all |
 </details>
 
 ### [📦 `com.myprog.hexedit`](https://play.google.com/store/apps/details?id=com.myprog.hexedit)

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.170.0-dev.1
+version = 2.171.0-dev.3

src/main/kotlin/app/revanced/patches/idaustria/detection/shared/annotations/DetectionCompatibility.kt

@@ -3,6 +3,6 @@ package app.revanced.patches.idaustria.detection.shared.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
-@Compatibility([Package("at.gv.oe.app", arrayOf("2.5.2", "2.6.0"))])
+@Compatibility([Package("at.gv.oe.app")])
 @Target(AnnotationTarget.CLASS)
 internal annotation class DetectionCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/overlay/annotations/HidePlayerOverlayPatchCompatibility.kt

@@ -0,0 +1,8 @@
+package app.revanced.patches.youtube.layout.hide.player.overlay.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("com.google.android.youtube")])
+@Target(AnnotationTarget.CLASS)
+internal annotation class HidePlayerOverlayPatchCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/overlay/patch/HidePlayerOverlayPatch.kt

@@ -0,0 +1,46 @@
+package app.revanced.patches.youtube.layout.hide.player.overlay.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.ResourceContext
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.ResourcePatch
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.youtube.layout.hide.player.overlay.annotations.HidePlayerOverlayPatchCompatibility
+
+@Patch
+@Name("hide-player-overlay")
+@Description("Hides the dark player overlay when player controls are visible.")
+@HidePlayerOverlayPatchCompatibility
+@Version("0.0.1")
+class HidePlayerOverlayPatch : ResourcePatch {
+    override fun execute(context: ResourceContext): PatchResult {
+        val attributes = arrayOf("height", "width")
+
+        context.xmlEditor[RESOURCE_FILE_PATH].use { editor ->
+            editor.file.getElementsByTagName("FrameLayout").item(0).childNodes.apply {
+                for (i in 1 until length) {
+                    val view = item(i)
+                    if (
+                        view.attributes.getNamedItem("android:id")
+                            ?.nodeValue
+                            ?.endsWith("scrim_overlay") == true
+                    ) {
+                        attributes.forEach {
+                            view.attributes.getNamedItem("android:layout_$it").nodeValue = "0.0dip"
+                        }
+                        break
+                    }
+                }
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+
+    private companion object {
+        const val RESOURCE_FILE_PATH = "res/layout/youtube_controls_overlay.xml"
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt

@@ -24,6 +24,7 @@ import app.revanced.patches.youtube.misc.fix.playback.fingerprints.SubtitleWindo
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
 import app.revanced.patches.youtube.misc.settings.bytecode.patch.SettingsPatch
+import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
 import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
 
 @Patch
@@ -34,7 +35,8 @@ import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
     IntegrationsPatch::class,
     SettingsPatch::class,
     PlayerTypeHookPatch::class,
-    ClientSpoofPatch::class
+    ClientSpoofPatch::class,
+    VideoIdPatch::class
 ])
 @Version("0.0.1")
 class SpoofSignatureVerificationPatch : BytecodePatch(
@@ -57,6 +59,9 @@ class SpoofSignatureVerificationPatch : BytecodePatch(
             )
         )
 
+        // Hook video id, required for subtitle fix.
+        VideoIdPatch.injectCall("$INTEGRATIONS_CLASS_DESCRIPTOR->setCurrentVideoId(Ljava/lang/String;)V")
+
         // hook parameter
         ProtobufParameterBuilderFingerprint.result?.let {
             val setParamMethod = context
@@ -102,7 +107,7 @@ class SpoofSignatureVerificationPatch : BytecodePatch(
                         invoke-static {p1, p2, p3, p4, p5}, $INTEGRATIONS_CLASS_DESCRIPTOR->getSubtitleWindowSettingsOverride(IIIZZ)[I
                         move-result-object v0
                         const/4 v1, 0x0
-                        aget p1, v0, v1     # ap, anchor configuration
+                        aget p1, v0, v1     # ap, anchor position
                         const/4 v1, 0x1
                         aget p2, v0, v1     # ah, horizontal anchor
                         const/4 v1, 0x2

src/main/resources/sponsorblock/host/values/strings.xml

@@ -2,42 +2,59 @@
 <resources>
     <string name="sb_enable_sb">Enable SponsorBlock</string>
     <string name="sb_enable_sb_sum">SponsorBlock is a crowd-sourced system for skipping annoying parts of YouTube videos</string>
+
+    <string name="sb_appearance_category">Appearance</string>
     <string name="sb_enable_voting">Show voting button</string>
     <string name="sb_enable_voting_sum_on">Segment voting button is shown</string>
     <string name="sb_enable_voting_sum_off">Segment voting button is not shown</string>
-    <string name="sb_enable_create_segment">Show create new segment button</string>
-    <string name="sb_enable_create_segment_sum_on">Create new segment button is shown</string>
-    <string name="sb_enable_create_segment_sum_off">Create new segment button is not shown</string>
     <string name="sb_enable_compact_skip_button">Use compact skip button</string>
     <string name="sb_enable_compact_skip_button_sum_on">Skip button styled for minimum width</string>
     <string name="sb_enable_compact_skip_button_sum_off">Skip button styled for best appearance</string>
-    <string name="sb_diff_segments">What to do with different segments</string>
-    <string name="sb_general">General</string>
-    <string name="sb_general_skiptoast">Show a toast when skipping segment automatically</string>
+    <string name="sb_enable_auto_hide_skip_segment_button">Automatically hide skip button</string>
+    <string name="sb_enable_auto_hide_skip_segment_button_sum_on">Skip button hides after a few seconds</string>
+    <string name="sb_enable_auto_hide_skip_segment_button_sum_off">Skip button displayed for entire segment</string>
+    <string name="sb_general_skiptoast">Show a toast when skipping automatically</string>
     <string name="sb_general_skiptoast_sum_on">Toast shown when a segment is automatically skipped. Tap here to see an example</string>
     <string name="sb_general_skiptoast_sum_off">Toast not shown. Tap here to see an example</string>
-    <string name="sb_general_skipcount">Enable skip count tracking</string>
-    <string name="sb_general_skipcount_sum_on">Lets the SponsorBlock leaderboard know how much time is saved. A message is sent to the leaderboard each time a segment is skipped</string>
-    <string name="sb_general_skipcount_sum_off">Skip count tracking is not enabled</string>
     <string name="sb_general_time_without">Show video length without segments</string>
     <string name="sb_general_time_without_sum_on">Video length minus all segments, shown in parentheses next to the full video length</string>
     <string name="sb_general_time_without_sum_off">Full video length shown</string>
+
+    <string name="sb_create_segment_category">Creating new segments</string>
+    <string name="sb_enable_create_segment">Show create new segment button</string>
+    <string name="sb_enable_create_segment_sum_on">Create new segment button is shown</string>
+    <string name="sb_enable_create_segment_sum_off">Create new segment button is not shown</string>
     <string name="sb_general_adjusting">Adjust new segment step</string>
     <string name="sb_general_adjusting_sum">Number of milliseconds the time adjustment buttons move when creating new segments</string>
     <string name="sb_general_adjusting_invalid">Value must be a positive number</string>
+    <string name="sb_guidelines_preference_title">View guidelines</string>
+    <string name="sb_guidelines_preference_sum">Guidelines contain rules and tips for creating new segments</string>
+    <string name="sb_guidelines_popup_title">Follow the guidelines</string>
+    <string name="sb_guidelines_popup_content">Read the SponsorBlock guidelines before creating new segments</string>
+    <string name="sb_guidelines_popup_already_read">Already read</string>
+    <string name="sb_guidelines_popup_open">Show me</string>
+
+    <string name="sb_general">General</string>
+    <string name="sb_general_skipcount">Enable skip count tracking</string>
+    <string name="sb_general_skipcount_sum_on">Lets the SponsorBlock leaderboard know how much time is saved. A message is sent to the leaderboard each time a segment is skipped</string>
+    <string name="sb_general_skipcount_sum_off">Skip count tracking is not enabled</string>
     <string name="sb_general_min_duration">Minimum segment duration</string>
     <string name="sb_general_min_duration_sum">Segments shorter than this value (in seconds) will not be shown or skipped</string>
     <string name="sb_general_uuid">Your private user id</string>
     <string name="sb_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="sb_general_uuid_invalid">User id cannot be blank</string>
+    <string name="sb_general_api_url">Change API URL</string>
+    <string name="sb_general_api_url_sum">The address SponsorBlock uses to make calls to the server. Do not change this unless you know what you\'re doing</string>
+    <string name="sb_api_url_reset">API URL reset</string>
+    <string name="sb_api_url_invalid">API URL is invalid</string>
+    <string name="sb_api_url_changed">API URL changed</string>
     <string name="sb_settings_ie">Import/Export settings</string>
     <string name="sb_settings_ie_sum">Your SponsorBlock JSON configuration that can be imported/exported to ReVanced and other SponsorBlock platforms. This includes your private user id. Be sure to share this wisely</string>
-    <string name="sb_general_api_url">Change API URL</string>
-    <string name="sb_general_api_url_sum">The address SponsorBlock uses to make calls to the server. &lt;b>Don\'t change this unless you know what you\'re doing&lt;/b></string>
     <string name="sb_settings_import_successful">Settings imported successfully</string>
     <string name="sb_settings_import_failed">Failed to import: %s</string>
     <string name="sb_settings_export_failed">Failed to export settings (try clearing app data)</string>
 
+    <string name="sb_diff_segments">Change segment behavior</string>
     <string name="sb_segments_sponsor">Sponsor</string>
     <string name="sb_segments_sponsor_sum">Paid promotion, paid referrals and direct advertisements. Not for self-promotion or free shout-outs to causes/creators/websites/products they like</string>
     <string name="sb_segments_selfpromo">Unpaid/Self Promotion</string>
@@ -96,11 +113,6 @@
     <string name="sb_skip_seekbaronly">Show in seek bar</string>
     <string name="sb_skip_ignore">Disable</string>
 
-    <string name="sb_about">About</string>
-    <string name="sb_about_api">sponsor.ajay.app</string>
-    <string name="sb_about_api_sum">Data is provided by the SponsorBlock API. Tap here to learn more and see downloads for other platforms</string>
-    <string name="sb_about_made_by">ReVanced integration by JakubWeg,\nrecoded by oSumAtrIX</string>
-
     <string name="sb_submit_failed_invalid" formatted="false">Can\'t submit the segment: %s</string>
     <string name="sb_submit_failed_timeout">Unable to submit segments (API timed out)</string>
     <string name="sb_submit_failed_unknown_error" formatted="false">Unable to submit segments (status: %d %s)</string>
@@ -139,13 +151,6 @@
     <string name="sb_new_segment_edit_by_hand_content">Do you want to edit the timing for the start or end of the segment?</string>
     <string name="sb_new_segment_edit_by_hand_parse_error">Invalid time given</string>
 
-    <string name="sb_guidelines_preference_title">View guidelines</string>
-    <string name="sb_guidelines_preference_sum">Guidelines contain rules and tips for creating new segments</string>
-    <string name="sb_guidelines_popup_title">Follow the guidelines</string>
-    <string name="sb_guidelines_popup_content">Read the SponsorBlock guidelines before creating new segments</string>
-    <string name="sb_guidelines_popup_already_read">Already read</string>
-    <string name="sb_guidelines_popup_open">Show me</string>
-
     <string name="sb_stats">Stats</string>
     <string name="sb_stats_connection_failure">Stats temporarily not available (API is down)</string>
     <string name="sb_stats_loading">Loading...</string>
@@ -166,6 +171,7 @@
     <string name="sb_stats_saved_hour_format" formatted="false">%d hours %d minutes</string>
     <string name="sb_stats_saved_minute_format" formatted="false">%d minutes %d seconds</string>
     <string name="sb_stats_saved_second_format" formatted="false">%d seconds</string>
+
     <string name="sb_color_dot_label">Color:</string>
     <string name="sb_color_changed">Color changed</string>
     <string name="sb_color_reset">Color reset</string>
@@ -173,7 +179,9 @@
     <string name="sb_reset_color">Reset color</string>
 
     <string name="sb_reset">Reset</string>
-    <string name="sb_api_url_reset">API URL reset</string>
-    <string name="sb_api_url_invalid">API URL is invalid</string>
-    <string name="sb_api_url_changed">API URL changed</string>
+
+    <string name="sb_about">About</string>
+    <string name="sb_about_api">sponsor.ajay.app</string>
+    <string name="sb_about_api_sum">Data is provided by the SponsorBlock API. Tap here to learn more and see downloads for other platforms</string>
+    <string name="sb_about_made_by">ReVanced integration by JakubWeg,\nrecoded by oSumAtrIX</string>
 </resources>