diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 90599658e..d4cbc2673 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -6,11 +6,73 @@ body: - type: markdown attributes: value: | +

+ + + + +
+ + + + + +     + + + + + +     + + + + + +     + + + + + +     + + + + + +     + + + + + +     + + + + + + +
+
+ Continuing the legacy of Vanced +

+ # ReVanced Patches bug report - Please check for existing bug reports [here](https://github.com/ReVanced/revanced-patches/labels/Bug%20report) before creating a new one. - Review the [contribution guidelines](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md) before submitting a bug report. + Before creating a new bug report, please keep the following in mind: + - **Do not submit a duplicate bug report**: You can review existing bug reports [here](https://github.com/ReVanced/revanced-patches/labels/Bug%20report). + - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md). + - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app). - type: textarea attributes: label: Bug description @@ -38,9 +100,9 @@ body: id: acknowledgements attributes: label: Acknowledgements - description: Your issue will be closed if you don't follow the checklist below. + description: Your bug report will be closed if you don't follow the checklist below. options: - - label: This request is not a duplicate of an existing issue. + - label: This issue is not a duplicate of an existing bug report. required: true - label: I have chosen an appropriate title. required: true diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml index 67d1069c4..cb4b28494 100644 --- a/.github/ISSUE_TEMPLATE/feature-request.yml +++ b/.github/ISSUE_TEMPLATE/feature-request.yml @@ -6,11 +6,73 @@ body: - type: markdown attributes: value: | - # ReVanced Patches feature request - - Please check for existing feature requests [here](https://github.com/ReVanced/revanced-patches/labels/Feature%20request) before creating a new one. - Review the [contribution guidelines](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md) before submitting a feature request. +

+ + + + +
+ + + + + +     + + + + + +     + + + + + +     + + + + + +     + + + + + +     + + + + + +     + + + + + + +
+
+ Continuing the legacy of Vanced +

+ # ReVanced Patches feature request + + Before creating a new feature request, please keep the following in mind: + + - **Do not submit a duplicate feature request**: You can review existing feature requests [here](https://github.com/ReVanced/revanced-patches/labels/Feature%20request). + - **Review the contribution guidelines**: Make sure your bug report adheres to it. You can find the guidelines [here](https://github.com/ReVanced/revanced-patches/blob/main/CONTRIBUTING.md). + - **Do not use the issue page for support**: If you need help or have questions, check out other platforms on [revanced.app](https://revanced.app). - type: textarea attributes: label: Feature description @@ -34,9 +96,9 @@ body: id: acknowledgements attributes: label: Acknowledgements - description: Your issue will be closed if you don't follow the checklist below. + description: Your feature request will be closed if you don't follow the checklist below. options: - - label: This request is not a duplicate of an existing issue. + - label: This issue is not a duplicate of an existing feature request. required: true - label: I have chosen an appropriate title. required: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 4915f5c8e..2f420825a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ +# [2.201.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.200.0...v2.201.0-dev.1) (2023-11-23) + + +### Bug Fixes + +* **YouTube - Enable tablet layout:** Respect the original device layout ([b2c5bab](https://github.com/ReVanced/revanced-patches/commit/b2c5babf3fd9ad73daa06e03f4830a9dd7199d0c)) + + +### Features + +* **YouTube - Hide ads:** Hide shopping links in video description ([0c875a1](https://github.com/ReVanced/revanced-patches/commit/0c875a106308ae9747ae998d75b84db1c336762b)) +* **YouTube - Hide layout components:** Hide "For You" shelf in channel page ([2bc7485](https://github.com/ReVanced/revanced-patches/commit/2bc7485cda5c5e17d65419faca983567a030f9aa)) + +## [2.200.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v2.200.0...v2.200.1-dev.1) (2023-11-23) + + +### Bug Fixes + +* **YouTube - Enable tablet layout:** Respect the original device layout ([1eb12cc](https://github.com/ReVanced/revanced-patches/commit/1eb12cc40ac5c25410dac9857ff4a9585c25f5cc)) + # [2.200.0](https://github.com/ReVanced/revanced-patches/compare/v2.199.0...v2.200.0) (2023-11-22) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2404494fc..b4239b41d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,36 +6,52 @@ srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg" >
- + + + +     - +     - + + + +     - + + + +     - + + + +     - +     - + + + +

diff --git a/README.md b/README.md index 58d916247..c4ada6c8e 100644 --- a/README.md +++ b/README.md @@ -6,36 +6,52 @@ srcset="assets/revanced-headline/revanced-headline-vertical-dark.svg" >
- + + + +     - +     - + + + +     - + + + +     - + + + +     - +     - + + + +

