chore(release): 2.149.0-dev.1 [skip ci]

# [2.149.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.148.0...v2.149.0-dev.1) (2022-12-30)

### Bug Fixes

* **tasker/unlock-license:** resolve fingerprint correctly ([9158fd5](9158fd5054))

### Features

* **youtube/general-ads-patch:** hide channel member shelf ([#1380](https://github.com/revanced/revanced-patches/issues/1380)) ([6441b03](6441b031e3))

.github/workflows/pull_request.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  MESSAGE: merge branch \`${{ github.head_ref || github.ref_name }}\` to \`main\`
+  MESSAGE: merge branch `${{ github.head_ref || github.ref_name }}` to `main`
 
 jobs:
   pull-request:

CHANGELOG.md

@@ -1,3 +1,40 @@
+# [2.149.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.148.0...v2.149.0-dev.1) (2022-12-30)
+
+
+### Bug Fixes
+
+* **tasker/unlock-license:** resolve fingerprint correctly ([92d7857](https://github.com/revanced/revanced-patches/commit/92d78576f033dd7155c80cb08d5911048b06c36c))
+
+
+### Features
+
+* **youtube/general-ads-patch:** hide channel member shelf ([#1380](https://github.com/revanced/revanced-patches/issues/1380)) ([ce2b104](https://github.com/revanced/revanced-patches/commit/ce2b104f508f1581ec531446d60bd3d41dafbd2c))
+
+# [2.148.0](https://github.com/revanced/revanced-patches/compare/v2.147.0...v2.148.0) (2022-12-29)
+
+
+### Bug Fixes
+
+* **youtube/general-ads:** don't early return when not necessary ([#1353](https://github.com/revanced/revanced-patches/issues/1353)) ([003a400](https://github.com/revanced/revanced-patches/commit/003a400ce41ff543fb5484c576f5ec2df0a87273))
+
+
+### Features
+
+* **tasker:** `unlock-license` patch ([#1339](https://github.com/revanced/revanced-patches/issues/1339)) ([78a43b8](https://github.com/revanced/revanced-patches/commit/78a43b8abd972172eab99519dfa636ce77d9e64f))
+* **twitter:** `hide-views-stats` patch ([#1371](https://github.com/revanced/revanced-patches/issues/1371)) ([2f04a06](https://github.com/revanced/revanced-patches/commit/2f04a06e3b782931870d973fd0937f8731062f12))
+* **youtube/general-ads-patch:** hide guidelines for subscriber ([#1352](https://github.com/revanced/revanced-patches/issues/1352)) ([2d10932](https://github.com/revanced/revanced-patches/commit/2d1093251d5d50b476ca44f76acb9a8597b37aea))
+* **youtube/theme:** add option to color the seekbar ([53b91fe](https://github.com/revanced/revanced-patches/commit/53b91fe2b5a41f1a63deec8d919f2a1bc1cae12a))
+* **youtube/theme:** include the patch by default ([c363997](https://github.com/revanced/revanced-patches/commit/c3639975683fb0ca0e271e8fc3ef7fbf79f33414))
+* **youtube:** `hide-breaking-news-shelf` patch ([#1381](https://github.com/revanced/revanced-patches/issues/1381)) ([38a9877](https://github.com/revanced/revanced-patches/commit/38a987744fbb49c2b7d5d0e69297e95f5ee405c4))
+
+# [2.148.0-dev.6](https://github.com/revanced/revanced-patches/compare/v2.148.0-dev.5...v2.148.0-dev.6) (2022-12-29)
+
+
+### Features
+
+* **youtube/theme:** add option to color the seekbar ([53b91fe](https://github.com/revanced/revanced-patches/commit/53b91fe2b5a41f1a63deec8d919f2a1bc1cae12a))
+* **youtube/theme:** include the patch by default ([c363997](https://github.com/revanced/revanced-patches/commit/c3639975683fb0ca0e271e8fc3ef7fbf79f33414))
+
 # [2.148.0-dev.5](https://github.com/revanced/revanced-patches/compare/v2.148.0-dev.4...v2.148.0-dev.5) (2022-12-29)
 
 

README.md

@@ -199,14 +199,6 @@ The official Patch bundle provided by ReVanced and the community.
 | `promo-code-unlock` | Disables the validation of promo code. Any code will work to unlock all features. | all |
 </details>
 
-### [📦 `net.dinglisch.android.taskerm`](https://play.google.com/store/apps/details?id=net.dinglisch.android.taskerm)
-<details>
-
-| 💊 Patch | 📜 Description | 🏹 Target Version |
-|:--------:|:--------------:|:-----------------:|
-| `unlock-license` | Unlocks the trial version. | all |
-</details>
-
 ### [📦 `co.windyapp.android`](https://play.google.com/store/apps/details?id=co.windyapp.android)
 <details>
 
@@ -255,6 +247,14 @@ The official Patch bundle provided by ReVanced and the community.
 | `unlock-themes` | Unlocks all themes. | all |
 </details>
 
+### [📦 `net.dinglisch.android.taskerm`](https://play.google.com/store/apps/details?id=net.dinglisch.android.taskerm)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-trial` | Unlocks the trial version. | all |
+</details>
+
 
 
 ## 📝 JSON Format

gradle.properties

@@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.148.0-dev.5
+version = 2.149.0-dev.1

src/main/kotlin/app/revanced/patches/tasker/license/unlock/fingerprints/CheckLicenseFingerprint.kt

@@ -1,14 +0,0 @@
-package app.revanced.patches.tasker.license.unlock.fingerprints
-
-import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
-import org.jf.dexlib2.Opcode
-
-object CheckLicenseFingerprint : MethodFingerprint(
-    strings = listOf("just(IsLicensedResult(true))"),
-    opcodes = listOf(
-        Opcode.GOTO,
-        Opcode.INVOKE_VIRTUAL,
-        Opcode.MOVE_RESULT_OBJECT,
-        Opcode.INVOKE_VIRTUAL
-    )
-)

src/main/kotlin/app/revanced/patches/tasker/license/unlock/patch/UnlockLicensePatch.kt

@@ -1,46 +0,0 @@
-package app.revanced.patches.tasker.license.unlock.patch
-
-import app.revanced.extensions.toErrorResult
-import app.revanced.patcher.annotation.Description
-import app.revanced.patcher.annotation.Name
-import app.revanced.patcher.annotation.Version
-import app.revanced.patcher.data.BytecodeContext
-import app.revanced.patcher.extensions.instruction
-import app.revanced.patcher.patch.BytecodePatch
-import app.revanced.patcher.patch.PatchResultSuccess
-import app.revanced.patcher.patch.annotations.Patch
-import app.revanced.patches.tasker.license.unlock.annotations.UnlockLicenseCompatibility
-import app.revanced.patches.tasker.license.unlock.fingerprints.CheckLicenseFingerprint
-import org.jf.dexlib2.iface.instruction.FiveRegisterInstruction
-import org.jf.dexlib2.iface.instruction.ReferenceInstruction
-import org.jf.dexlib2.iface.reference.MethodReference
-import org.jf.dexlib2.immutable.instruction.ImmutableInstruction35c
-
-@Patch
-@Name("unlock-license")
-@Description("Unlocks the trial version.")
-@UnlockLicenseCompatibility
-@Version("0.0.1")
-class UnlockLicensePatch : BytecodePatch(
-    listOf(
-        CheckLicenseFingerprint
-    )
-) {
-    override fun execute(context: BytecodeContext) = CheckLicenseFingerprint.result?.let { result ->
-        val patchIndex = result.scanResult.patternScanResult!!.endIndex
-
-        with(result.mutableMethod.instruction(patchIndex) as FiveRegisterInstruction) {
-            ImmutableInstruction35c(
-                opcode,
-                registerCount,
-                registerC,
-                0, // registerE is 1, registerD is now 0 instead of 1 bypassing the license verification
-                registerE,
-                registerF,
-                registerG,
-                (this as ReferenceInstruction).reference as MethodReference
-            )
-        }
-        PatchResultSuccess()
-    } ?: CheckLicenseFingerprint.toErrorResult()
-}

src/main/kotlin/app/revanced/patches/tasker/trial/unlock/annotations/UnlockTrialCompatibility.kt

@@ -1,4 +1,4 @@
-package app.revanced.patches.tasker.license.unlock.annotations
+package app.revanced.patches.tasker.trial.unlock.annotations
 
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package
@@ -6,4 +6,4 @@ import app.revanced.patcher.annotation.Package
 @Compatibility([Package("net.dinglisch.android.taskerm")])
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-internal annotation class UnlockLicenseCompatibility
+internal annotation class UnlockTrialCompatibility

src/main/kotlin/app/revanced/patches/tasker/trial/unlock/fingerprints/CheckLicenseFingerprint.kt

@@ -0,0 +1,7 @@
+package app.revanced.patches.tasker.trial.unlock.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+
+object CheckLicenseFingerprint : MethodFingerprint(
+    strings = listOf("Can't check license")
+)

src/main/kotlin/app/revanced/patches/tasker/trial/unlock/patch/UnlockLicensePatch.kt

@@ -0,0 +1,32 @@
+package app.revanced.patches.tasker.trial.unlock.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.tasker.trial.unlock.annotations.UnlockTrialCompatibility
+import app.revanced.patches.tasker.trial.unlock.fingerprints.CheckLicenseFingerprint
+
+@Patch
+@Name("unlock-trial")
+@Description("Unlocks the trial version.")
+@UnlockTrialCompatibility
+@Version("0.0.1")
+class UnlockLicensePatch : BytecodePatch(
+    listOf(
+        CheckLicenseFingerprint
+    )
+) {
+    override fun execute(context: BytecodeContext) = CheckLicenseFingerprint
+        .result
+        ?.mutableMethod
+        // Return the method early, which prompts the user with a non dismissible dialog, when the trial period is over.
+        ?.addInstruction(0, "return-void")
+        ?.let { PatchResultSuccess() }
+        ?: CheckLicenseFingerprint.toErrorResult()
+}

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

@@ -109,6 +109,13 @@ class GeneralAdsResourcePatch : ResourcePatch {
                 StringResource("revanced_adremover_subscribers_community_guidelines_enabled_summary_on", "Subscribers community guidelines are hidden"),
                 StringResource("revanced_adremover_subscribers_community_guidelines_enabled_summary_off", "Subscribers community guidelines are shown")
             ),
+            SwitchPreference(
+                "revanced_adremover_channel_member_shelf_removal",
+                StringResource("revanced_adremover_channel_member_shelf_enabled_title", "Hide channel member shelf"),
+                true,
+                StringResource("revanced_adremover_channel_member_shelf_enabled_summary_on", "Channel member shelf is hidden"),
+                StringResource("revanced_adremover_channel_member_shelf_enabled_summary_off", "Channel member shelf is shown")
+            ),
             SwitchPreference(
                 "revanced_adremover_emergency_box_removal",
                 StringResource("revanced_adremover_emergency_box_enabled_title", "Hide emergency boxes"),

src/main/kotlin/app/revanced/patches/youtube/layout/theme/patch/ThemePatch.kt

@@ -13,7 +13,7 @@ import app.revanced.util.resources.ResourceUtils
 import app.revanced.util.resources.ResourceUtils.copyResources
 import org.w3c.dom.Element
 
-@Patch(include = false)
+@Patch
 @DependsOn([LithoThemePatch::class, FixLocaleConfigErrorPatch::class])
 @Name("theme")
 @Description("Applies a custom theme.")
@@ -23,6 +23,7 @@ class ThemePatch : ResourcePatch {
     override fun execute(context: ResourceContext): PatchResult {
         val darkThemeBackgroundColor = darkThemeBackgroundColor!!
         val lightThemeBackgroundColor = lightThemeBackgroundColor!!
+        val darkThemeSeekbarColor = darkThemeSeekbarColor!!
 
         context.xmlEditor["res/values/colors.xml"].use { editor ->
             val resourcesNode = editor.file.getElementsByTagName("resources").item(0) as Element
@@ -31,20 +32,20 @@ class ThemePatch : ResourcePatch {
                 val node = resourcesNode.childNodes.item(i) as? Element ?: continue
 
                 node.textContent = when (node.getAttribute("name")) {
-                    "yt_black0", "yt_black1", "yt_black1_opacity95", "yt_black1_opacity98", "yt_black2", "yt_black3",
-                    "yt_black4", "yt_status_bar_background_dark", "material_grey_850" -> darkThemeBackgroundColor
+                    "yt_black0", "yt_black1", "yt_black1_opacity95", "yt_black1_opacity98", "yt_black2", "yt_black3", "yt_black4", "yt_status_bar_background_dark", "material_grey_850" -> darkThemeBackgroundColor
 
                     "yt_white1", "yt_white1_opacity95", "yt_white1_opacity98", "yt_white2", "yt_white3", "yt_white4",
-                     -> lightThemeBackgroundColor
+                    -> lightThemeBackgroundColor
 
+                    "inline_time_bar_colorized_bar_played_color_dark" -> darkThemeSeekbarColor
                     else -> continue
                 }
             }
         }
 
         // copies the resource file to change the splash screen color
-        context.copyResources("theme",
-            ResourceUtils.ResourceGroup("values-night-v31", "styles.xml")
+        context.copyResources(
+            "theme", ResourceUtils.ResourceGroup("values-night-v31", "styles.xml")
         )
 
         return PatchResultSuccess()
@@ -68,5 +69,14 @@ class ThemePatch : ResourcePatch {
                 description = "The background color of the light theme. Can be a hex color or a resource reference.",
             )
         )
+
+        var darkThemeSeekbarColor: String? by option(
+            PatchOption.StringOption(
+                key = "darkThemeSeekbarColor",
+                default = "#ffff0000",
+                title = "Dark theme seekbar color",
+                description = "The background color of the seekbar of the dark theme. Leave empty for default color.",
+            )
+        )
     }
 }