build: Refactor patches to DSL to bump ReVanced Patcher #3323

oSumAtrIX · 2024-06-10T14:00:31Z

No description provided.

Without this change, if theres two patches that use the base patch, then they would conflict each other

This reverts commit b9f820f.

…sPatch

…en dependencies

# Conflicts: # api/revanced-patches.api # src/main/kotlin/app/revanced/patches/messenger/inbox/HideInboxAdsPatch.kt # src/main/kotlin/app/revanced/patches/messenger/inbox/fingerprints/LoadInboxAdsFingerprint.kt # src/main/kotlin/app/revanced/patches/messenger/inputfield/DisableSwitchingEmojiToStickerPatch.kt # src/main/kotlin/app/revanced/patches/messenger/inputfield/DisableTypingIndicatorPatch.kt # src/main/kotlin/app/revanced/patches/music/ad/video/HideMusicVideoAds.kt # src/main/kotlin/app/revanced/patches/music/audio/codecs/CodecsUnlockPatch.kt # src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/EnableExclusiveAudioPlayback.kt # src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/PermanentRepeatPatch.kt # src/main/kotlin/app/revanced/patches/music/interaction/permanentrepeat/fingerprints/RepeatTrackFingerprint.kt # src/main/kotlin/app/revanced/patches/music/interaction/permanentshuffle/PermanentShufflePatch.kt # src/main/kotlin/app/revanced/patches/music/layout/compactheader/HideCategoryBar.kt # src/main/kotlin/app/revanced/patches/music/layout/minimizedplayback/MinimizedPlaybackPatch.kt # src/main/kotlin/app/revanced/patches/music/layout/premium/HideGetPremiumPatch.kt # src/main/kotlin/app/revanced/patches/music/layout/upgradebutton/RemoveUpgradeButtonPatch.kt # src/main/kotlin/app/revanced/patches/music/misc/androidauto/BypassCertificateChecksPatch.kt # src/main/kotlin/app/revanced/patches/music/misc/backgroundplayback/fingerprints/KidsBackgroundPlaybackPolicyControllerFingerprint.kt # src/main/kotlin/app/revanced/patches/music/misc/gms/GmsCoreSupportPatch.kt # src/main/kotlin/app/revanced/patches/music/premium/backgroundplay/BackgroundPlayPatch.kt # src/main/kotlin/app/revanced/patches/reddit/ad/banner/HideBannerPatch.kt # src/main/kotlin/app/revanced/patches/reddit/ad/general/HideAdsPatch.kt # src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/SpoofClientPatch.kt # src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/api/SpoofClientPatch.kt # src/main/kotlin/app/revanced/patches/reddit/customclients/joeyforreddit/detection/piracy/DisablePiracyDetectionPatch.kt # src/main/kotlin/app/revanced/patches/reddit/customclients/redditisfun/api/SpoofClientPatch.kt # src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/api/SpoofClientPatch.kt # src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/fix/slink/FixSLinksPatch.kt # src/main/kotlin/app/revanced/patches/shared/misc/mapping/ResourceMappingPatch.kt # src/main/kotlin/app/revanced/patches/tiktok/interaction/cleardisplay/RememberClearModePatch.kt # src/main/kotlin/app/revanced/patches/tiktok/interaction/downloads/DownloadsPatch.kt # src/main/kotlin/app/revanced/patches/tiktok/interaction/speed/PlaybackSpeedPatch.kt # src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt # src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/interaction/copyvideourl/CopyVideoUrlBytecodePatch.kt # src/main/kotlin/app/revanced/patches/youtube/interaction/dialog/RemoveViewerDiscretionDialogPatch.kt # src/main/kotlin/app/revanced/patches/youtube/interaction/downloads/DownloadsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/DisablePreciseSeekingGesturePatch.kt # src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSeekbarTappingPatch.kt # src/main/kotlin/app/revanced/patches/youtube/interaction/seekbar/EnableSlideToSeekPatch.kt # src/main/kotlin/app/revanced/patches/youtube/interaction/swipecontrols/SwipeControlsBytecodePatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/autocaptions/AutoCaptionsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/buttons/action/HideButtonsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/buttons/autoplay/HideAutoplayButtonPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/buttons/captions/HideCaptionsButtonPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/buttons/navigation/NavigationButtonsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/buttons/player/hide/HidePlayerButtonsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/albumcards/AlbumCardsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/comments/CommentsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/CrowdfundingBoxPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/HideEndscreenCardsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/HideFilterBarPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/HideFloatingMicrophoneButtonPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/DisableFullscreenAmbientModePatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/fingerprints/ParseElementFromBufferFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/HideInfoCardsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/player/flyoutmenupanel/HidePlayerFlyoutMenuPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/rollingnumber/DisableRollingNumberAnimationPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/seekbar/HideSeekbarPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/shorts/HideShortsComponentsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/DisableSuggestedVideoEndScreenPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/time/HideTimestampPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerOverrideFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerResponseModelSizeCheckFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/panels/popup/PlayerPopupPanelsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/player/background/PlayerControlsBackgroundPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/player/overlay/CustomPlayerOverlayOpacityPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/ReturnYouTubeDislikePatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/searchbar/WideSearchbarPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/RestoreOldSeekbarThumbnailsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/SeekbarColorBytecodePatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/SponsorBlockBytecodePatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/spoofappversion/SpoofAppVersionPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/startupshortsreset/DisableResumingShortsOnStartupPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/tablet/EnableTabletLayoutPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/tablet/fingerprints/GetFormFactorFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/TabletMiniPlayerPatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerDimensionsCalculatorParentFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/tabletminiplayer/fingerprints/MiniPlayerOverrideNoContextFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/theme/ThemeBytecodePatch.kt # src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/misc/autorepeat/AutoRepeatPatch.kt # src/main/kotlin/app/revanced/patches/youtube/misc/backgroundplayback/fingerprints/BackgroundPlaybackManagerFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/misc/backgroundplayback/fingerprints/BackgroundPlaybackSettingsFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/misc/backgroundplayback/fingerprints/KidsBackgroundPlaybackPolicyControllerFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/misc/dimensions/spoof/SpoofDeviceDimensionsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/SpoofClientPatch.kt # src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/UserAgentClientSpoofPatch.kt # src/main/kotlin/app/revanced/patches/youtube/misc/gms/GmsCoreSupportPatch.kt # src/main/kotlin/app/revanced/patches/youtube/misc/links/BypassURLRedirectsPatch.kt # src/main/kotlin/app/revanced/patches/youtube/misc/links/OpenLinksExternallyPatch.kt # src/main/kotlin/app/revanced/patches/youtube/misc/links/fingerprints/ABUriParserFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/misc/litho/filter/LithoFilterPatch.kt # src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/MinimizedPlaybackPatch.kt # src/main/kotlin/app/revanced/patches/youtube/misc/minimizedplayback/fingerprints/MinimizedPlaybackSettingsParentFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/misc/navigation/NavigationBarHookPatch.kt # src/main/kotlin/app/revanced/patches/youtube/misc/privacy/RemoveTrackingQueryParameterPatch.kt # src/main/kotlin/app/revanced/patches/youtube/video/quality/RememberVideoQualityPatch.kt # src/main/kotlin/app/revanced/patches/youtube/video/speed/PlaybackSpeedPatch.kt # src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/RestoreOldVideoQualityMenuPatch.kt # src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/fingerprints/VideoQualityMenuOptionsFingerprint.kt # src/main/kotlin/app/revanced/util/BytecodeUtils.kt

