diff --git a/utilities/lookup/build.gradle.kts b/utilities/lookup/build.gradle.kts index 1f05892ea..88f7fcf9c 100644 --- a/utilities/lookup/build.gradle.kts +++ b/utilities/lookup/build.gradle.kts @@ -23,8 +23,6 @@ plugins { id("kotlin-kapt") } - - dependencies { kapt(libs.google.auto.service) diff --git a/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceTable.kt b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceTable.kt index 238d8284f..e9559515b 100644 --- a/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceTable.kt +++ b/xml/aaptcompiler/src/main/java/com/android/aaptcompiler/ResourceTable.kt @@ -775,7 +775,7 @@ class ResourceEntry(override val name: String) : IResourceEntry { var allowNew: AllowNew? = null var overlayable: OverlayableItem? = null - val values = mutableListOf() + override val values = mutableListOf() override fun findValue(config: ConfigDescription, product: String): ResourceConfigValue? { return values.find { it.config == config && it.product == product } diff --git a/xml/resources-api/src/main/java/com/itsaky/androidide/xml/res/IResourceEntry.kt b/xml/resources-api/src/main/java/com/itsaky/androidide/xml/res/IResourceEntry.kt index 50ee5c946..79b105d6d 100644 --- a/xml/resources-api/src/main/java/com/itsaky/androidide/xml/res/IResourceEntry.kt +++ b/xml/resources-api/src/main/java/com/itsaky/androidide/xml/res/IResourceEntry.kt @@ -25,5 +25,6 @@ import com.android.aaptcompiler.ResourceConfigValue */ interface IResourceEntry { val name: String + val values: Collection fun findValue(config: ConfigDescription, product: String = ""): ResourceConfigValue? } \ No newline at end of file diff --git a/xml/utils/src/test/java/com/itsaky/androidide/xml/resources/ResourceTableRegistryTest.kt b/xml/utils/src/test/java/com/itsaky/androidide/xml/resources/ResourceTableRegistryTest.kt index 6fb87e3f2..a9d0a4032 100644 --- a/xml/utils/src/test/java/com/itsaky/androidide/xml/resources/ResourceTableRegistryTest.kt +++ b/xml/utils/src/test/java/com/itsaky/androidide/xml/resources/ResourceTableRegistryTest.kt @@ -156,7 +156,7 @@ class ResourceTableRegistryTest { } resourceTable!!.findResource( - com.android.aaptcompiler.ResourceName( + ResourceName( pck = "android", type = STRING, entry = "ok" @@ -169,7 +169,7 @@ class ResourceTableRegistryTest { assertThat(this).isNotNull() assertThat(this!!.value).isNotNull() this.value.apply { - assertThat(this).isInstanceOf(com.android.aaptcompiler.BasicString::class.java) + assertThat(this).isInstanceOf(BasicString::class.java) assertThat(this.toString()).isEqualTo("OK") } } @@ -177,7 +177,7 @@ class ResourceTableRegistryTest { resourceTable .findResource( - com.android.aaptcompiler.ResourceName( + ResourceName( pck = "android", type = STRING, entry = "cancel" @@ -191,7 +191,7 @@ class ResourceTableRegistryTest { assertThat(this).isNotNull() assertThat(this!!.value).isNotNull() this.value.apply { - assertThat(this).isInstanceOf(com.android.aaptcompiler.BasicString::class.java) + assertThat(this).isInstanceOf(BasicString::class.java) assertThat(this.toString()).isEqualTo("Cancel") } } @@ -199,7 +199,7 @@ class ResourceTableRegistryTest { resourceTable .findResource( - com.android.aaptcompiler.ResourceName( + ResourceName( pck = "android", type = COLOR, entry = "holo_red_dark"