finish merge

patches/src/main/kotlin/app/revanced/patches/duolingo/energy/Fingerprints.kt

@@ -7,13 +7,13 @@ import com.android.tools.smali.dexlib2.Opcode
 /**
  * Matches the class found in [energyConfigToStringFingerprint].
  */
-internal val initializeEnergyConfigFingerprint = fingerprint {
+internal val initializeEnergyConfigFingerprint by fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.CONSTRUCTOR)
     opcodes(Opcode.RETURN_VOID)
 }
 
 // Class name currently is not obfuscated but it may be in the future.
-internal val energyConfigToStringFingerprint = fingerprint {
+internal val energyConfigToStringFingerprint by fingerprint {
     parameters()
     returns("Ljava/lang/String;")
     strings("EnergyConfig(", "maxEnergy=") // Partial string matches.

patches/src/main/kotlin/app/revanced/patches/instagram/hide/navigation/Fingerprints.kt

@@ -5,12 +5,12 @@ import app.revanced.patcher.fingerprint
 import app.revanced.patcher.patch.BytecodePatchContext
 import com.android.tools.smali.dexlib2.AccessFlags
 
-internal val initializeNavigationButtonsListFingerprint = fingerprint {
+internal val initializeNavigationButtonsListFingerprint by fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.FINAL)
     parameters("Lcom/instagram/common/session/UserSession;", "Z")
     returns("Ljava/util/List;")
 }
 
-private val navigationButtonsEnumClassDef = fingerprint {
+internal val navigationButtonsEnumClassDef by fingerprint {
     strings("FEED", "fragment_feed", "SEARCH", "fragment_search")
 }

patches/src/main/kotlin/app/revanced/patches/instagram/hide/navigation/HideNavigationButtons.kt

@@ -63,7 +63,7 @@ val hideNavigationButtonsPatch = bytecodePatch(
         with(navigationButtonsEnumInitFingerprint.method) {
             enumNameField = indexOfFirstInstructionOrThrow {
                 opcode == Opcode.IPUT_OBJECT &&
-                        (this as TwoRegisterInstruction).registerA == 2 // The p2 register
+                        (this as TwoRegisterInstruction).registerA == 2 // p2 register.
             }.let {
                 getInstruction(it).getReference<FieldReference>()!!.name
             }

patches/src/main/kotlin/app/revanced/patches/music/layout/compactheader/HideCategoryBar.kt

@@ -8,8 +8,8 @@ import app.revanced.patches.all.misc.resources.addResourcesPatch
 import app.revanced.patches.music.misc.extension.sharedExtensionPatch
 import app.revanced.patches.music.misc.settings.PreferenceScreen
 import app.revanced.patches.music.misc.settings.settingsPatch
-import app.revanced.patches.shared.misc.mapping.get
+import app.revanced.patches.shared.misc.mapping.ResourceType
-import app.revanced.patches.shared.misc.mapping.resourceMappings
+import app.revanced.patches.shared.misc.mapping.getResourceId
 import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
 import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
 
@@ -37,14 +37,14 @@ val hideCategoryBar = bytecodePatch(
     )
 
     execute {
-        chipCloud = resourceMappings["layout", "chip_cloud"]
-
         addResources("music", "layout.compactheader.hideCategoryBar")
 
         PreferenceScreen.GENERAL.addPreferences(
             SwitchPreference("revanced_music_hide_category_bar"),
         )
 
+        chipCloud = getResourceId(ResourceType.LAYOUT, "chip_cloud")
+
         chipCloudFingerprint.method.apply {
             val targetIndex = chipCloudFingerprint.patternMatch!!.endIndex
             val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA

patches/src/main/kotlin/app/revanced/patches/tiktok/misc/share/Fingerprints.kt

@@ -4,7 +4,7 @@ import app.revanced.patcher.fingerprint
 import com.android.tools.smali.dexlib2.AccessFlags
 import com.android.tools.smali.dexlib2.Opcode
 
-internal val urlShorteningFingerprint = fingerprint {
+internal val urlShorteningFingerprint by fingerprint {
     accessFlags(AccessFlags.PUBLIC, AccessFlags.STATIC, AccessFlags.FINAL)
     returns("LX/")
     parameters(