# Conflicts: # src/main/kotlin/app/revanced/patches/music/audio/exclusiveaudio/Fingerprints.kt # src/main/kotlin/app/revanced/patches/music/layout/compactheader/Fingerprints.kt # src/main/kotlin/app/revanced/patches/music/misc/backgroundplayback/Fingerprints.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/crowdfundingbox/Fingerprints.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/fingerprints/LayoutCircleFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/endscreencards/fingerprints/LayoutVideoFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/filterbar/fingerprints/FilterBarHeightFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/floatingmicrophone/Fingerprints.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/fullscreenambientmode/Fingerprints.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/fingerprints/HideShowMoreButtonFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/infocards/fingerprints/InfocardsMethodCallFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/hide/suggestedvideoendscreen/Fingerprints.kt # src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerDimensionsCalculatorParentFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerModernCloseButtonFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerModernConstructorFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerModernExpandButtonFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerModernExpandCloseDrawablesFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerModernForwardButtonFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerModernOverlayViewFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/miniplayer/fingerprints/MiniplayerModernRewindButtonFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/returnyoutubedislike/fingerprints/DislikesOldLayoutTextViewFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/fingerprints/FullscreenSeekbarThumbnailsFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/seekbar/fingerprints/ShortsSeekbarColorFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/layout/theme/fingerprints/UseGradientLoadingScreenFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/SetPlayerRequestClientTypeFingerprint.kt # src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/Fingerprints.kt # src/main/kotlin/app/revanced/patches/youtube/video/videoqualitymenu/fingerprints/VideoQualityMenuOptionsFingerprint.kt

