From f090ff1229d80ca565e0e36c0c6aa91e0ef041a1 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sun, 17 Jul 2022 11:57:44 +0200 Subject: [PATCH] refactor: use `.single` for `resourceMappings` --- .../ad/general/bytecode/patch/GeneralBytecodeAdsPatch.kt | 2 +- .../youtube/layout/autoplaybutton/patch/HideAutoplayButton.kt | 4 ++-- .../layout/createbutton/patch/CreateButtonRemoverPatch.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralBytecodeAdsPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralBytecodeAdsPatch.kt index 7650d9eb6..10d158c93 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralBytecodeAdsPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/ad/general/bytecode/patch/GeneralBytecodeAdsPatch.kt @@ -58,7 +58,7 @@ class GeneralBytecodeAdsPatch : BytecodePatch() { "promoted_video_item_land", "promoted_video_item_full_bleed", ).map { name -> - ResourceIdMappingProviderResourcePatch.resourceMappings.first { it.name == name }.id + ResourceIdMappingProviderResourcePatch.resourceMappings.single { it.name == name }.id } private val stringReferences = arrayOf( diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButton.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButton.kt index 3469fa750..f5de3ccfb 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButton.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/autoplaybutton/patch/HideAutoplayButton.kt @@ -32,9 +32,9 @@ class HideAutoplayButton : BytecodePatch( val layoutGenMethod = LayoutConstructorFingerprint.result!!.mutableMethod val autonavToggle = - ResourceIdMappingProviderResourcePatch.resourceMappings.first { it.type == "id" && it.name == "autonav_toggle" } + ResourceIdMappingProviderResourcePatch.resourceMappings.single { it.type == "id" && it.name == "autonav_toggle" } val autonavPreviewStub = - ResourceIdMappingProviderResourcePatch.resourceMappings.first { it.type == "id" && it.name == "autonav_preview_stub" } + ResourceIdMappingProviderResourcePatch.resourceMappings.single { it.type == "id" && it.name == "autonav_preview_stub" } val autonavToggleConstIndex = layoutGenMethod.implementation!!.instructions.indexOfFirst { (it as? WideLiteralInstruction)?.wideLiteral == autonavToggle.id } diff --git a/src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/patch/CreateButtonRemoverPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/patch/CreateButtonRemoverPatch.kt index a2d385cbe..12271daf7 100644 --- a/src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/patch/CreateButtonRemoverPatch.kt +++ b/src/main/kotlin/app/revanced/patches/youtube/layout/createbutton/patch/CreateButtonRemoverPatch.kt @@ -39,7 +39,7 @@ class CreateButtonRemoverPatch : BytecodePatch( val implementation = result.mutableMethod.implementation!! val imageOnlyLayout = - ResourceIdMappingProviderResourcePatch.resourceMappings.first { it.type == "layout" && it.name == "image_only_tab" } + ResourceIdMappingProviderResourcePatch.resourceMappings.single { it.type == "layout" && it.name == "image_only_tab" } val imageOnlyLayoutConstIndex = implementation.instructions.indexOfFirst { (it as? WideLiteralInstruction)?.wideLiteral == imageOnlyLayout.id }