chore(release): 1.11.0 [skip ci]

# [1.11.0](https://github.com/revanced/revanced-patches/compare/v1.10.5...v1.11.0) (2022-06-26)

### Features

* add youtube version 17.24.35 ([fde42c5](fde42c5bae))
* add youtube version 17.24.35 ([b4ae564](b4ae564102))

.github/workflows/release.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   release:
     name: Release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -28,12 +28,14 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: "lts/*"
-      - name: Make gradlew executable
+      - name: Setup Android SDK
-        run: chmod +x gradlew
+        uses: android-actions/setup-android@v2
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew build clean
+      - name: Install Android build-tools
+        run: sdkmanager "build-tools;32.0.0"
       - name: Setup semantic-release
         run: npm install -g semantic-release @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D
       - name: Release

.releaserc

@@ -26,6 +26,9 @@
         "assets": [
           {
             "path": "build/libs/*.jar"
+          },
+          {
+            "path": "build/libs/*.dex"
           }
         ]
       }

CHANGELOG.md

@@ -1,3 +1,354 @@
+# [1.11.0](https://github.com/revanced/revanced-patches/compare/v1.10.5...v1.11.0) (2022-06-26)
+
+
+### Features
+
+* add youtube version 17.24.35 ([ec626cc](https://github.com/revanced/revanced-patches/commit/ec626ccfa2bcf14b722d08110382de009a1c12b4))
+* add youtube version 17.24.35 ([adc60a6](https://github.com/revanced/revanced-patches/commit/adc60a6fa09f6a21800ba51b8ca888d11a17e870))
+
+## [1.10.5](https://github.com/revanced/revanced-patches/compare/v1.10.4...v1.10.5) (2022-06-25)
+
+
+### Bug Fixes
+
+* put back proper variable ([#61](https://github.com/revanced/revanced-patches/issues/61)) ([d26c423](https://github.com/revanced/revanced-patches/commit/d26c4233031fd418eb37c8f05e9bc1857e0572e6))
+
+## [1.10.4](https://github.com/revanced/revanced-patches/compare/v1.10.3...v1.10.4) (2022-06-23)
+
+
+### Bug Fixes
+
+* missing brackets at inlining ([8936c8a](https://github.com/revanced/revanced-patches/commit/8936c8aaedb56817cda5eec5f4a8c32f433862aa))
+
+## [1.10.3](https://github.com/revanced/revanced-patches/compare/v1.10.2...v1.10.3) (2022-06-23)
+
+
+### Bug Fixes
+
+* get create button view register by more reliable means ([#59](https://github.com/revanced/revanced-patches/issues/59)) ([6ab821e](https://github.com/revanced/revanced-patches/commit/6ab821e377176f4e9f1b7ec2b58a924fa40299db))
+
+## [1.10.2](https://github.com/revanced/revanced-patches/compare/v1.10.1...v1.10.2) (2022-06-23)
+
+
+### Bug Fixes
+
+* `disable-create-button` not working with prebuilt jar file ([#55](https://github.com/revanced/revanced-patches/issues/55)) ([78be64a](https://github.com/revanced/revanced-patches/commit/78be64accc2023281c0c376849cdb0213622dc5c))
+
+## [1.10.1](https://github.com/revanced/revanced-patches/compare/v1.10.0...v1.10.1) (2022-06-23)
+
+
+### Bug Fixes
+
+* patcher not propagating dexlib ([980c486](https://github.com/revanced/revanced-patches/commit/980c48673259496d793bc7f864ad355188dcf7b6))
+* update patcher version ([e3d0bb7](https://github.com/revanced/revanced-patches/commit/e3d0bb7ee1923ea996cf637267c62d233a74c7fa))
+
+# [1.10.0](https://github.com/revanced/revanced-patches/compare/v1.9.1...v1.10.0) (2022-06-23)
+
+
+### Features
+
+* add compatibility for YouTube v17.23.36 and v17.24.34 ([1812bc3](https://github.com/revanced/revanced-patches/commit/1812bc39e0e88f1ab02ae8127e9000780eedf49c))
+
+## [1.9.1](https://github.com/revanced/revanced-patches/compare/v1.9.0...v1.9.1) (2022-06-21)
+
+
+### Bug Fixes
+
+* update patcher version ([5f54bc9](https://github.com/revanced/revanced-patches/commit/5f54bc9aa8fd8b83448141a9b05746e3e977369d))
+
+# [1.9.0](https://github.com/revanced/revanced-patches/compare/v1.8.2...v1.9.0) (2022-06-21)
+
+
+### Features
+
+* use `install` mode by default ([c2b2993](https://github.com/revanced/revanced-patches/commit/c2b299336a984d66a2d066e5ebe9c4f9bee5c2aa))
+
+## [1.8.2](https://github.com/revanced/revanced-patches/compare/v1.8.1...v1.8.2) (2022-06-20)
+
+
+### Bug Fixes
+
+* migrate to breaking changes from patcher ([2c0a419](https://github.com/revanced/revanced-patches/commit/2c0a4196fed2fbdcd454ed882b720898d3050c51))
+* old usage of `toInstructions` extension method ([65ddd52](https://github.com/revanced/revanced-patches/commit/65ddd522dca19e0590d9cb6fdb2d85ad7b98481e))
+
+## [1.8.1](https://github.com/revanced/revanced-patches/compare/v1.8.0...v1.8.1) (2022-06-20)
+
+
+### Bug Fixes
+
+* add execute permission to `./gradlew` file ([ff7a560](https://github.com/revanced/revanced-patches/commit/ff7a5602f68428111fea6c60cbea694592039ef1))
+
+# [1.8.0](https://github.com/revanced/revanced-patches/compare/v1.7.0...v1.8.0) (2022-06-20)
+
+
+### Features
+
+* bump compatibility of patches for Youtube to v17.23.35 ([3748d05](https://github.com/revanced/revanced-patches/commit/3748d0533e62a8871ab2202ce9b61170a90dae62))
+
+# [1.7.0](https://github.com/revanced/revanced-patches/compare/v1.6.4...v1.7.0) (2022-06-20)
+
+
+### Features
+
+* `disable-fullscreen-panels` patch ([3bf0561](https://github.com/revanced/revanced-patches/commit/3bf056163500b006d1a20c5f3a3e0c92fec13bd8))
+
+## [1.6.4](https://github.com/revanced/revanced-patches/compare/v1.6.3...v1.6.4) (2022-06-19)
+
+
+### Bug Fixes
+
+* update patcher version ([#35](https://github.com/revanced/revanced-patches/issues/35)) ([1a379df](https://github.com/revanced/revanced-patches/commit/1a379dfd974b9f92d4bd0d5d7a4711eb6d1060b3)), closes [#34](https://github.com/revanced/revanced-patches/issues/34)
+
+## [1.6.3](https://github.com/revanced/revanced-patches/compare/v1.6.2...v1.6.3) (2022-06-16)
+
+
+### Bug Fixes
+
+* wrong dex path ([170fbbb](https://github.com/revanced/revanced-patches/commit/170fbbb99e4a2dbe3e0febe44d07a692aa9d7224))
+
+## [1.6.2](https://github.com/revanced/revanced-patches/compare/v1.6.1...v1.6.2) (2022-06-16)
+
+
+### Bug Fixes
+
+* broken gradle task ([91483a8](https://github.com/revanced/revanced-patches/commit/91483a8fbf92559d079dc52f846f5f871f5d6b5c))
+
+## [1.6.1](https://github.com/revanced/revanced-patches/compare/v1.6.0...v1.6.1) (2022-06-16)
+
+
+### Bug Fixes
+
+* broken gradle task ([4d07961](https://github.com/revanced/revanced-patches/commit/4d07961c8afd24da7f8879d11419147f2e100f05))
+
+# [1.6.0](https://github.com/revanced/revanced-patches/compare/v1.5.3...v1.6.0) (2022-06-16)
+
+
+### Bug Fixes
+
+* broken gradle task ([28e3f55](https://github.com/revanced/revanced-patches/commit/28e3f554ea6a7144416523fe48ce7adbb613b263))
+
+
+### Features
+
+* generate dex files using gradle task ([c34c1be](https://github.com/revanced/revanced-patches/commit/c34c1be21f50b4f720a7cd81e0dfe5ef6330caab))
+
+## [1.5.3](https://github.com/revanced/revanced-patches/compare/v1.5.2...v1.5.3) (2022-06-16)
+
+
+### Bug Fixes
+
+* forgot about this ([7102a25](https://github.com/revanced/revanced-patches/commit/7102a25dc618f19b324b01870d23f5418f375b2a))
+
+## [1.5.2](https://github.com/revanced/revanced-patches/compare/v1.5.1...v1.5.2) (2022-06-16)
+
+
+### Bug Fixes
+
+* dummy task for Gradle semantic-release plugin ([f6a8911](https://github.com/revanced/revanced-patches/commit/f6a8911906dfe52fcdb685daf7a02d6d0052cba9))
+* releases ([30d5c9a](https://github.com/revanced/revanced-patches/commit/30d5c9a67ccf88ca6ac00d0a9f2a2e330f8092dd))
+
+## [1.5.1](https://github.com/revanced/revanced-patches/compare/v1.5.0...v1.5.1) (2022-06-16)
+
+
+### Reverts
+
+* Revert "Changed app name to ReVanced (#21)" (#24) ([70a48c5](https://github.com/revanced/revanced-patches/commit/70a48c5f35cd236612352a1dbbf50487625e6e96)), closes [#21](https://github.com/revanced/revanced-patches/issues/21) [#24](https://github.com/revanced/revanced-patches/issues/24)
+
+# [1.5.0](https://github.com/revanced/revanced-patches/compare/v1.4.0...v1.5.0) (2022-06-15)
+
+
+### Bug Fixes
+
+* sync version ([6170e36](https://github.com/revanced/revanced-patches/commit/6170e3689d9c8998be94a8464352af620cccd11b))
+
+
+### Features
+
+* `hide-cast-button` patch ([2cd531e](https://github.com/revanced/revanced-patches/commit/2cd531eb5a334f3cf91cba4556f07e863cd9ec1b))
+
+# [1.4.0](https://github.com/revanced/revanced-patches/compare/v1.3.1...v1.4.0) (2022-06-15)
+
+
+### Bug Fixes
+
+* add size `48px` for `custom-branding` patch ([f81872b](https://github.com/revanced/revanced-patches/commit/f81872b8e41da215517fdb59364130d8ce681607))
+
+
+### Features
+
+* `premium-heading` patch ([78913bf](https://github.com/revanced/revanced-patches/commit/78913bf1e80f5b91d0dee506fdfe3f875e8e6988))
+
+## [1.3.1](https://github.com/revanced/revanced-patches/compare/v1.3.0...v1.3.1) (2022-06-15)
+
+
+### Bug Fixes
+
+* `custom-branding` patch failing to get resources ([efb6d4c](https://github.com/revanced/revanced-patches/commit/efb6d4c2be515185fc9bd29c40ce202f0d684cee))
+
+# [1.3.0](https://github.com/revanced/revanced-patches/compare/v1.2.2...v1.3.0) (2022-06-14)
+
+
+### Features
+
+* `custom-branding` patch ([0d65ea8](https://github.com/revanced/revanced-patches/commit/0d65ea8cdb0e02287f6be6855cd3d28823a61e70))
+
+## [1.2.2](https://github.com/revanced/revanced-patches/compare/v1.2.1...v1.2.2) (2022-06-13)
+
+
+### Bug Fixes
+
+* environment variable not found in gradle build script ([0da15fb](https://github.com/revanced/revanced-patches/commit/0da15fb0effac0566d080d7b85e9fbe46c3dd34d))
+
+## [1.2.1](https://github.com/revanced/revanced-patches/compare/v1.2.0...v1.2.1) (2022-06-12)
+
+
+### Performance Improvements
+
+* fix high battery consumption due to chromecast not working with `microg` ([dd8b01a](https://github.com/revanced/revanced-patches/commit/dd8b01a5c5d75b00ea4d04ce35bc43942c1b0409))
+
+# [1.2.0](https://github.com/revanced/revanced-patches/compare/v1.1.0...v1.2.0) (2022-06-11)
+
+
+### Bug Fixes
+
+* migrate to `include` annotation ([110bbf1](https://github.com/revanced/revanced-patches/commit/110bbf143a9cec8dce1f0416cff40f8d93055e96))
+
+
+### Features
+
+* `microg-patch` ([48bbd57](https://github.com/revanced/revanced-patches/commit/48bbd574a52c8bf6834b26facfe7384b830f944a))
+* updated all patches to support v17.22.36 of `com.android.google.youtube` ([e12dc11](https://github.com/revanced/revanced-patches/commit/e12dc11b670c2b0c414741616e0a646e8421e418))
+
+# [1.1.0](https://github.com/revanced/revanced-patches/compare/v1.0.0...v1.1.0) (2022-06-11)
+
+
+### Features
+
+* generate & upload dex files ([#18](https://github.com/revanced/revanced-patches/issues/18)) ([e6f5355](https://github.com/revanced/revanced-patches/commit/e6f53553a98c164c4eb926fb273358ed506e00a4))
+
+# 1.0.0 (2022-06-05)
+
+
+### Bug Fixes
+
+* `create-button-signature` ([a173f6e](https://github.com/revanced/revanced-patches/commit/a173f6e5a7e65943657e2072e8a72a4a680e5277))
+* `enable-seekbar-tapping` patch ([52fd726](https://github.com/revanced/revanced-patches/commit/52fd726d9b0d2efbd0f9742fc84ad01ccdcff168))
+* `Index` in wrong package ([2f9360f](https://github.com/revanced/revanced-patches/commit/2f9360f57cc8415564534fbbd8bd5e2a83a1b629))
+* `minimized-playback` & `old-quality-layout` wrong opcodes ([b45d175](https://github.com/revanced/revanced-patches/commit/b45d175c6f1ece6da894ab16128c2644d262c9c7))
+* `minimized-playback` patch ([55677a4](https://github.com/revanced/revanced-patches/commit/55677a44ff965c0b92c3f1d771bd68c12c142ad4))
+* `SignatureChecker` not handling nullable field `methodMetadata` ([17bcf78](https://github.com/revanced/revanced-patches/commit/17bcf786a85ccf1f7d9f5a66a044a3c26def09bb))
+* accidentally removed code in refactor ([0077e26](https://github.com/revanced/revanced-patches/commit/0077e26d23cc112b671a41614a55348fac2c88ca))
+* add missing `trimIndent()` to string literals ([76d3c71](https://github.com/revanced/revanced-patches/commit/76d3c71b67edebd79f2cdb1bb28e4d2969d72223))
+* add missing opcode for `create-button-method` ([0a398ef](https://github.com/revanced/revanced-patches/commit/0a398ef364f91a0dd9608df1a036a2515476ccf2))
+* attempt on all patches ([3395d69](https://github.com/revanced/revanced-patches/commit/3395d69747103a4bdf314297aa0bfa6ef6a0fc36))
+* breaking changes by `revanced-patcher` dependency ([e12e484](https://github.com/revanced/revanced-patches/commit/e12e484e3796c5c9c8505b677838cdf8432f2e79))
+* breaking changes by `revanced-patcher` dependency ([7e485b4](https://github.com/revanced/revanced-patches/commit/7e485b4ffe204d724809aeb9bd9f693a35ded94d))
+* breaking changes of the patcher ([1a49bbd](https://github.com/revanced/revanced-patches/commit/1a49bbdbc4ff6f427934259536218e161908b449))
+* breaking patcher changes ([50f9cc5](https://github.com/revanced/revanced-patches/commit/50f9cc52acfd5bc23330ecd23d8d85678a9d3eee))
+* breaking patcher changes ([cbb9e2c](https://github.com/revanced/revanced-patches/commit/cbb9e2cd1fa829e1d1dd92dbd40131b11ae6a05b))
+* breaking patcher changes ([581d1b0](https://github.com/revanced/revanced-patches/commit/581d1b0ca7d15adcdb1ab6116ef035acfe701757))
+* bugfixes in `microg` ([a43b33b](https://github.com/revanced/revanced-patches/commit/a43b33bdbb2b36e0a8f991fa11dfeeec34de01f9))
+* clean after building ([a2df3fb](https://github.com/revanced/revanced-patches/commit/a2df3fbc9761b07f3010542fa8684ade00e4dc91))
+* disable `hide-suggestions-patch` patch until fixed ([99099ea](https://github.com/revanced/revanced-patches/commit/99099ea0bc12f5f25896967db642442df69d0c4f))
+* incorrect endIndex (fixed in Patcher) ([424788e](https://github.com/revanced/revanced-patches/commit/424788edd777110cdaff97500556d18628f33385))
+* loop in `amoled` patch ([c4c86b6](https://github.com/revanced/revanced-patches/commit/c4c86b65fd8b2463c1d86ad2e46ec9f08e60d47c))
+* migrate patches to latest patcher api changes ([8a0ee03](https://github.com/revanced/revanced-patches/commit/8a0ee03a71cf4a000c9a7246d0e64ed8291a5127))
+* missing extension method `doRecursively` ([e9c9460](https://github.com/revanced/revanced-patches/commit/e9c946008ee912652d288e515b83b52ae2d239d8))
+* modified opcode for `show-video-ads-constructor` ([a0dcea3](https://github.com/revanced/revanced-patches/commit/a0dcea3a13f68cae449dfaf445b542e339c83ff0))
+* multiple bugs in patches ([e37201d](https://github.com/revanced/revanced-patches/commit/e37201d0ceef474696857a0d8845950c888194d0))
+* name for `IntegrationsPatch` ([e46ef02](https://github.com/revanced/revanced-patches/commit/e46ef02302825d62b57912b2747a25f858036bb7))
+* print instruction index of warning ([9e29aee](https://github.com/revanced/revanced-patches/commit/9e29aeeeff222412f6c45cf7e4879f8ec53ca6ee))
+* publish releases ([83916f9](https://github.com/revanced/revanced-patches/commit/83916f96d27989dcbb35c0ba6ef326a16b470501))
+* remove `HideSuggestionsPatch` from `Index` ([f32e474](https://github.com/revanced/revanced-patches/commit/f32e4747b512c675b807ff5eebfd0b8e66173fba))
+* remove unused patches ([d12e92a](https://github.com/revanced/revanced-patches/commit/d12e92aead677fefa9dcb48748d783225b65fab1))
+* signature checker with changes of patcher ([e82459d](https://github.com/revanced/revanced-patches/commit/e82459d37759e1a5a860d3e7fcdf69d95b06858e))
+* spelling mistake ([52f9147](https://github.com/revanced/revanced-patches/commit/52f9147ee8d591f786397d174dc02a141d9250a9))
+* tests failing ([102793f](https://github.com/revanced/revanced-patches/commit/102793f24f8bf7c7fd254968b29d65da7b2b962f))
+* update `HomeAdsPatch` ([62f1801](https://github.com/revanced/revanced-patches/commit/62f1801e9cbee53c0be3413c245161bd941e4aec))
+* update patches ([91b8ec8](https://github.com/revanced/revanced-patches/commit/91b8ec81f33417798546c32db708fe09ada3930c))
+* use the latest version of patcher dependency ([fe4a439](https://github.com/revanced/revanced-patches/commit/fe4a439cb2bc5e385ae13e8e155f25bb15e74633))
+* version in package metadata of music ([b299205](https://github.com/revanced/revanced-patches/commit/b299205aa7cde82f1f55fc598de3ff8d80b8bcb0))
+* **VideoAds:** remove `istore1` opcode ([dc4ec57](https://github.com/revanced/revanced-patches/commit/dc4ec574414c5df959efa0ca8f1cd39a812fedf8))
+* write while reading resources and remove checking for "." in resource extensions ([7bc6094](https://github.com/revanced/revanced-patches/commit/7bc60943cb2350e89dac091ec9c98c5effd0b8a9))
+* wrong access flag in signature for `Create button patch` ([9fbb89d](https://github.com/revanced/revanced-patches/commit/9fbb89d05336a256a0759eea6095e073946c45e5))
+* wrong annotation and signature in patches ([a0fdee8](https://github.com/revanced/revanced-patches/commit/a0fdee81a6d6773603520e7c3040ae8637642d58))
+* wrong opcode for `create-button-method` ([3214650](https://github.com/revanced/revanced-patches/commit/32146506f139aebc44cd5faffb7706b8b9c21c3d))
+* wrong opcode pattern for `create-button-method` ([f4d8a85](https://github.com/revanced/revanced-patches/commit/f4d8a8525bc64b90748b21979d463977a21dcd85))
+* wrong opcode pattern for `enable-seekbar-tapping-signature` ([1d83395](https://github.com/revanced/revanced-patches/commit/1d833957ed3e01188770c85e3d84e483419bd797))
+* wrong opcode pattern for signature in `Hide suggestions patch` ([535aee0](https://github.com/revanced/revanced-patches/commit/535aee08408b990c80f5966c13fa84666a8b35d0))
+* wrong patches in `upgrade-tab-remover` ([5182290](https://github.com/revanced/revanced-patches/commit/518229031ceca049ad790f7b77b19405d39f0ce1))
+* wrong signature for `hide-reels-signature` ([2d9ff2a](https://github.com/revanced/revanced-patches/commit/2d9ff2af0a991d7721f3741187716a3b08bb4029))
+* wrong signatures for patch `Old Quality Layout Patch` ([823e503](https://github.com/revanced/revanced-patches/commit/823e503d84037bdf27b09f17e63383f963c76854))
+* wrong versions of patches ([a112b22](https://github.com/revanced/revanced-patches/commit/a112b22ce6e685204caab6f95f511e26ef95806b))
+
+
+### Code Refactoring
+
+* Rename `net.revanced` to `app.revanced` ([68ea89f](https://github.com/revanced/revanced-patches/commit/68ea89f15e9ea077df0d0ac20a40b735bb5ae26c))
+
+
+### Features
+
+* `Dependencies` annotation ([85806bb](https://github.com/revanced/revanced-patches/commit/85806bb355e342ecb33d4ee1e76f9edf89b2c2ee))
+* `GeneralBytecodeAds` and `GeneralResourceAds` patch ([f99bbef](https://github.com/revanced/revanced-patches/commit/f99bbef4c911ac2492166c7a3792ea11ffceffab))
+* `hide-shorts-button` patch ([88352ee](https://github.com/revanced/revanced-patches/commit/88352ee6ecd23faa4a7fd9f7495e67fa1d3e33bd))
+* `tastebuilder-remover` for music ([a6aeca3](https://github.com/revanced/revanced-patches/commit/a6aeca31bd80b8c4a8acd071e22faca6e136bdb0))
+* Add (WIP) Signature Checker ([ae4c7b2](https://github.com/revanced/revanced-patches/commit/ae4c7b29f211c461de460f97f3a8656e795adafb))
+* add `amoled` patch ([d61bac4](https://github.com/revanced/revanced-patches/commit/d61bac4f8243d0ef72ca91c7c1d5facd858d515e))
+* add home ads patch ([36cddd1](https://github.com/revanced/revanced-patches/commit/36cddd1488683e19e2b927e34c80a4f0f3cace35))
+* add patches compatibility to the newest version ([799401d](https://github.com/revanced/revanced-patches/commit/799401ddf99da0aaa5f52c39d3d3d4061370fd75))
+* add publishing to package registry ([b475e09](https://github.com/revanced/revanced-patches/commit/b475e09577db4dda7bbb45dbf170d78772834a6d))
+* add semantic-release ([d60f1d0](https://github.com/revanced/revanced-patches/commit/d60f1d06798d312b158b71691ecc87e828dccbc1))
+* added `codecs-unlock` patch ([e5fd7ce](https://github.com/revanced/revanced-patches/commit/e5fd7cece94b1ff5342178f59b29576db806e0f6))
+* begin `MicroG Patch` ([91474ba](https://github.com/revanced/revanced-patches/commit/91474ba07376c13e7a71685dfd8b6e6913ed5ee9))
+* display metadata for each signature in `SignatureChecker` ([736a71f](https://github.com/revanced/revanced-patches/commit/736a71fac21a32dbb1eef9c3a9f0d3005e7d9ca0))
+* get required register dynamically ([0924ca2](https://github.com/revanced/revanced-patches/commit/0924ca2ad30ae865dcc0fd484cb0da517e827352))
+* Initial commit ([bee5f2f](https://github.com/revanced/revanced-patches/commit/bee5f2faed882271ed059b0435e6e1aa91f93dbd))
+* integrations patch ([19c0b0d](https://github.com/revanced/revanced-patches/commit/19c0b0d194bb97c7248ea7a9b081176961653b9d))
+* migrate to dalvik patches ([e088c67](https://github.com/revanced/revanced-patches/commit/e088c671081bcf75586ccc1c4bdbed9366e93874))
+* MinimizedPlayback, CreateButtonRemover ([cc08c6c](https://github.com/revanced/revanced-patches/commit/cc08c6c3d38879dd4672ec671631b34aa2e3cc77))
+* OldQualityLayout, HideSuggestions, HideReels, EnableSeekbarTapping ([04a7cff](https://github.com/revanced/revanced-patches/commit/04a7cfff20d2734b1c92713de4e7e08a3b93ee85))
+* Patches for YouTube Music ([b60c9d3](https://github.com/revanced/revanced-patches/commit/b60c9d33b611bb4d5b55bb419652bc14b0309792))
+* remove obsolete patch `Hide suggestions patch` ([e65c6f2](https://github.com/revanced/revanced-patches/commit/e65c6f240ed23a54271d20a90fc57ec65cafc02d))
+* update MicroG patch to latest version ([c24f806](https://github.com/revanced/revanced-patches/commit/c24f8063a04f89aea2d2f7087a435738de7dfeae))
+* update patches to latest version ([bad25de](https://github.com/revanced/revanced-patches/commit/bad25dec1d73137f8b7a1bf4daaceb2279b4d48c))
+* use supplier instead of KClass ([08af6e5](https://github.com/revanced/revanced-patches/commit/08af6e54af79ef9ef4fb3372a348ce9b6fba4d20))
+* use supplier instead of KClass ([91aa019](https://github.com/revanced/revanced-patches/commit/91aa019f8d3d87fbf7affeb7abc2b02ba87af5c3))
+
+
+### BREAKING CHANGES
+
+* signature of patches was changed
+* signature of patches was changed
+* Package name was changed from "net.revanced" to "app.revanced"
+
+# [1.0.0-dev.16](https://github.com/revanced/revanced-patches/compare/v1.0.0-dev.15...v1.0.0-dev.16) (2022-06-05)
+
+
+### Features
+
+* add patches compatibility to the newest version ([799401d](https://github.com/revanced/revanced-patches/commit/799401ddf99da0aaa5f52c39d3d3d4061370fd75))
+
+# [1.0.0-dev.15](https://github.com/revanced/revanced-patches/compare/v1.0.0-dev.14...v1.0.0-dev.15) (2022-06-05)
+
+
+### Bug Fixes
+
+* remove unused patches ([d12e92a](https://github.com/revanced/revanced-patches/commit/d12e92aead677fefa9dcb48748d783225b65fab1))
+
+# [1.0.0-dev.14](https://github.com/revanced/revanced-patches/compare/v1.0.0-dev.13...v1.0.0-dev.14) (2022-06-04)
+
+
+### Bug Fixes
+
+* spelling mistake ([52f9147](https://github.com/revanced/revanced-patches/commit/52f9147ee8d591f786397d174dc02a141d9250a9))
+
+
+### Features
+
+* `Dependencies` annotation ([85806bb](https://github.com/revanced/revanced-patches/commit/85806bb355e342ecb33d4ee1e76f9edf89b2c2ee))
+* `GeneralBytecodeAds` and `GeneralResourceAds` patch ([f99bbef](https://github.com/revanced/revanced-patches/commit/f99bbef4c911ac2492166c7a3792ea11ffceffab))
+
 # [1.0.0-dev.13](https://github.com/revanced/revanced-patches/compare/v1.0.0-dev.12...v1.0.0-dev.13) (2022-05-31)
 
 

README.md

@@ -1,2 +1 @@
-# revanced-patches
+Repo for all ReVanced patches 
-Repo for all ReVanced patches

build.gradle.kts

@@ -1,59 +1,55 @@
 plugins {
-    kotlin("jvm") version "1.6.21"
+    kotlin("jvm") version "1.7.0"
-    java
-    `maven-publish`
 }
 
 group = "app.revanced"
 
 repositories {
     mavenCentral()
-    mavenLocal()
     maven {
-        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher") // note the "r"!
+        url = uri("https://maven.pkg.github.com/revanced/revanced-patcher")
         credentials {
-            // DO NOT set these variables in the project's gradle.properties.
+            username = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR")
-            // Instead, you should set them in:
+            password = project.findProperty("gpr.key")  as? String ?: System.getenv("GITHUB_TOKEN")
-            // Windows: %homepath%\.gradle\gradle.properties
-            // Linux: ~/.gradle/gradle.properties
-            username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR") // DO NOT CHANGE!
-            password = project.findProperty("gpr.key")  as String? ?: System.getenv("GITHUB_TOKEN") // DO NOT CHANGE!
         }
     }
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
+    implementation(kotlin("stdlib"))
 
-    implementation("app.revanced:revanced-patcher:1.0.0-dev.17")
+    implementation("app.revanced:revanced-patcher:1.10.2")
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.21")
 }
 
-java {
+tasks {
-    withSourcesJar()
+    register<DefaultTask>("generateDex") {
-    withJavadocJar()
+        description = "Generate dex files from build"
-}
+        dependsOn(build)
 
-val isGitHubCI = System.getenv("GITHUB_ACTOR") != null
+        doLast {
+            val androidHome = System.getenv("ANDROID_HOME") ?: throw GradleException("ANDROID_HOME not found")
+            val d8 = "${androidHome}/build-tools/32.0.0/d8"
+            val input = configurations.archives.get().allArtifacts.files.files.first().absolutePath
+            val output = input.replace(".jar", ".dex")
+            val work = File("${buildDir}/libs")
 
-publishing {
+            exec {
-    repositories {
+                workingDir = work
-        if (isGitHubCI) {
+                commandLine = listOf(d8, input)
-            maven {
+            }
-                name = "GitHubPackages"
+
-                url = uri("https://maven.pkg.github.com/revanced/revanced-patches") // note the "s"!
+            exec {
-                credentials {
+                workingDir = work
-                    username = System.getenv("GITHUB_ACTOR")
+                commandLine = listOf("mv", "classes.dex", output)
-                    password = System.getenv("GITHUB_TOKEN")
-                }
             }
-        } else {
-            mavenLocal()
         }
     }
-    publications {
+    // Dummy task to fix the Gradle semantic-release plugin.
-        register<MavenPublication>("gpr") {
+    // Remove this if you forked it to support building only.
-            from(components["java"])
+    // Tracking issue: https://github.com/KengoTODA/gradle-semantic-release-plugin/issues/435
-        }
+    register<DefaultTask>("publish") {
+        group = "publish"
+        description = "Dummy task"
+        dependsOn(named("generateDex"))
     }
 }

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 1.0.0-dev.13
+version = 1.11.0

src/main/kotlin/app/revanced/extensions/Extensions.kt

@@ -10,7 +10,7 @@ internal fun MutableMethodImplementation.injectHideCall(
 ) {
     this.addInstruction(
         index,
-        "invoke-static { v$register }, Lfi/razerman/youtube/XAdRemover;->HideView(Landroid/view/View;)V".toInstruction()
+        "invoke-static { v$register }, Lapp/revanced/integrations/patches/HideHomeAdsPatch;->HideHomeAds(Landroid/view/View;)V".toInstruction()
     )
 }
 
@@ -19,18 +19,18 @@ internal fun Node.doRecursively(action: (Node) -> Unit) {
     for (i in 0 until this.childNodes.length) this.childNodes.item(i).doRecursively(action)
 }
 
-internal fun String.startsWithAny(vararg prefix: String): Boolean {
+internal fun String.startsWithAny(vararg prefixes: String): Boolean {
-    for (_prefix in prefix)
+    for (prefix in prefixes)
-        if (this.startsWith(_prefix))
+        if (this.startsWith(prefix))
             return true
 
     return false
 }
 
-internal fun String.containsAny(vararg others: String): Boolean {
+internal fun String.equalsAny(vararg other: String): Boolean {
-    for (other in others)
+    for (_other in other)
-        if (this.contains(other))
+        if (this == _other)
             return true
 
     return false
-}
+}

src/main/kotlin/app/revanced/patches/music/audio/codecs/patch/CodecsUnlockPatch.kt

@@ -25,13 +25,13 @@ class CodecsUnlockPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        var result = signatures.first().result!!
+        var result = CodecsLockSignature.result!!
 
         val implementation = result.method.implementation!!
 
         val instructionIndex = result.scanResult.startIndex
 
-        result = signatures.last().result!!
+        result = AllCodecsReferenceSignature.result!!
         val codecMethod =
             data.toMethodWalker(result.immutableMethod).nextMethod(result.scanResult.startIndex).getMethod()
 

src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/patch/ExclusiveAudioPatch.kt

@@ -30,7 +30,7 @@ class ExclusiveAudioPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = signatures.first().result!!.findParentMethod(@Name("audio-only-enabler-method") @MatchingMethod(
+        val result = ExclusiveAudioSignature.result!!.findParentMethod(@Name("audio-only-enabler-method") @MatchingMethod(
             "Lgmd;",
             "d"
         ) @DirectPatternScanMethod @ExclusiveAudioCompatibility @Version(
@@ -67,4 +67,4 @@ class ExclusiveAudioPatch : BytecodePatch(
 
         return PatchResultSuccess()
     }
-}
+}

src/main/kotlin/app/revanced/patches/music/layout/tastebuilder/patch/RemoveTasteBuilderPatch.kt

@@ -9,7 +9,6 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.music.layout.tastebuilder.annotations.RemoveTasteBuilderCompatibility
 import app.revanced.patches.music.layout.tastebuilder.signatures.TasteBuilderConstructorSignature
 import org.jf.dexlib2.iface.instruction.formats.Instruction22c
@@ -25,20 +24,18 @@ class RemoveTasteBuilderPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = signatures.first().result!!
+        val result = TasteBuilderConstructorSignature.result!!
         val implementation = result.method.implementation!!
 
         val insertIndex = result.scanResult.endIndex - 8
 
         val register = (implementation.instructions[insertIndex] as Instruction22c).registerA
 
-        val instructionList = """
+        result.method.addInstructions(
+            insertIndex, """
                 const/16 v1, 0x8
                 invoke-virtual {v${register}, v1}, Landroid/view/View;->setVisibility(I)V
-            """.trimIndent().toInstructions().toMutableList()
+            """
-
-        implementation.addInstructions(
-            insertIndex, instructionList
         )
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/patch/RemoveUpgradeButtonPatch.kt

@@ -20,7 +20,7 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 
 @Patch
 @Name("upgrade-button-remover")
-@Description("Remove the upgrade tab from t he pivot bar in YouTube music.")
+@Description("Remove the upgrade tab from the pivot bar in YouTube music.")
 @RemoveUpgradeButtonCompatibility
 @Version("0.0.1")
 class RemoveUpgradeButtonPatch : BytecodePatch(
@@ -29,7 +29,7 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = signatures.first().result!!
+        val result = PivotBarConstructorSignature.result!!
         val implementation = result.method.implementation!!
 
         val pivotBarElementFieldRef =
@@ -73,4 +73,4 @@ class RemoveUpgradeButtonPatch : BytecodePatch(
         )
         return PatchResultSuccess()
     }
-}
+}

src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/patch/BackgroundPlayPatch.kt

@@ -9,7 +9,6 @@ import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.music.premium.backgroundplay.annotations.BackgroundPlayCompatibility
 import app.revanced.patches.music.premium.backgroundplay.signatures.BackgroundPlaybackDisableSignature
 
@@ -24,12 +23,12 @@ class BackgroundPlayPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        signatures.first().result!!.method.implementation!!.addInstructions(
+        BackgroundPlaybackDisableSignature.result!!.method.addInstructions(
             0,
             """
                 const/4 v0, 0x1
                 return v0
-            """.trimIndent().toInstructions()
+            """
         )
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/ad/general/annotation/GeneralAdsCompatibility.kt

@@ -0,0 +1,14 @@
+package app.revanced.patches.youtube.ad.general.annotation
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class GeneralAdsCompatibility
+

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/extensions/MethodExtensions.kt

@@ -0,0 +1,64 @@
+package app.revanced.patches.youtube.ad.general.bytecode.extensions
+
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.extensions.softCompareTo
+import app.revanced.patcher.patch.implementation.misc.PatchResultError
+import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import org.jf.dexlib2.builder.BuilderInstruction
+import org.jf.dexlib2.builder.MutableMethodImplementation
+import org.jf.dexlib2.iface.Method
+import org.jf.dexlib2.iface.instruction.Instruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.reference.FieldReference
+import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.iface.reference.Reference
+import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
+
+internal object MethodExtensions {
+    internal fun MutableMethodImplementation.insertBlocks(
+        startIndex: Int,
+        vararg blocks: List<BuilderInstruction>,
+    ) {
+        blocks.reversed().forEach {
+            this.addInstructions(
+                startIndex, it
+            )
+        }
+    }
+
+    internal fun MutableClass.addMethod(mutableMethod: MutableMethod) {
+        this.methods.add(mutableMethod)
+    }
+
+    internal fun MutableClass.findMutableMethodOf(
+        method: Method
+    ) = this.methods.first {
+        it.softCompareTo(
+            ImmutableMethodReference(
+                method.definingClass, method.name, method.parameters, method.returnType
+            )
+        )
+    }
+
+    internal inline fun <reified T : Reference> Instruction.toDescriptor(): String {
+        val reference = (this as ReferenceInstruction).reference
+        return when (T::class) {
+            MethodReference::class -> {
+                val methodReference = reference as MethodReference
+                "${methodReference.definingClass}->${methodReference.name}(${
+                    methodReference.parameterTypes.joinToString(
+                        ""
+                    ) { it }
+                })${methodReference.returnType}"
+            }
+
+            FieldReference::class -> {
+                val fieldReference = reference as FieldReference
+                "${fieldReference.definingClass}->${fieldReference.name}:${fieldReference.type}"
+            }
+
+            else -> throw PatchResultError("Unsupported reference type")
+        }
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralBytecodeAdsPatch.kt

@@ -0,0 +1,428 @@
+package app.revanced.patches.youtube.ad.general.bytecode.patch
+
+import app.revanced.extensions.injectHideCall
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.implementation.proxy
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.implementation.misc.PatchResultError
+import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
+import app.revanced.patcher.util.smali.toInstructions
+import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
+import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.addMethod
+import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.findMutableMethodOf
+import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.insertBlocks
+import app.revanced.patches.youtube.ad.general.bytecode.extensions.MethodExtensions.toDescriptor
+import app.revanced.patches.youtube.ad.general.bytecode.utils.MethodUtils.createMutableMethod
+import app.revanced.patches.youtube.ad.general.resource.patch.GeneralResourceAdsPatch
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
+import org.jf.dexlib2.Opcode
+import org.jf.dexlib2.builder.MutableMethodImplementation
+import org.jf.dexlib2.builder.instruction.*
+import org.jf.dexlib2.iface.MethodImplementation
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.formats.Instruction21c
+import org.jf.dexlib2.iface.instruction.formats.Instruction22c
+import org.jf.dexlib2.iface.instruction.formats.Instruction31i
+import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.iface.reference.FieldReference
+import org.jf.dexlib2.iface.reference.MethodReference
+import org.jf.dexlib2.iface.reference.StringReference
+import org.jf.dexlib2.immutable.reference.ImmutableMethodReference
+
+@Patch
+@Dependencies(
+    dependencies = [ResourceIdMappingProviderResourcePatch::class, IntegrationsPatch::class, GeneralResourceAdsPatch::class]
+)
+@Name("general-ads")
+@Description("Patch to remove general ads in bytecode.")
+@GeneralAdsCompatibility
+@Version("0.0.1")
+class GeneralBytecodeAdsPatch : BytecodePatch(
+    listOf()
+) {
+    // a constant used by litho
+    private val lithoConstant = 0xaed2868
+
+    // list of resource names to get the id of
+    private val resourceIds = arrayOf(
+        "ad_attribution",
+        "reel_multiple_items_shelf",
+        "info_cards_drawer_header",
+        "endscreen_element_layout_video",
+        "endscreen_element_layout_circle",
+        "endscreen_element_layout_icon",
+        "promoted_video_item_land",
+        "promoted_video_item_full_bleed",
+    ).map {
+        ResourceIdMappingProviderResourcePatch.resourceMappings[it]!!
+    }
+
+    private val stringReferences = arrayOf(
+        "Claiming to use more elements than provided",
+        "loadVideo() called on LocalDirector in wrong state",
+        "LoggingProperties are not in proto format"
+    )
+
+    override fun execute(data: BytecodeData): PatchResult {
+        // iterating through all classes is expensive
+        for (classDef in data.classes) {
+            var mutableClass: MutableClass? = null
+
+            method@ for (method in classDef.methods) {
+                var mutableMethod: MutableMethod? = null
+
+                if (method.implementation == null) continue@method
+
+                val instructions = method.implementation!!.instructions
+                instructions.forEachIndexed { index, instruction ->
+                    when (instruction.opcode) {
+                        Opcode.CONST -> {
+                            // TODO: find a way to de-duplicate code.
+                            //  The issue is we need to save mutableClass and mutableMethod to the existing fields
+                            when ((instruction as Instruction31i).wideLiteral) {
+                                resourceIds[0] -> { // general ads
+                                    //  and is followed by an instruction with the mnemonic INVOKE_VIRTUAL
+                                    val insertIndex = index + 1
+                                    val invokeInstruction = instructions.elementAt(insertIndex)
+                                    if (invokeInstruction.opcode != Opcode.INVOKE_VIRTUAL) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    // insert hide call to hide the view corresponding to the resource
+                                    val viewRegister = (invokeInstruction as Instruction35c).registerC
+                                    mutableMethod!!.implementation!!.injectHideCall(insertIndex, viewRegister)
+
+                                }
+
+                                resourceIds[1] -> { // reel ads
+                                    //  and is followed by an instruction at insertIndex with the mnemonic IPUT_OBJECT
+                                    val insertIndex = index + 4
+                                    val iPutInstruction = instructions.elementAt(insertIndex)
+                                    if (iPutInstruction.opcode != Opcode.IPUT_OBJECT) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    val viewRegister = (iPutInstruction as Instruction22c).registerA
+                                    mutableMethod!!.implementation!!.injectHideCall(insertIndex, viewRegister)
+                                }
+
+                                resourceIds[2] -> { // info cards ads
+                                    //  and is followed by an instruction with the mnemonic INVOKE_VIRTUAL
+                                    val removeIndex = index - 1
+                                    val invokeInstruction = instructions.elementAt(removeIndex)
+                                    if (invokeInstruction.opcode != Opcode.INVOKE_VIRTUAL) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    mutableMethod!!.implementation!!.removeInstruction(removeIndex)
+                                }
+
+                                resourceIds[3], resourceIds[4], resourceIds[5] -> { // end screen ads
+                                    //  and is followed by an instruction with the mnemonic IPUT_OBJECT
+                                    val insertIndex = index + 7
+                                    val invokeInstruction = instructions.elementAt(insertIndex)
+                                    if (invokeInstruction.opcode != Opcode.IPUT_OBJECT) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    // TODO: dynamically get registers
+                                    mutableMethod!!.addInstructions(
+                                        insertIndex, """
+                                                const/16 v1, 0x8
+                                                invoke-virtual {v0,v1}, Landroid/widget/FrameLayout;->setVisibility(I)V
+                                            """
+                                    )
+                                }
+
+                                resourceIds[6] -> {
+                                    //  and is followed by an instruction with the mnemonic INVOKE_DIRECT
+                                    val insertIndex = index + 3
+                                    val invokeInstruction = instructions.elementAt(insertIndex)
+                                    if (invokeInstruction.opcode != Opcode.INVOKE_DIRECT) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    // insert hide call to hide the view corresponding to the resource
+                                    val viewRegister = (invokeInstruction as Instruction35c).registerE
+                                    mutableMethod!!.implementation!!.injectHideCall(insertIndex, viewRegister)
+                                }
+
+                                resourceIds[7] -> {
+                                    // TODO, go to class, hide the inflated view
+                                }
+                            }
+                        }
+
+                        Opcode.CONST_STRING -> {
+
+                            when (((instruction as Instruction21c).reference as StringReference).string) {
+                                stringReferences[0] -> {
+                                    val stringInstruction = instructions.elementAt(3)
+                                    if (stringInstruction.opcode == Opcode.CONST_STRING) return@forEachIndexed
+
+                                    // create proxied method, make sure to not re-resolve() the current class
+                                    if (mutableClass == null) mutableClass = data.proxy(classDef).resolve()
+                                    if (mutableMethod == null) mutableMethod =
+                                        mutableClass!!.findMutableMethodOf(method)
+
+                                    // return the method
+                                    val insertIndex = 1 // after super constructor
+                                    mutableMethod!!.implementation!!.addInstruction(
+                                        insertIndex, BuilderInstruction10x(Opcode.RETURN_VOID)
+                                    )
+                                }
+
+                                stringReferences[1] -> {
+                                    // TODO: migrate video ads patch to here if necessary
+                                }
+
+                                stringReferences[2] -> { // Litho ads
+                                    // create proxied method.
+                                    val proxy = data.proxy(classDef)
+                                    val mutableClass = proxy.resolve()
+
+                                    // add getIsEmpty method
+                                    mutableClass.addGetIsEmptyMethod()
+
+                                    // get required method to patch and get references from
+                                    val lithoMethod = getLithoMethod(mutableClass)
+                                        ?: return PatchResultError("Could not find required litho method to patch.")
+                                    val lithoMethodImplementation = lithoMethod.implementation!!
+
+                                    // create and add getTemplateName method
+                                    val getTemplateMethod =
+                                        mutableClass.createGetTemplateNameMethod(lithoMethodImplementation)
+                                    mutableClass.addMethod(getTemplateMethod)
+
+                                    val lithoInstructions = lithoMethodImplementation.instructions
+                                    val thisType = mutableClass.type
+                                    val templateNameParameterType = getTemplateMethod.parameterTypes.first()
+
+                                    // get reference descriptors
+                                    val indexOfReference1 = lithoInstructions.indexOfFirst {
+                                        it.opcode == Opcode.INVOKE_STATIC_RANGE
+                                    }
+                                    val descriptor1 =
+                                        lithoInstructions.elementAt(indexOfReference1).toDescriptor<MethodReference>()
+                                    val descriptor2 = lithoInstructions.elementAt(indexOfReference1 + 2)
+                                        .toDescriptor<FieldReference>()
+
+                                    // create label
+                                    val lithoRemoveLabel = lithoMethodImplementation.newLabelForIndex(0)
+
+                                    // create branch instructions
+                                    val ifEqzFirstInstruction =
+                                        BuilderInstruction21t(Opcode.IF_EQZ, 0, lithoRemoveLabel)
+                                    val ifEqzSecondInstruction =
+                                        BuilderInstruction21t(Opcode.IF_EQZ, 1, lithoRemoveLabel)
+
+                                    // create blocks
+                                    val block1 = """
+                                        invoke-static/range {p3}, $thisType->getTemplateName($templateNameParameterType)Ljava/lang/String;
+                                        move-result-object v0
+                                    """.trimIndent().toInstructions(lithoMethod)
+                                    val block2 = """
+                                        move-object/from16 v1, p3
+                                        iget-object v2, v1, $templateNameParameterType->b:Ljava/nio/ByteBuffer;
+                                        invoke-static {v0, v2}, Lapp/revanced/integrations/patches/GeneralBytecodeAdsPatch;->containsAd(Ljava/lang/String;Ljava/nio/ByteBuffer;)Z
+                                        move-result v1
+                                    """.trimIndent().toInstructions(lithoMethod)
+                                    val block3 = """
+                                        move-object/from16 v2, p1
+                                        invoke-static {v2}, $descriptor1
+                                        move-result-object v0
+                                        iget-object v0, v0, $descriptor2
+                                        return-object v0
+                                    """.trimIndent().toInstructions(lithoMethod)
+
+                                    // insert blocks and branch instructions
+                                    lithoMethodImplementation.insertBlocks(
+                                        0,
+                                        block1,
+                                        listOf(ifEqzFirstInstruction),
+                                        block2,
+                                        listOf(ifEqzSecondInstruction),
+                                        block3,
+                                    )
+                                }
+                            }
+
+                        }
+
+                        else -> return@forEachIndexed
+                    }
+                }
+            }
+        }
+        return PatchResultSuccess()
+    }
+
+    private fun getLithoMethod(mutableClass: MutableClass) = mutableClass.methods.firstOrNull {
+        it.implementation?.instructions?.any { instruction ->
+            instruction.opcode == Opcode.CONST && (instruction as Instruction31i).narrowLiteral == lithoConstant
+        } ?: false
+    }
+
+    private fun MutableClass.addGetIsEmptyMethod() {
+        val getIsEmptyImplementation = MutableMethodImplementation(1)
+
+        // create target instructions
+        val firstTargetInstruction = BuilderInstruction11n(Opcode.CONST_4, 0, 1)
+        val secondTargetInstruction = BuilderInstruction11n(Opcode.CONST_4, 0, 0)
+
+        // add instructions to the instruction list
+        getIsEmptyImplementation.addInstructions(
+            0, listOf(
+                // BuilderInstruction21t(Opcode.IF_EQZ, 0, first),
+                BuilderInstruction35c(
+                    Opcode.INVOKE_VIRTUAL,
+                    1,
+                    0,
+                    0,
+                    0,
+                    0,
+                    0,
+                    ImmutableMethodReference("Ljava/lang/String;", "isEmpty", null, "Z")
+                ),
+                BuilderInstruction11x(Opcode.MOVE_RESULT, 0),
+                // BuilderInstruction21t(Opcode.IF_EQZ, 0, second),
+                // BuilderInstruction10t(Opcode.GOTO, first),
+                secondTargetInstruction,
+                BuilderInstruction11x(Opcode.RETURN, 0),
+                firstTargetInstruction,
+                BuilderInstruction11x(Opcode.RETURN, 0),
+            )
+        )
+
+        val getIsEmptyInstructions = getIsEmptyImplementation.instructions
+
+        // create labels for the target instructions
+        val firstLabel =
+            getIsEmptyImplementation.newLabelForIndex(getIsEmptyInstructions.indexOf(firstTargetInstruction))
+        val secondLabel =
+            getIsEmptyImplementation.newLabelForIndex(getIsEmptyInstructions.indexOf(secondTargetInstruction))
+
+        // create branch instructions to the labels
+        val ifEqzFirstInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 0, firstLabel)
+        val ifEqzSecondInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 0, secondLabel)
+        val gotoInstruction = BuilderInstruction10t(Opcode.GOTO, firstLabel)
+
+        // insert remaining branch instructions, order of adding those instructions is important
+        getIsEmptyImplementation.addInstructions(
+            2, listOf(
+                ifEqzSecondInstruction, gotoInstruction
+            )
+        )
+        getIsEmptyImplementation.addInstruction(
+            0, ifEqzFirstInstruction
+        )
+
+        this.addMethod(
+            createMutableMethod(
+                this.type, "getIsEmpty", "Z", "Ljava/lang/String;", getIsEmptyImplementation
+            )
+        )
+    }
+
+    private fun MutableClass.createGetTemplateNameMethod(lithoMethodImplementation: MethodImplementation): MutableMethod {
+        var counter = 1
+        val descriptors = buildList {
+            for (instruction in lithoMethodImplementation.instructions) {
+                if (instruction !is ReferenceInstruction) continue
+                if (counter++ > 4) break
+
+                add(instruction.toDescriptor<MethodReference>())
+            }
+        }
+
+        val getTemplateNameImplementation = MutableMethodImplementation(2)
+
+        // create code blocks
+        val block1 = """
+            invoke-virtual {p0}, ${descriptors[0]}
+            move-result-object p0
+            const v0, $lithoConstant
+            invoke-static {p0, v0}, ${descriptors[1]}
+            move-result-object p0
+        """.trimIndent().toInstructions()
+        val block2 = """
+              invoke-static {p0}, ${descriptors[2]}
+              move-result-object p0
+              invoke-virtual {p0}, ${descriptors[3]}
+              move-result-object v0
+              invoke-static {v0}, ${this.type}->getIsEmpty(Ljava/lang/String;)Z
+              move-result v0
+        """.trimIndent().toInstructions()
+        val block3 = """
+              invoke-virtual {p0}, ${descriptors[3]}
+              move-result-object p0
+              return-object p0
+        """.trimIndent().toInstructions()
+
+        // create target instruction
+        val targetInstruction = BuilderInstruction11n(Opcode.CONST_4, 1, 0)
+        // and remaining instruction
+        val returnInstruction = BuilderInstruction11x(Opcode.RETURN_OBJECT, 1)
+
+        // insert blocks and instructions
+        getTemplateNameImplementation.insertBlocks(
+            0,
+            block1,
+            block2,
+            block3,
+            listOf(
+                targetInstruction, returnInstruction
+            ),
+        )
+
+        // create label for target instruction
+        val targetInstructionLabel =
+            getTemplateNameImplementation.newLabelForIndex(getTemplateNameImplementation.instructions.size - 2)
+
+        // create branch instructions to the label
+        val ifEqzInstruction = BuilderInstruction21t(Opcode.IF_EQZ, 1, targetInstructionLabel)
+        val ifNezInstruction = BuilderInstruction21t(Opcode.IF_NEZ, 0, targetInstructionLabel)
+
+        // insert branch instructions
+        getTemplateNameImplementation.addInstruction(
+            block1.size, ifEqzInstruction
+        )
+        getTemplateNameImplementation.addInstruction(
+            block1.size + block2.size + 1, ifNezInstruction
+        )
+
+        // create the method
+        return createMutableMethod(
+            this.type,
+            "getTemplateName",
+            "Ljava/lang/String;",
+            descriptors[0].split("->")[0], // a bit weird to get the type this way,
+            getTemplateNameImplementation
+        )
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/utils/MethodUtils.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.youtube.ad.general.bytecode.utils
+
+import app.revanced.patcher.extensions.or
+import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod.Companion.toMutable
+import org.jf.dexlib2.AccessFlags
+import org.jf.dexlib2.iface.MethodImplementation
+import org.jf.dexlib2.immutable.ImmutableMethod
+import org.jf.dexlib2.immutable.ImmutableMethodParameter
+
+internal object MethodUtils {
+    internal fun createMutableMethod(
+        definingClass: String, name: String, returnType: String, parameter: String, implementation: MethodImplementation
+    ) = ImmutableMethod(
+        definingClass, name, listOf(
+            ImmutableMethodParameter(
+                parameter, null, null
+            )
+        ), returnType, AccessFlags.PRIVATE or AccessFlags.STATIC, null, null, implementation
+    ).toMutable()
+}

src/main/kotlin/app/revanced/patches/youtube/ad/general/resource/patch/GeneralResourceAdsPatch.kt

@@ -0,0 +1,60 @@
+package app.revanced.patches.youtube.ad.general.resource.patch
+
+import app.revanced.extensions.doRecursively
+import app.revanced.extensions.startsWithAny
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.implementation.ResourceData
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.implementation.ResourcePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patches.youtube.ad.general.annotation.GeneralAdsCompatibility
+import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
+import org.w3c.dom.Element
+
+@Dependencies(dependencies = [FixLocaleConfigErrorPatch::class])
+@Name("general-resource-ads")
+@Description("Patch to remove general ads in resources.")
+@GeneralAdsCompatibility
+@Version("0.0.1")
+class GeneralResourceAdsPatch : ResourcePatch() {
+    // list of resource file names which need to be hidden
+    private val resourceFileNames = arrayOf(
+        "compact_promoted_video_item.xml",
+        "inline_muted_metadata_swap.xml",
+        "interstitial_promo_view.xml",
+        "pip_ad_overlay.xml",
+        "promoted_",
+        "watch_metadata_companion_cards.xml",
+        //"watch_while_activity.xml" // FIXME: find out why patching this resource fails
+    )
+
+    // the attributes to change the value of
+    private val replacements = arrayOf(
+        "height",
+        "width",
+        "marginTop",
+    )
+
+    override fun execute(data: ResourceData): PatchResult {
+        data.forEach {
+            if (!it.name.startsWithAny(*resourceFileNames)) return@forEach
+
+            // for each file in the "layouts" directory replace all necessary attributes content
+            data.getXmlEditor(it.absolutePath).use { editor ->
+                editor.file.doRecursively { node ->
+                    replacements.forEach replacement@{ replacement ->
+                        if (node !is Element) return@replacement
+
+                        node.getAttributeNode("android:layout_$replacement")?.let { attribute ->
+                            attribute.textContent = "1.0dip"
+                        }
+                    }
+                }
+            }
+        }
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/ad/home/patch/PromotionsPatch.kt

@@ -1,65 +0,0 @@
-package app.revanced.patches.youtube.ad.home.patch
-
-import app.revanced.extensions.injectHideCall
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
-import app.revanced.patcher.data.implementation.toMethodWalker
-import app.revanced.patcher.extensions.PatchExtensions.patchName
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.patch.implementation.BytecodePatch
-import app.revanced.patcher.patch.implementation.misc.PatchResult
-import app.revanced.patcher.patch.implementation.misc.PatchResultError
-import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.signature.implementation.method.MethodSignature
-import app.revanced.patcher.signature.implementation.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
-import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
-import app.revanced.patches.youtube.ad.home.annotation.PromotionsCompatibility
-import app.revanced.patches.youtube.ad.home.signatures.PromotedDiscoveryActionParentSignature
-import app.revanced.patches.youtube.ad.home.signatures.PromotedDiscoveryAppParentSignature
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.formats.Instruction11x
-
-//@Patch(dependencies = [IntegrationsPatch::class])
-@Name("home-promo-ads")
-@Description("Patch to remove promoted ads in YouTube.")
-@PromotionsCompatibility
-@Version("0.0.1")
-class PromotionsPatch : BytecodePatch(
-    listOf(
-        PromotedDiscoveryAppParentSignature, PromotedDiscoveryActionParentSignature
-    )
-) {
-    override fun execute(data: BytecodeData): PatchResult {
-        for (signature in signatures) {
-            val result = signature.result!!
-
-            val requiredMethod =
-                result.findParentMethod(@Name("promotion-ads-signature") @MatchingMethod(name = "d") @DirectPatternScanMethod @PromotionsCompatibility @Version(
-                    "0.0.1"
-                ) object : MethodSignature(
-                    "V", AccessFlags.PRIVATE or AccessFlags.FINAL, listOf("Z", "Z"), null
-                ) {}) ?: return PatchResultError("Required parent method could not be found.")
-
-            val toBePatchedInvokeOffset =
-                requiredMethod.immutableMethod.implementation!!.instructions.indexOfFirst { it.opcode == Opcode.INVOKE_DIRECT }
-            val toBePatchedMethod =
-                data.toMethodWalker(requiredMethod.immutableMethod).nextMethod(toBePatchedInvokeOffset, true)
-                    .getMethod() as MutableMethod
-
-            val implementation = toBePatchedMethod.implementation!!
-            val invokeVirtualOffset = implementation.instructions.indexOfFirst { it.opcode == Opcode.INVOKE_VIRTUAL }
-
-            val moveResultInstruction = implementation.instructions[invokeVirtualOffset + 1]
-            if (moveResultInstruction.opcode != Opcode.MOVE_RESULT_OBJECT) return PatchResultError("The toBePatchedInvokeOffset offset was wrong in ${this.javaClass.patchName}")
-
-            val register = (moveResultInstruction as Instruction11x).registerA
-            implementation.injectHideCall(invokeVirtualOffset + 2, register)
-        }
-
-        return PatchResultSuccess()
-    }
-}

src/main/kotlin/app/revanced/patches/youtube/ad/home/signatures/PromotedDiscoveryActionParentSignature.kt

@@ -1,58 +0,0 @@
-package app.revanced.patches.youtube.ad.home.signatures
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
-import app.revanced.patches.youtube.ad.home.annotation.PromotionsCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("promoted-discovery-app-parent-signature")
-@MatchingMethod(
-    "Ljqb;", "lG"
-)
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@PromotionsCompatibility
-@Version("0.0.1")
-object PromotedDiscoveryActionParentSignature : MethodSignature(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.BRIDGE or AccessFlags.SYNTHETIC,
-    listOf("L", "L"),
-    listOf(
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.CHECK_CAST,
-        Opcode.INVOKE_VIRTUAL_RANGE,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_BOOLEAN,
-        Opcode.CONST_4,
-        Opcode.XOR_INT_2ADDR,
-        Opcode.IGET_BOOLEAN,
-        Opcode.INVOKE_DIRECT,
-        Opcode.IGET_BOOLEAN,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.CONST_4,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT
-    )
-)

src/main/kotlin/app/revanced/patches/youtube/ad/home/signatures/PromotedDiscoveryAppParentSignature.kt

@@ -1,61 +0,0 @@
-package app.revanced.patches.youtube.ad.home.signatures
-
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.extensions.or
-import app.revanced.patcher.signature.implementation.method.MethodSignature
-import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
-import app.revanced.patches.youtube.ad.home.annotation.PromotionsCompatibility
-import org.jf.dexlib2.AccessFlags
-import org.jf.dexlib2.Opcode
-
-@Name("promoted-discovery-action-parent-signature")
-@MatchingMethod(
-    "Ljqj;",
-    "lG"
-)
-@FuzzyPatternScanMethod(2) // FIXME: Test this threshold and find the best value.
-@PromotionsCompatibility
-@Version("0.0.1")
-
-object PromotedDiscoveryAppParentSignature : MethodSignature(
-    "V",
-    AccessFlags.PUBLIC or AccessFlags.FINAL or AccessFlags.BRIDGE or AccessFlags.SYNTHETIC,
-    listOf("L", "L"),
-    listOf(
-        Opcode.INVOKE_DIRECT,
-        Opcode.IGET_BOOLEAN,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.SGET_OBJECT,
-        Opcode.IPUT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.IF_NEZ,
-        Opcode.IGET_OBJECT,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.NEW_ARRAY,
-        Opcode.IPUT_OBJECT,
-        Opcode.CONST_4,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT,
-        Opcode.IF_GE,
-        Opcode.IGET_OBJECT,
-        Opcode.INVOKE_INTERFACE,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.CHECK_CAST,
-        Opcode.APUT_OBJECT,
-        Opcode.ADD_INT_LIT8,
-        Opcode.GOTO
-    )
-)

src/main/kotlin/app/revanced/patches/youtube/ad/video/annotations/VideoAdsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/ad/video/patch/VideoAdsPatch.kt

@@ -6,6 +6,7 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.or
+import app.revanced.patcher.patch.annotations.Dependencies
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
@@ -14,13 +15,13 @@ import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
 import app.revanced.patcher.signature.implementation.method.MethodSignature
 import app.revanced.patcher.signature.implementation.method.annotation.DirectPatternScanMethod
 import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
-import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.ad.video.annotations.VideoAdsCompatibility
 import app.revanced.patches.youtube.ad.video.signatures.ShowVideoAdsConstructorSignature
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import org.jf.dexlib2.AccessFlags
 
-@Patch(dependencies = [IntegrationsPatch::class])
+@Patch
+@Dependencies(dependencies = [IntegrationsPatch::class])
 @Name("video-ads")
 @Description("Patch to remove ads in the YouTube video player.")
 @VideoAdsCompatibility
@@ -32,18 +33,18 @@ class VideoAdsPatch : BytecodePatch(
 ) {
     override fun execute(data: BytecodeData): PatchResult {
         val result =
-            signatures.first().result!!.findParentMethod(@Name("show-video-ads-method-signature") @MatchingMethod(
+            ShowVideoAdsConstructorSignature.result!!.findParentMethod(@Name("show-video-ads-method-signature") @MatchingMethod(
                 definingClass = "zai"
             ) @DirectPatternScanMethod @VideoAdsCompatibility @Version("0.0.1") object : MethodSignature(
                 "V", AccessFlags.PUBLIC or AccessFlags.FINAL, listOf("Z"), null
             ) {}) ?: return PatchResultError("Required parent method could not be found.")
 
         // Override the parameter by calling shouldShowAds and setting the parameter to the result
-        result.method.implementation!!.addInstructions(
+        result.method.addInstructions(
             0, """
-                invoke-static { }, Lfi/vanced/libraries/youtube/whitelisting/Whitelist;->shouldShowAds()Z
+                invoke-static { }, Lapp/revanced/integrations/patches/VideoAdsPatch;->shouldShowAds()Z
                 move-result v1
-            """.trimIndent().toInstructions()
+            """
         )
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/annotation/SeekbarTappingCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/patch/EnableSeekbarTappingPatch.kt

@@ -5,12 +5,12 @@ import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.annotations.Dependencies
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultError
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.interaction.seekbar.annotation.SeekbarTappingCompatibility
 import app.revanced.patches.youtube.interaction.seekbar.signatures.SeekbarTappingParentSignature
 import app.revanced.patches.youtube.interaction.seekbar.signatures.SeekbarTappingSignature
@@ -21,8 +21,8 @@ import org.jf.dexlib2.iface.Method
 import org.jf.dexlib2.iface.instruction.formats.Instruction11n
 import org.jf.dexlib2.iface.instruction.formats.Instruction35c
 
-
+@Patch
-@Patch(dependencies = [IntegrationsPatch::class])
+@Dependencies(dependencies = [IntegrationsPatch::class])
 @Name("seekbar-tapping")
 @Description("Enable tapping on the seekbar of the YouTube player.")
 @SeekbarTappingCompatibility
@@ -33,7 +33,7 @@ class EnableSeekbarTappingPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        var result = signatures.first().result!!
+        var result = SeekbarTappingParentSignature.result!!
 
         val tapSeekMethods = mutableMapOf<String, Method>()
 
@@ -58,7 +58,7 @@ class EnableSeekbarTappingPatch : BytecodePatch(
         }
 
         // replace map because we dont need the upper one anymore
-        result = signatures.last().result!!
+        result = SeekbarTappingSignature.result!!
 
         val implementation = result.method.implementation!!
 
@@ -72,11 +72,11 @@ class EnableSeekbarTappingPatch : BytecodePatch(
         val register = (instruction as Instruction35c).registerC
 
         // the instructions are written in reverse order.
-        implementation.addInstructions(
+        result.method.addInstructions(
             result.scanResult.endIndex + 1, """
                invoke-virtual { v$register, v2 }, ${oMethod.definingClass}->${oMethod.name}(I)V
                invoke-virtual { v$register, v2 }, ${pMethod.definingClass}->${pMethod.name}(I)V
-            """.trimIndent().toInstructions()
+            """
         )
 
         // if tap-seeking is disabled, do not invoke the two methods above by jumping to the else label
@@ -84,11 +84,11 @@ class EnableSeekbarTappingPatch : BytecodePatch(
         implementation.addInstruction(
             result.scanResult.endIndex + 1, BuilderInstruction21t(Opcode.IF_EQZ, 0, elseLabel)
         )
-        implementation.addInstructions(
+        result.method.addInstructions(
             result.scanResult.endIndex + 1, """
-                invoke-static { }, Lfi/razerman/youtube/preferences/BooleanPreferences;->isTapSeekingEnabled()Z
+                invoke-static { }, Lapp/revanced/integrations/patches/SeekbarTappingPatch;->isTapSeekingEnabled()Z
                 move-result v0
-            """.trimIndent().toInstructions()
+            """
         )
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/youtube/layout/amoled/annotations/AmoledCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/amoled/patch/AmoledPatch.kt

@@ -4,6 +4,7 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.ResourceData
+import app.revanced.patcher.patch.annotations.Dependencies
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.ResourcePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
@@ -13,7 +14,8 @@ import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatc
 import org.w3c.dom.Element
 import java.io.File
 
-@Patch(
+@Patch
+@Dependencies(
     dependencies = [
         FixLocaleConfigErrorPatch::class
     ]

src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/annotations/PremiumHeadingCompatibility.kt

@@ -1,14 +1,13 @@
-package app.revanced.patches.youtube.ad.home.annotation
+package app.revanced.patches.youtube.layout.branding.header.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.03.38", "17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf()
     )]
 )
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-internal annotation class PromotionsCompatibility
+internal annotation class PremiumHeadingCompatibility
-

src/main/kotlin/app/revanced/patches/youtube/layout/branding/header/patch/PremiumHeadingPatch.kt

@@ -0,0 +1,47 @@
+package app.revanced.patches.youtube.layout.branding.header.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.implementation.ResourceData
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.implementation.ResourcePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.implementation.misc.PatchResultError
+import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patches.youtube.layout.branding.header.annotations.PremiumHeadingCompatibility
+import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
+import java.nio.file.Files
+import java.nio.file.StandardCopyOption
+
+@Patch
+@Dependencies(
+    dependencies = [FixLocaleConfigErrorPatch::class]
+)
+@Name("premium-heading")
+@Description("Show the premium branding on the the YouTube home screen.")
+@PremiumHeadingCompatibility
+@Version("0.0.1")
+class PremiumHeadingPatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        val resDirectory = data.get("res")
+        if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
+
+        val (original, replacement) = "yt_premium_wordmark_header" to "yt_wordmark_header"
+        val modes = arrayOf("light", "dark")
+
+        arrayOf("xxxhdpi", "xxhdpi", "xhdpi", "hdpi", "mdpi").forEach { size ->
+            val headingDirectory = resDirectory.resolve("drawable-$size")
+            modes.forEach {mode ->
+                Files.copy(
+                    headingDirectory.resolve("${original}_$mode.png").toPath(),
+                    headingDirectory.resolve("${replacement}_$mode.png").toPath(),
+                    StandardCopyOption.REPLACE_EXISTING
+                )
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/annotations/CustomBrandingCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.branding.icon.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf()
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class CustomBrandingCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/branding/icon/patch/CustomBrandingPatch.kt

@@ -0,0 +1,56 @@
+package app.revanced.patches.youtube.layout.branding.icon.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.implementation.ResourceData
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.implementation.ResourcePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.implementation.misc.PatchResultError
+import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patches.youtube.layout.branding.icon.annotations.CustomBrandingCompatibility
+import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
+import java.nio.file.Files
+
+@Patch
+@Dependencies(
+    dependencies = [FixLocaleConfigErrorPatch::class]
+)
+@Name("custom-branding")
+@Description("Change the branding of YouTube.")
+@CustomBrandingCompatibility
+@Version("0.0.1")
+class CustomBrandingPatch : ResourcePatch() {
+    override fun execute(data: ResourceData): PatchResult {
+        val resDirectory = data.get("res")
+        if (!resDirectory.isDirectory) return PatchResultError("The res folder can not be found.")
+
+        val iconNames = arrayOf(
+            "adaptiveproduct_youtube_background_color_108",
+            "adaptiveproduct_youtube_foreground_color_108",
+            "ic_launcher",
+            "ic_launcher_round"
+        )
+
+        mapOf(
+            "xxxhdpi" to 192,
+            "xxhdpi" to 144,
+            "xhdpi" to 96,
+            "hdpi" to 72,
+            "mdpi" to 48
+        ).forEach { (iconDirectory, size) ->
+            iconNames.forEach iconLoop@{ iconName ->
+                val iconFile = this.javaClass.classLoader.getResourceAsStream("branding/$size/$iconName.png")
+                    ?: return PatchResultError("The icon $iconName can not be found.")
+
+                Files.write(
+                    resDirectory.resolve("mipmap-$iconDirectory").resolve("$iconName.png").toPath(), iconFile.readAllBytes()
+                )
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/annotations/CastPatchCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.castbutton.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf()
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class CastButtonCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/castbutton/patch/HideCastButtonPatch.kt

@@ -0,0 +1,43 @@
+package app.revanced.patches.youtube.layout.castbutton.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.implementation.proxy
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patches.youtube.layout.castbutton.annotations.CastButtonCompatibility
+import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+
+@Patch
+@Dependencies(dependencies = [IntegrationsPatch::class])
+@Name("hide-cast-button")
+@Description("Patch to hide the cast button.")
+@CastButtonCompatibility
+@Version("0.0.1")
+class HideCastButtonPatch : BytecodePatch(listOf()) {
+    override fun execute(data: BytecodeData): PatchResult {
+        data.classes.forEach { classDef ->
+            classDef.methods.forEach { method ->
+                if (classDef.type.endsWith("MediaRouteButton;") && method.name == "setVisibility") {
+                    val setVisibilityMethod =
+                        data.proxy(classDef).resolve().methods.first { it.name == "setVisibility" }
+
+                    setVisibilityMethod.addInstructions(
+                        0, """
+                            invoke-static {p1}, Lapp/revanced/integrations/patches/HideCastButtonPatch;->getCastButtonOverrideV2(I)I
+                            move-result p1
+                        """
+                    )
+                }
+            }
+        }
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/annotations/CreateButtonCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/patch/CreateButtonRemoverPatch.kt

@@ -4,19 +4,25 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.patch.annotations.Dependencies
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultError
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.youtube.layout.createbutton.annotations.CreateButtonCompatibility
 import app.revanced.patches.youtube.layout.createbutton.signatures.CreateButtonSignature
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
+import app.revanced.patches.youtube.misc.mapping.patch.ResourceIdMappingProviderResourcePatch
 import org.jf.dexlib2.Opcode
-import org.jf.dexlib2.iface.instruction.formats.Instruction35c
+import org.jf.dexlib2.iface.instruction.OneRegisterInstruction
+import org.jf.dexlib2.iface.instruction.ReferenceInstruction
+import org.jf.dexlib2.iface.instruction.WideLiteralInstruction
+import org.jf.dexlib2.iface.reference.MethodReference
 
-@Patch(dependencies = [IntegrationsPatch::class])
+@Patch
+@Dependencies(dependencies = [IntegrationsPatch::class, ResourceIdMappingProviderResourcePatch::class])
 @Name("disable-create-button")
 @Description("Disable the create button.")
 @CreateButtonCompatibility
@@ -27,21 +33,31 @@ class CreateButtonRemoverPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = signatures.first().result!!
+        val result = CreateButtonSignature.result!!
 
         // Get the required register which holds the view object we need to pass to the method hideCreateButton
         val implementation = result.method.implementation!!
-        val instruction = implementation.instructions[result.scanResult.endIndex + 1]
+
-        if (instruction.opcode != Opcode.INVOKE_STATIC)
+        val imageOnlyLayout = ResourceIdMappingProviderResourcePatch.resourceMappings["image_only_tab"]
-            return PatchResultError("Could not find the correct register")
+            ?: return PatchResultError("Required resource could not be found in the map")
-        val register = (instruction as Instruction35c).registerC
+
+        val imageOnlyLayoutConstIndex =
+            implementation.instructions.indexOfFirst { (it as? WideLiteralInstruction)?.wideLiteral == imageOnlyLayout }
+
+        val (instructionIndex, instruction) = implementation.instructions.drop(imageOnlyLayoutConstIndex).withIndex()
+            .first { (((it.value as? ReferenceInstruction)?.reference) as? MethodReference)?.definingClass?.contains("PivotBar") ?: false }
+
+        if (instruction.opcode != Opcode.INVOKE_VIRTUAL) return PatchResultError("Could not find the correct instruction")
+
+        val moveResultIndex = imageOnlyLayoutConstIndex + instructionIndex + 1
+        val moveResultInstruction = implementation.instructions[moveResultIndex] as OneRegisterInstruction
 
         // Hide the button view via proxy by passing it to the hideCreateButton method
-        implementation.addInstruction(
+        result.method.addInstruction(
-            result.scanResult.endIndex + 1,
+            moveResultIndex + 1,
-            "invoke-static { v$register }, Lfi/razerman/youtube/XAdRemover;->hideCreateButton(Landroid/view/View;)V".toInstruction()
+            "invoke-static { v${moveResultInstruction.registerA} }, Lapp/revanced/integrations/patches/HideCreateButtonPatch;->hideCreateButton(Landroid/view/View;)V"
         )
 
         return PatchResultSuccess()
     }
-}
+}

src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/annotations/FullscreenPanelsCompatibility.kt

@@ -0,0 +1,13 @@
+package app.revanced.patches.youtube.layout.fullscreenpanels.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [Package(
+        "com.google.android.youtube", arrayOf("17.23.35", "17.23.36", "17.24.34","17.24.35")
+    )]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class FullscreenPanelsCompatibility

src/main/kotlin/app/revanced/patches/youtube/layout/fullscreenpanels/patch/FullscreenPanelsRemoverPatch.kt

@@ -0,0 +1,36 @@
+package app.revanced.patches.youtube.layout.fullscreenpanels.patch
+
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.data.implementation.proxy
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patcher.patch.implementation.BytecodePatch
+import app.revanced.patcher.patch.implementation.misc.PatchResult
+import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
+import app.revanced.patches.youtube.layout.fullscreenpanels.annotations.FullscreenPanelsCompatibility
+
+@Patch
+@Name("disable-fullscreen-panels")
+@Description("Disable comments panel in fullscreen view.")
+@FullscreenPanelsCompatibility
+@Version("0.0.1")
+class FullscreenPanelsRemovalPatch : BytecodePatch(listOf()) {
+    override fun execute(data: BytecodeData): PatchResult {
+        val classDef = data.classes.first { it.type.endsWith("FullscreenEngagementPanelOverlay;") }
+        val method = data.proxy(classDef).resolve().methods.first { it.name == "<init>" }
+        val implementation = method.implementation!!
+
+        method.addInstructions(
+            implementation.instructions.count() - 1,
+            """
+			 const/4 v1, 0x0
+             iput-boolean v1, v0, ${classDef.type}->a:Z
+       		"""
+        )
+
+        return PatchResultSuccess()
+    }
+}

src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/annotations/MinimizedPlaybackCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/minimizedplayback/patch/MinimizedPlaybackPatch.kt

@@ -3,13 +3,12 @@ package app.revanced.patches.youtube.layout.minimizedplayback.patch
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.implementation.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.data.implementation.BytecodeData
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.layout.minimizedplayback.annotations.MinimizedPlaybackCompatibility
 import app.revanced.patches.youtube.layout.minimizedplayback.signatures.MinimizedPlaybackManagerSignature
 
@@ -27,11 +26,11 @@ class MinimizedPlaybackPatch : BytecodePatch(
     override fun execute(data: BytecodeData): PatchResult {
         // Instead of removing all instructions like Vanced,
         // we return the method at the beginning instead
-        signatures.first().result!!.method.implementation!!.addInstructions(
+        MinimizedPlaybackManagerSignature.result!!.method.addInstructions(
             0, """
                 const/4 v0, 0x1
                 return v0
-                """.trimIndent().toInstructions()
+                """
         )
         return PatchResultSuccess()
     }

src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/annotations/OldQualityLayoutCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/oldqualitylayout/patch/OldQualityLayoutPatch.kt

@@ -6,6 +6,7 @@ import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.BytecodeData
 import app.revanced.patcher.extensions.addInstructions
 import app.revanced.patcher.extensions.or
+import app.revanced.patcher.patch.annotations.Dependencies
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
@@ -14,7 +15,6 @@ import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
 import app.revanced.patcher.signature.implementation.method.MethodSignature
 import app.revanced.patcher.signature.implementation.method.annotation.FuzzyPatternScanMethod
 import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
-import app.revanced.patcher.util.smali.toInstructions
 import app.revanced.patches.youtube.layout.oldqualitylayout.annotations.OldQualityLayoutCompatibility
 import app.revanced.patches.youtube.layout.oldqualitylayout.signatures.OldQualityParentSignature
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
@@ -22,7 +22,8 @@ import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.instruction.BuilderInstruction21t
 
-@Patch(dependencies = [IntegrationsPatch::class])
+@Patch
+@Dependencies(dependencies = [IntegrationsPatch::class])
 @Name("old-quality-layout")
 @Description("Enable the original quality flyout menu.")
 @OldQualityLayoutCompatibility
@@ -33,7 +34,7 @@ class OldQualityLayoutPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = signatures.first().result!!.findParentMethod(@Name("old-quality-signature") @MatchingMethod(
+        val result = OldQualityParentSignature.result!!.findParentMethod(@Name("old-quality-signature") @MatchingMethod(
             definingClass = "Libh"
         ) @FuzzyPatternScanMethod(2) @OldQualityLayoutCompatibility @Version("0.0.1") object : MethodSignature(
             "L", AccessFlags.FINAL or AccessFlags.PRIVATE, listOf("Z"), listOf(
@@ -55,11 +56,11 @@ class OldQualityLayoutPatch : BytecodePatch(
             Opcode.IF_NEZ, 0, implementation.instructions[result.scanResult.endIndex].location.labels.first()
         )
         implementation.addInstruction(5, jmpInstruction)
-        implementation.addInstructions(
+        result.method.addInstructions(
             0, """
-                invoke-static { }, Lfi/razerman/youtube/XGlobals;->useOldStyleQualitySettings()Z
+                invoke-static { }, Lapp/revanced/integrations/patches/OldStyleQualityPatch;->useOldStyleQualitySettings()Z
                 move-result v0
-            """.trimIndent().toInstructions()
+            """
         )
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/layout/reels/annotations/HideReelsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.23.35", "17.23.36", "17.24.34","17.24.35")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/reels/patch/HideReelsPatch.kt

@@ -4,14 +4,14 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.extensions.addInstruction
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.youtube.layout.reels.annotations.HideReelsCompatibility
 import app.revanced.patches.youtube.layout.reels.signatures.HideReelsSignature
 
-//@Patch TODO: converted to litho
+//@Patch TODO: this is currently in the general-bytecode-ads patch due to the integrations having a preference for including reels or not. Move it here.
 @Name("hide-reels")
 @Description("Hide reels on the page.")
 @HideReelsCompatibility
@@ -22,14 +22,13 @@ class HideReelsPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result = signatures.first().result!!
+        val result = HideReelsSignature.result!!
-        val implementation = result.method.implementation!!
 
         // HideReel will hide the reel view before it is being used,
         // so we pass the view to the HideReel method
-        implementation.addInstruction(
+        result.method.addInstruction(
             result.scanResult.endIndex,
-            "invoke-static { v2 }, Lfi/razerman/youtube/XAdRemover;->HideReel(Landroid/view/View;)V".toInstruction()
+            "invoke-static { v2 }, Lapp/revanced/integrations/patches/HideReelsPatch;->HideReel(Landroid/view/View;)V"
         )
 
         return PatchResultSuccess()

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/annotations/ShortsButtonCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/patch/ShortsButtonRemoverPatch.kt

@@ -4,19 +4,21 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.BytecodeData
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.patch.annotations.Dependencies
 import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patches.youtube.layout.shorts.button.annotations.ShortsButtonCompatibility
 import app.revanced.patches.youtube.layout.shorts.button.signatures.PivotBarButtonTabenumSignature
 import app.revanced.patches.youtube.layout.shorts.button.signatures.PivotBarButtonsViewSignature
 import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
 import org.jf.dexlib2.iface.instruction.formats.Instruction11x
 
-@Patch(dependencies = [IntegrationsPatch::class])
+@Patch
-@Name("shorts-button")
+@Dependencies(dependencies = [IntegrationsPatch::class])
+@Name("disable-shorts-button")
 @Description("Hide the shorts button.")
 @ShortsButtonCompatibility
 @Version("0.0.1")
@@ -26,29 +28,29 @@ class ShortsButtonRemoverPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        val result1 = signatures.first().result!!
+        val result1 = PivotBarButtonTabenumSignature.result!!
         val implementation1 = result1.method.implementation!!
         val moveEnumInstruction = implementation1.instructions[result1.scanResult.endIndex]
         val enumRegister = (moveEnumInstruction as Instruction11x).registerA
 
-        val result2 = signatures.last().result!!
+        val result2 = PivotBarButtonsViewSignature.result!!
         val implementation2 = result2.method.implementation!!
         val moveViewInstruction = implementation2.instructions[result2.scanResult.endIndex]
         val viewRegister = (moveViewInstruction as Instruction11x).registerA
 
         // Save the tab enum in XGlobals to avoid smali/register workarounds
-        implementation1.addInstruction(
+        result1.method.addInstruction(
             result1.scanResult.endIndex + 1,
-            "sput-object v$enumRegister, Lfi/razerman/youtube/XGlobals;->lastPivotTab:Ljava/lang/Enum;".toInstruction()
+            "sput-object v$enumRegister, Lapp/revanced/integrations/patches/HideShortsButtonPatch;->lastPivotTab:Ljava/lang/Enum;"
         )
 
         // Hide the button view via proxy by passing it to the hideShortsButton method
         // It only hides it if the last tab name is "TAB_SHORTS"
-        implementation2.addInstruction(
+        result2.method.addInstruction(
             result2.scanResult.endIndex + 2,
-            "invoke-static { v$viewRegister }, Lfi/razerman/youtube/XAdRemover;->hideShortsButton(Landroid/view/View;)V".toInstruction()
+            "invoke-static { v$viewRegister }, Lapp/revanced/integrations/patches/HideShortsButtonPatch;->hideShortsButton(Landroid/view/View;)V"
         )
 
         return PatchResultSuccess()
     }
-}
+}

src/main/kotlin/app/revanced/patches/youtube/layout/shorts/button/signatures/PivotBarButtonTabenumSignature.kt

@@ -42,4 +42,4 @@ object PivotBarButtonTabenumSignature : MethodSignature(
         Opcode.INVOKE_STATIC, // SomeEnum.fromValue(tabOrdinal)
         Opcode.MOVE_RESULT_OBJECT
     )
-)
+)

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/annotations/IntegrationsCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.03.38", "17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.03.38", "17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/integrations/patch/IntegrationsPatch.kt

@@ -28,19 +28,19 @@ class IntegrationsPatch : BytecodePatch(
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        if (data.findClass("Lapp/revanced/integrations/Globals") == null)
+        if (data.findClass("Lapp/revanced/integrations/utils/Globals") == null)
             return PatchResultError("Integrations have not been merged yet. This patch can not succeed without the integrations.")
 
-        val result = signatures.first().result!!
+        val result = InitSignature.result!!
 
         val implementation = result.method.implementation!!
         val count = implementation.registerCount - 1
 
-        implementation.addInstructions(
+        result.method.addInstructions(
             result.scanResult.endIndex + 1, """
-                  invoke-static {v$count}, Lpl/jakubweg/StringRef;->setContext(Landroid/content/Context;)V
+                  invoke-static {v$count}, Lapp/revanced/integrations/sponsorblock/StringRef;->setContext(Landroid/content/Context;)V
-                  sput-object v$count, Lapp/revanced/integrations/Globals;->context:Landroid/content/Context;
+                  sput-object v$count, Lapp/revanced/integrations/utils/Globals;->context:Landroid/content/Context;
-            """.trimIndent().toInstructions()
+            """
         )
 
         val classDef = result.definingClassProxy.resolve()
@@ -55,7 +55,7 @@ class IntegrationsPatch : BytecodePatch(
                 null,
                 ImmutableMethodImplementation(
                     1, """
-                        invoke-static { }, Lapp/revanced/integrations/Globals;->getAppContext()Landroid/content/Context;
+                        invoke-static { }, Lapp/revanced/integrations/utils/Globals;->getAppContext()Landroid/content/Context;
                         move-result-object v0
                         return-object v0
                     """.trimIndent().toInstructions(), null, null

src/main/kotlin/app/revanced/patches/youtube/misc/manifest/annotations/FixLocaleConfigErrorCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.17.34", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/mapping/patch/ResourceIdMappingProviderResourcePatch.kt

@@ -11,7 +11,7 @@ import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
 import org.w3c.dom.Element
 
 @Name("resource-id-mapping-provider-resource-patch-dependency")
-@Description("This patch works as a acts as a provider for resources mapped to their ids.")
+@Description("This patch acts as a provider/ dependency for resource mappings.")
 @Version("0.0.1")
 class ResourceIdMappingProviderResourcePatch : ResourcePatch() {
     companion object {

src/main/kotlin/app/revanced/patches/youtube/misc/microg/annotations/MicroGPatchCompatibility.kt

@@ -5,7 +5,7 @@ import app.revanced.patcher.annotation.Package
 
 @Compatibility(
     [Package(
-        "com.google.android.youtube", arrayOf("17.14.35", "17.19.36")
+        "com.google.android.youtube", arrayOf("17.14.35", "17.19.36", "17.20.37", "17.22.36", "17.23.35", "17.23.36", "17.24.34","17.24.35")
     )]
 )
 @Target(AnnotationTarget.CLASS)

src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/bytecode/MicroGBytecodePatch.kt

@@ -1,32 +1,28 @@
 package app.revanced.patches.youtube.misc.microg.patch.bytecode
 
-import app.revanced.extensions.containsAny
+import app.revanced.extensions.equalsAny
-import app.revanced.extensions.startsWithAny
 import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.BytecodeData
 import app.revanced.patcher.data.implementation.proxy
 import app.revanced.patcher.extensions.addInstructions
-import app.revanced.patcher.extensions.or
+import app.revanced.patcher.patch.annotations.Dependencies
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.BytecodePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
-import app.revanced.patcher.signature.implementation.method.MethodSignature
-import app.revanced.patcher.signature.implementation.method.annotation.DirectPatternScanMethod
-import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
 import app.revanced.patcher.util.proxy.mutableTypes.MutableClass
 import app.revanced.patcher.util.smali.toInstruction
 import app.revanced.patcher.util.smali.toInstructions
+import app.revanced.patches.youtube.layout.castbutton.patch.HideCastButtonPatch
+import app.revanced.patches.youtube.misc.manifest.patch.FixLocaleConfigErrorPatch
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
+import app.revanced.patches.youtube.misc.microg.patch.resource.MicroGResourcePatch
 import app.revanced.patches.youtube.misc.microg.patch.resource.enum.StringReplaceMode
 import app.revanced.patches.youtube.misc.microg.shared.Constants.BASE_MICROG_PACKAGE_NAME
 import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_PACKAGE_NAME
-import app.revanced.patches.youtube.misc.microg.signatures.GooglePlayUtilitySignature
+import app.revanced.patches.youtube.misc.microg.signatures.*
-import app.revanced.patches.youtube.misc.microg.signatures.IntegrityCheckSignature
-import app.revanced.patches.youtube.misc.microg.signatures.PrimeSignature
-import app.revanced.patches.youtube.misc.microg.signatures.ServiceCheckSignature
-import org.jf.dexlib2.AccessFlags
 import org.jf.dexlib2.Opcode
 import org.jf.dexlib2.builder.MutableMethodImplementation
 import org.jf.dexlib2.builder.instruction.BuilderInstruction21c
@@ -34,19 +30,31 @@ import org.jf.dexlib2.iface.instruction.formats.Instruction21c
 import org.jf.dexlib2.iface.reference.StringReference
 import org.jf.dexlib2.immutable.reference.ImmutableStringReference
 
-// @Patch TODO: finish patch
+@Patch
-@Name("microg-bytecode-patch")
+@Dependencies(
+    dependencies = [
+        MicroGResourcePatch::class,
+        HideCastButtonPatch::class,
+        FixLocaleConfigErrorPatch::class
+    ]
+)
+@Name("microg-support")
 @Description("Patch to allow YouTube ReVanced to run without root and under a different package name.")
 @MicroGPatchCompatibility
 @Version("0.0.1")
 class MicroGBytecodePatch : BytecodePatch(
     listOf(
-        IntegrityCheckSignature, ServiceCheckSignature, GooglePlayUtilitySignature, PrimeSignature
+        IntegrityCheckSignature,
+        ServiceCheckSignature,
+        GooglePlayUtilitySignature,
+        CastDynamiteModuleSignature,
+        CastDynamiteModuleV2Signature,
+        CastContextFetchSignature,
+        PrimeSignature,
     )
 ) {
     override fun execute(data: BytecodeData): PatchResult {
-        // smali patches
+        disablePlayServiceChecksAndFixCastIssues()
-        disablePlayServiceChecks()
         data.classes.forEach { classDef ->
             var proxiedClass: MutableClass? = null
 
@@ -54,35 +62,37 @@ class MicroGBytecodePatch : BytecodePatch(
                 val implementation = method.implementation ?: return@methodLoop
 
                 var proxiedImplementation: MutableMethodImplementation? = null
+
                 implementation.instructions.forEachIndexed { i, instruction ->
                     if (instruction.opcode != Opcode.CONST_STRING) return@forEachIndexed
 
                     val stringValue = ((instruction as Instruction21c).reference as StringReference).string
 
-                    val replaceMode =
+                    val replaceMode = if (stringValue.equalsAny(
-                        if (stringValue == "com.google" || stringValue == "com.google.android.gms" ||
+                            "com.google.android.gms",
-                            stringValue.startsWithAny(
+                            "com.google.android.c2dm.intent.REGISTER",
-                                "com.google.iid",
+                            "com.google.android.c2dm.permission.SEND",
-                                "com.google.android.gms.chimera",
+                            "com.google.iid.TOKEN_REQUEST",
-                                "com.google.android.c2dm",
+                            "com.google",
-                            ) || stringValue.containsAny(
+                            "com.google.android.gms.auth.accounts",
-                                "com.google.android.gms.auth.accounts",
+                            "com.google.android.c2dm.intent.REGISTRATION",
-                                "com.google.android.gsf",
+                            "com.google.android.gsf.action.GET_GLS",
-                                "content://com.google.settings"
+                            "com.google.android.gsf.login",
-                            )
+                            "content://com.google.settings/partner",
-                        ) {
+                            "content://com.google.android.gsf.gservices",
-                            StringReplaceMode.REPLACE_WITH_MICROG
+                            "content://com.google.android.gsf.gservices/prefix",
-                        } else if (stringValue.startsWith("com.google.android.gms.chimera.container")) // https://github.com/TeamVanced/VancedMicroG/pull/139/file
+                            "com.google.android.c2dm.intent.RECEIVE"
-                            StringReplaceMode.DO_NOT_REPLACE
+                        )
-                        else if (stringValue.startsWithAny(
+                    ) {
-                                "com.google.android.youtube.SuggestionsProvider",
+                        StringReplaceMode.REPLACE_WITH_MICROG
-                                "com.google.android.youtube.fileprovider"
+                    } else if (stringValue.equalsAny(
-                            )
+                            "com.google.android.youtube.SuggestionsProvider", "com.google.android.youtube.fileprovider"
-                        ) {
+                        )
-                            StringReplaceMode.REPLACE_WITH_REVANCED
+                    ) {
-                        } else {
+                        StringReplaceMode.REPLACE_WITH_REVANCED
-                            StringReplaceMode.DO_NOT_REPLACE
+                    } else {
-                        }
+                        StringReplaceMode.DO_NOT_REPLACE
+                    }
 
                     if (replaceMode != StringReplaceMode.DO_NOT_REPLACE) {
                         if (proxiedClass == null) {
@@ -110,26 +120,19 @@ class MicroGBytecodePatch : BytecodePatch(
             }
         }
 
-
-        // replace string back
-        val implementation =
-            signatures.elementAt(2).result!!.findParentMethod(@Name("do-not-replace-method") @MatchingMethod(
-                "Llpe;", "c"
-            ) @DirectPatternScanMethod @MicroGPatchCompatibility @Version("0.0.1") object : MethodSignature(
-                "L", AccessFlags.PUBLIC or AccessFlags.STATIC, listOf("L"), null, listOf("com.google.android.gms")
-            ) {})!!.method.implementation!!
-
-        implementation.replaceInstruction(
-            implementation.instructions.indexOfFirst { it.opcode == Opcode.CONST_STRING },
-            "const-string v0, \"com.google.android.gms\"".toInstruction()
-        )
-
         return PatchResultSuccess()
     }
 
-    private fun disablePlayServiceChecks() {
+    private fun disablePlayServiceChecksAndFixCastIssues() {
-        for (i in 0 until signatures.count() - 1) {
+        listOf(
-            val result = signatures.elementAt(i).result!!
+            IntegrityCheckSignature,
+            ServiceCheckSignature,
+            GooglePlayUtilitySignature,
+            CastDynamiteModuleSignature,
+            CastDynamiteModuleV2Signature,
+            CastContextFetchSignature
+        ).forEach { signature ->
+            val result = signature.result!!
             val stringInstructions = when (result.immutableMethod.returnType.first()) {
                 'L' -> """
                         const/4 v0, 0x0
@@ -144,12 +147,12 @@ class MicroGBytecodePatch : BytecodePatch(
 
                 else -> throw Exception("This case should never happen.")
             }
-            result.method.implementation!!.addInstructions(
+            result.method.addInstructions(
-                0, stringInstructions.trimIndent().toInstructions()
+                0, stringInstructions
             )
         }
 
-        val implementation = signatures.last().result!!.method.implementation!!
+        val implementation = PrimeSignature.result!!.method.implementation!!
 
         var register = 2
         val index = implementation.instructions.indexOfFirst {

src/main/kotlin/app/revanced/patches/youtube/misc/microg/patch/resource/MicroGResourcePatch.kt

@@ -4,66 +4,55 @@ import app.revanced.patcher.annotation.Description
 import app.revanced.patcher.annotation.Name
 import app.revanced.patcher.annotation.Version
 import app.revanced.patcher.data.implementation.ResourceData
+import app.revanced.patcher.patch.annotations.Patch
 import app.revanced.patcher.patch.implementation.ResourcePatch
 import app.revanced.patcher.patch.implementation.misc.PatchResult
 import app.revanced.patcher.patch.implementation.misc.PatchResultSuccess
 import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
 import app.revanced.patches.youtube.misc.microg.shared.Constants.BASE_MICROG_PACKAGE_NAME
+import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_APP_NAME
 import app.revanced.patches.youtube.misc.microg.shared.Constants.REVANCED_PACKAGE_NAME
 
-// @Patch TODO: finish patch
 @Name("microg-resource-patch")
 @Description("Resource patch to allow YouTube ReVanced to run without root and under a different package name.")
 @MicroGPatchCompatibility
 @Version("0.0.1")
 class MicroGResourcePatch : ResourcePatch() {
     override fun execute(data: ResourceData): PatchResult {
+        data.getXmlEditor("res/xml/settings_fragment.xml").use {
+            val settingsElementIntent = it.file.createElement("intent")
+            settingsElementIntent.setAttribute("android:targetPackage", "$BASE_MICROG_PACKAGE_NAME.android.gms")
+            settingsElementIntent.setAttribute("android:targetClass", "org.microg.gms.ui.SettingsActivity")
+
+            val settingsElement = it.file.createElement("Preference")
+            settingsElement.setAttribute("android:title", "MicroG")
+            settingsElement.appendChild(settingsElementIntent)
+
+            it.file.firstChild.appendChild(settingsElement)
+        }
+
         val manifest = data.get("AndroidManifest.xml").readText()
 
         data.get("AndroidManifest.xml").writeText(
             manifest.replace(
-                "package=\"com.google.android.youtube\"", "package=\"$REVANCED_PACKAGE_NAME\""
+                "package=\"com.google.android.youtube", "package=\"$REVANCED_PACKAGE_NAME"
             ).replace(
-                " android:label=\"@string/application_name\" ", " android:label=\"{APP_NAME}\" "
+                "android:label=\"@string/application_name", "android:label=\"$REVANCED_APP_NAME"
             ).replace(
-                "<uses-permission android:name=\"com.google.android.youtube.permission.C2D_MESSAGE\"",
+                "android:authorities=\"com.google.android.youtube", "android:authorities=\"$REVANCED_PACKAGE_NAME"
-                "<uses-permission android:name=\"$REVANCED_PACKAGE_NAME.permission.C2D_MESSAGE\""
             ).replace(
-                "<permission android:name=\"com.google.android.youtube.permission.C2D_MESSAGE\"",
+                "com.google.android.youtube.permission.C2D_MESSAGE", "$REVANCED_PACKAGE_NAME.permission.C2D_MESSAGE"
-                "<permission android:name=\"$REVANCED_PACKAGE_NAME.permission.C2D_MESSAGE\""
+            ).replace( // TODO: might not be needed
+                "com.google.android.youtube.lifecycle-trojan", "$REVANCED_PACKAGE_NAME.lifecycle-trojan"
+            ).replace( // TODO: might not be needed
+                "com.google.android.youtube.photopicker_images", "$REVANCED_PACKAGE_NAME.photopicker_images"
             ).replace(
-                "<provider android:authorities=\"com.google.android.youtube.lifecycle-trojan\"",
+                "com.google.android.c2dm", "$BASE_MICROG_PACKAGE_NAME.android.c2dm"
-                "<provider android:authorities=\"$REVANCED_PACKAGE_NAME.lifecycle-trojan\""
             ).replace(
-                "\"com.google.android.youtube.fileprovider\"", "\"$REVANCED_PACKAGE_NAME.fileprovider\""
+                "</queries>", "<package android:name=\"$BASE_MICROG_PACKAGE_NAME.android.gms\"/></queries>"
-            ).replace(
-                "<provider android:authorities=\"com.google.android.youtube.photopicker_images\"",
-                "<provider android:authorities=\"$REVANCED_PACKAGE_NAME.photopicker_images\""
-            ).replace("com.google.android.c2dm", "$BASE_MICROG_PACKAGE_NAME.android.c2dm").replace(
-                "    </queries>",
-                "        <package android:name=\"$BASE_MICROG_PACKAGE_NAME.android.gms\"/>\n    </queries>"
             )
         )
 
-        val replacement = arrayOf(
-            Pair(
-                "com.google.android.youtube.SuggestionProvider", "$REVANCED_PACKAGE_NAME.SuggestionProvider"
-            ), Pair(
-                "com.google.android.youtube.fileprovider", "$REVANCED_PACKAGE_NAME.fileprovider"
-            )
-        )
-
-        data.forEach {
-            if (it.extension != "xml") return@forEach
-
-            // TODO: use a reader and only replace strings where needed instead of reading & writing the entire file
-            var content = it.readText()
-            replacement.filter { translation -> content.contains(translation.first) }.forEach { translation ->
-                content = content.replace(translation.first, translation.second)
-            }
-            it.writeText(content)
-        }
-
         return PatchResultSuccess()
     }
 }

src/main/kotlin/app/revanced/patches/youtube/misc/microg/shared/Constants.kt

@@ -3,4 +3,5 @@ package app.revanced.patches.youtube.misc.microg.shared
 object Constants {
     internal const val BASE_MICROG_PACKAGE_NAME = "com.mgoogle"
     internal const val REVANCED_PACKAGE_NAME = "app.revanced.android.youtube"
+    internal const val REVANCED_APP_NAME = "YouTube ReVanced"
 }

src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/CastContextFetchSignature.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.youtube.misc.microg.signatures
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.signature.implementation.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
+
+@Name("cast-context-fetch-signature")
+@MatchingMethod(
+    "Lvvz;", "a"
+)
+@DirectPatternScanMethod
+@MicroGPatchCompatibility
+@Version("0.0.1")
+object CastContextFetchSignature : MethodSignature(
+    null, null, null, null,
+    listOf("Error fetching CastContext.")
+)

src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/CastDynamiteModuleSignature.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.youtube.misc.microg.signatures
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.signature.implementation.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
+
+@Name("cast-module-signature")
+@MatchingMethod(
+    "Llqh;", "c"
+)
+@DirectPatternScanMethod
+@MicroGPatchCompatibility
+@Version("0.0.1")
+object CastDynamiteModuleSignature : MethodSignature(
+    null, null, null, null,
+    listOf("com.google.android.gms.cast.framework.internal.CastDynamiteModuleImpl")
+)

src/main/kotlin/app/revanced/patches/youtube/misc/microg/signatures/CastDynamiteModuleV2Signature.kt

@@ -0,0 +1,20 @@
+package app.revanced.patches.youtube.misc.microg.signatures
+
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.signature.implementation.method.MethodSignature
+import app.revanced.patcher.signature.implementation.method.annotation.DirectPatternScanMethod
+import app.revanced.patcher.signature.implementation.method.annotation.MatchingMethod
+import app.revanced.patches.youtube.misc.microg.annotations.MicroGPatchCompatibility
+
+@Name("cast-context-fetch-signature")
+@MatchingMethod(
+    "Lmcf;", "c"
+)
+@DirectPatternScanMethod
+@MicroGPatchCompatibility
+@Version("0.0.1")
+object CastDynamiteModuleV2Signature : MethodSignature(
+    null, null, null, null,
+    listOf("Failed to load module via V2: ")
+)