feat: make resource mapping patch aware of types (#77)
This commit is contained in:
parent
7519895348
commit
188491a707
|
@ -62,8 +62,8 @@ class GeneralBytecodeAdsPatch : BytecodePatch(
|
|||
"endscreen_element_layout_icon",
|
||||
"promoted_video_item_land",
|
||||
"promoted_video_item_full_bleed",
|
||||
).map {
|
||||
ResourceIdMappingProviderResourcePatch.resourceMappings[it]!!
|
||||
).map { name ->
|
||||
ResourceIdMappingProviderResourcePatch.resourceMappings.first { it.name == name }.id
|
||||
}
|
||||
|
||||
private val stringReferences = arrayOf(
|
||||
|
|
|
@ -38,11 +38,11 @@ class CreateButtonRemoverPatch : BytecodePatch(
|
|||
// Get the required register which holds the view object we need to pass to the method hideCreateButton
|
||||
val implementation = result.mutableMethod.implementation!!
|
||||
|
||||
val imageOnlyLayout = ResourceIdMappingProviderResourcePatch.resourceMappings["image_only_tab"]
|
||||
?: return PatchResultError("Required resource could not be found in the map")
|
||||
val imageOnlyLayout =
|
||||
ResourceIdMappingProviderResourcePatch.resourceMappings.first { it.type == "layout" && it.name == "image_only_tab" }
|
||||
|
||||
val imageOnlyLayoutConstIndex =
|
||||
implementation.instructions.indexOfFirst { (it as? WideLiteralInstruction)?.wideLiteral == imageOnlyLayout }
|
||||
implementation.instructions.indexOfFirst { (it as? WideLiteralInstruction)?.wideLiteral == imageOnlyLayout.id }
|
||||
|
||||
val (instructionIndex, instruction) = implementation.instructions.drop(imageOnlyLayoutConstIndex).withIndex()
|
||||
.first {
|
||||
|
|
|
@ -15,18 +15,20 @@ import org.w3c.dom.Element
|
|||
@Version("0.0.1")
|
||||
class ResourceIdMappingProviderResourcePatch : ResourcePatch() {
|
||||
companion object {
|
||||
internal lateinit var resourceMappings: Map<String, Long>
|
||||
internal lateinit var resourceMappings: List<ResourceElement>
|
||||
private set
|
||||
}
|
||||
|
||||
override fun execute(data: ResourceData): PatchResult {
|
||||
data.xmlEditor["res/values/public.xml"].use { editor ->
|
||||
resourceMappings = buildMap {
|
||||
resourceMappings = buildList {
|
||||
editor.file.documentElement.doRecursively { node ->
|
||||
if (node !is Element) return@doRecursively
|
||||
val nameAttribute = node.getAttribute("name")
|
||||
val typeAttribute = node.getAttribute("type")
|
||||
if (node.nodeName != "public" || nameAttribute.startsWith("APKTOOL")) return@doRecursively
|
||||
this[nameAttribute] = node.getAttribute("id").substring(2).toLong(16)
|
||||
val id = node.getAttribute("id").substring(2).toLong(16)
|
||||
add(ResourceElement(typeAttribute, nameAttribute, id))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -34,3 +36,5 @@ class ResourceIdMappingProviderResourcePatch : ResourcePatch() {
|
|||
return PatchResultSuccess()
|
||||
}
|
||||
}
|
||||
|
||||
data class ResourceElement(val type: String, val name: String, val id: Long)
|
||||
|
|
Loading…
Reference in a new issue