fix: test compilation errors

AndroidIDEOfficial · Jul 20, 2024 · fac8ac6 · fac8ac6
1 parent f837b93
commit fac8ac6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git 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
@@ -775,7 +775,7 @@ class ResourceEntry(override val name: String) : IResourceEntry {
   var allowNew: AllowNew? = null
   var overlayable: OverlayableItem? = null
 
-  val values = mutableListOf<ResourceConfigValue>()
+  override val values = mutableListOf<ResourceConfigValue>()
 
   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
@@ -25,5 +25,6 @@ import com.android.aaptcompiler.ResourceConfigValue
  */
 interface IResourceEntry {
   val name: String
+  val values: Collection<ResourceConfigValue>
   fun findValue(config: ConfigDescription, product: String = ""): ResourceConfigValue?
 }
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
@@ -156,7 +156,7 @@ class ResourceTableRegistryTest {
     }
 
     resourceTable!!.findResource(
-      com.android.aaptcompiler.ResourceName(
+      ResourceName(
         pck = "android",
         type = STRING,
         entry = "ok"
@@ -169,15 +169,15 @@ 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")
         }
       }
     }
 
     resourceTable
       .findResource(
-        com.android.aaptcompiler.ResourceName(
+        ResourceName(
           pck = "android",
           type = STRING,
           entry = "cancel"
@@ -191,15 +191,15 @@ 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")
           }
         }
       }
 
     resourceTable
       .findResource(
-        com.android.aaptcompiler.ResourceName(
+        ResourceName(
           pck = "android",
           type = COLOR,
           entry = "holo_red_dark"