Co-authored-by: oSumAtrIX <[email protected]>

# Conflicts: # api/revanced-patches.api

oSumAtrIX and others added 30 commits April 29, 2024 23:32

migrate commonly used patches

707a843

fix modifier

914c193

fix small errors

d25d2f4

fix incorrect design

15de625

Without this change, if theres two patches that use the base patch, then they would conflict each other

crowdfunding box dsl

1ad53ce

endscreen card dsl

408af96

filter bar dsl

8f0ffd3

fix consistency

8a3998a

floating mic button dsl

fa1ea18

refactor: migrate patches to new dsl

b9f820f

refactor: Migrate patches to DSL

9f33a3a

Revert "refactor: migrate patches to new dsl"

6cc9de2

This reverts commit b9f820f.

formatting

d87c4fc

formatting

cc2ab50

refactor: Correct ordering of fingerprint block

4574238

fix: Correct package name

e036509

refactor: Place dependsOn before compatibleWith

b01cbf0

refactor: Newline when multiple packages are compatible

00d6229

fix: Reference correct fingerprint result

f53700c

refactor: Move some variables into the patch

8ea3a1d

fix: Add missing integrationsPatch dependency

4a2100f

refactor: Fix formatting and move into patch

f75601c

fix: Use correct dependency

e1eb4ac

refactor: Import PreferenceScreen instead of explicitly using setting…

f4b7a24

…sPatch

refactor: Don't explicitly use With and Let

23dc930

refactor: Improve lambda receiver name

3714ddb

refactor: Move onDepends above compatibleWith and add new lines betwe…

f5ff62c

…en dependencies

fix: Import correct dependency (patch hasn't been migrated yet)

44db1f9

refactor: Explicitely name literalSupplier

3e63039

fix: Use correct patchId

89c0a7d

Ushie and others added 4 commits June 9, 2024 06:37

refactor: Move class descriptors to a private constant above the patch

d44e886

fix errors

d8c3803

branding

ad7fd43

finish remaining patches

e9cebbe

oSumAtrIX self-assigned this Jun 10, 2024

oSumAtrIX force-pushed the refactor/dsl branch from 00fa1fb to e9cebbe Compare June 10, 2024 14:02

oSumAtrIX force-pushed the refactor/dsl branch from 6ddbf00 to 3723aec Compare June 11, 2024 13:53

MistaMark and others added 22 commits June 11, 2024 16:28

finish literal fingerprint refactor

99544d2

finish literal fingerprint refactor (#3329)

559663e

fix name

8573ea9

Merge fingerprints

737a08e

Merge resource and patch

7f890c2

Remove base from filenames

29054ec

Make patch id names lower case

37af8b8

Change classDef.type to method.definingClass

4e0bdd1

Finish some todos (#3335)

033ad48

Adding "Fingerprint" to Result-names

78c14db

Merge remote-tracking branch 'origin/refactor/dsl' into refactor/dsl

6695cd5

Fix missing name

381530c

Fix order of initialization and broken fingerprints

4ac6416

Add fingerprints before delegating result & fix arrays & fingerprints

fbd2d56

Fix some more issues

f32da7b

refactor

f1543bb

Fix: Minor migration mistakes (#3351)

a9af971

Co-authored-by: oSumAtrIX <[email protected]>

fix invalid integrations class

a8ab985

fix some more issues

7620eb8

Merge branch 'refs/heads/dev' into refactor/dsl

8ca1406

# Conflicts: # api/revanced-patches.api

use correct package

a08b123

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

build: Refactor patches to DSL to bump ReVanced Patcher #3323

build: Refactor patches to DSL to bump ReVanced Patcher #3323

oSumAtrIX commented Jun 10, 2024

build: Refactor patches to DSL to bump ReVanced Patcher #3323

Are you sure you want to change the base?

build: Refactor patches to DSL to bump ReVanced Patcher #3323

Conversation

oSumAtrIX commented Jun 10, 2024