updates

cashapp · May 19, 2023 · a88e7a5 · a88e7a5
1 parent a74506c
commit a88e7a5
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/...zi/src/main/java/app/cash/paparazzi/internal/resources/base/BasicStyleableResourceItem.kt b/...zi/src/main/java/app/cash/paparazzi/internal/resources/base/BasicStyleableResourceItem.kt
@@ -18,11 +18,9 @@ package app.cash.paparazzi.internal.resources.base
 import app.cash.paparazzi.internal.resources.ResourceSourceFile
 import com.android.ide.common.rendering.api.AttrResourceValue
 import com.android.ide.common.rendering.api.StyleableResourceValue
-import com.android.ide.common.resources.ResourceItem
 import com.android.ide.common.resources.ResourceRepository
 import com.android.resources.ResourceType
 import com.android.resources.ResourceVisibility
-import java.util.Collections
 
 /**
  * Ported from: [BasicStyleableResourceItem.java](https://cs.android.com/android-studio/platform/tools/base/+/18047faf69512736b8ddb1f6a6785f58d47c893f:resource-repository/main/java/com/android/resources/base/BasicStyleableResourceItem.java)
@@ -37,8 +35,7 @@ class BasicStyleableResourceItem(
 ) : BasicValueResourceItemBase(ResourceType.STYLEABLE, name, sourceFile, visibility), StyleableResourceValue {
   private val attrs: List<AttrResourceValue> = attrs.toList()
 
-  override fun getAllAttributes(): MutableList<AttrResourceValue> =
-    Collections.unmodifiableList(attrs)
+  override fun getAllAttributes(): List<AttrResourceValue> = attrs
 
   override fun equals(obj: Any?): Boolean {
     if (this === obj) return true
@@ -55,11 +52,10 @@ class BasicStyleableResourceItem(
      */
     fun getCanonicalAttr(attr: AttrResourceValue, repository: ResourceRepository): AttrResourceValue {
       if (attr.formats.isEmpty()) {
-        val items: List<ResourceItem> = repository.getResources(attr.namespace, ResourceType.ATTR, attr.name)
-        for (item in items) {
-          if (item is AttrResourceValue && item.description == attr.description && item.groupName == attr.groupName) {
-            return item
-          }
+        val items = repository.getResources(attr.namespace, ResourceType.ATTR, attr.name)
+        val item = items.filterIsInstance<AttrResourceValue>().find { it.description == attr.description && it.groupName == attr.groupName }
+        if (item != null) {
+          return item
         }
       }
       return attr