diff --git a/assets/revanced-logo/revanced-logo-round.svg b/assets/revanced-logo/revanced-logo.svg similarity index 100% rename from assets/revanced-logo/revanced-logo-round.svg rename to assets/revanced-logo/revanced-logo.svg diff --git a/gradle.properties b/gradle.properties index 9ab6a3cc1..8a181731a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.parallel = true org.gradle.caching = true kotlin.code.style = official -version = 2.200.0 +version = 2.201.0-dev.1 diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsResourcePatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsResourcePatch.kt index f701fab3e..135b62ffc 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsResourcePatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsResourcePatch.kt @@ -55,6 +55,12 @@ object HideAdsResourcePatch : ResourcePatch() { StringResource("revanced_hide_products_banner_summary_on", "Banner is hidden"), StringResource("revanced_hide_products_banner_summary_off", "Banner is shown") ), + SwitchPreference( + "revanced_hide_shopping_links", + StringResource("revanced_hide_shopping_links_title", "Hide shopping links in video description"), + StringResource("revanced_hide_shopping_links_summary_on", "Shopping links are hidden"), + StringResource("revanced_hide_shopping_links_summary_off", "Shopping links are shown") + ), SwitchPreference( "revanced_hide_web_search_results", StringResource("revanced_hide_web_search_results_title", "Hide web search results"), diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt index 00f7e9636..5e449dafa 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt @@ -74,6 +74,12 @@ object HideLayoutComponentsPatch : BytecodePatch( StringResource("revanced_hide_channel_watermark_title_summary_on", "Watermark is hidden"), StringResource("revanced_hide_channel_watermark_title_summary_off", "Watermark is shown") ), + SwitchPreference( + "revanced_hide_for_you_shelf", + StringResource("revanced_hide_for_you_shelf_title", "Hide \\\'For you\\\' shelf in channel page"), + StringResource("revanced_hide_for_you_shelf_summary_on", "Shelf is hidden"), + StringResource("revanced_hide_for_you_shelf_summary_off", "Shelf is shown") + ), SwitchPreference( "revanced_hide_notify_me_button", StringResource("revanced_hide_notify_me_button_title", "Hide \\\'Notify me\\\' button"), diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt index c99a12b7d..d505b37d6 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt @@ -2,8 +2,11 @@ package app.revanced.patches.youtube.layout.tablet import app.revanced.extensions.exception import app.revanced.patcher.data.BytecodeContext +import app.revanced.patcher.extensions.InstructionExtensions.addInstruction import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels import app.revanced.patcher.extensions.InstructionExtensions.getInstruction +import app.revanced.patcher.extensions.InstructionExtensions.getInstructions +import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction import app.revanced.patcher.patch.BytecodePatch import app.revanced.patcher.patch.annotation.CompatiblePackage import app.revanced.patcher.patch.annotation.Patch @@ -13,6 +16,8 @@ import app.revanced.patches.shared.settings.preference.impl.SwitchPreference import app.revanced.patches.youtube.layout.tablet.fingerprints.GetFormFactorFingerprint import app.revanced.patches.youtube.misc.integrations.IntegrationsPatch import app.revanced.patches.youtube.misc.settings.SettingsPatch +import com.android.tools.smali.dexlib2.Opcode +import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction10x @Patch( name = "Enable tablet layout", @@ -37,18 +42,28 @@ object EnableTabletLayoutPatch : BytecodePatch( GetFormFactorFingerprint.result?.let { it.mutableMethod.apply { - val returnLargeFormFactorIndex = it.scanResult.patternScanResult!!.endIndex - 4 + val returnCurrentFormFactorIndex = getInstructions().lastIndex - 2 + val returnIsLargeFormFactorLabel = getInstruction(returnCurrentFormFactorIndex - 2) + val returnFormFactorIndex = getInstruction(returnCurrentFormFactorIndex) + + val insertIndex = returnCurrentFormFactorIndex + 1 + + // Replace the labeled instruction with a nop and add the preserved instructions back + replaceInstruction(returnCurrentFormFactorIndex, BuilderInstruction10x(Opcode.NOP)) + addInstruction(insertIndex, returnFormFactorIndex) + + // Because the labeled instruction is now a nop, we can add our own instructions right after it addInstructionsWithLabels( - 0, + insertIndex, """ - invoke-static {}, Lapp/revanced/integrations/patches/EnableTabletLayoutPatch;->enableTabletLayout()Z - move-result v0 + invoke-static { }, Lapp/revanced/integrations/patches/EnableTabletLayoutPatch;->enableTabletLayout()Z + move-result v0 # Free register if-nez v0, :is_large_form_factor """, ExternalLabel( "is_large_form_factor", - getInstruction(returnLargeFormFactorIndex) + returnIsLargeFormFactorLabel ) ) }