[go: nahoru, domu]

Fix parsing of group translateX/Y for VectorDrawable

Test: XmlVectorParserTest.testGroupParsing
Bug: 158636053
Change-Id: Id71d7ef7b3533c75c88de6c83a55a3534d88cc90
diff --git a/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/graphics/vector/compat/XmlVectorParserTest.kt b/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/graphics/vector/compat/XmlVectorParserTest.kt
index ac1c555..2324088 100644
--- a/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/graphics/vector/compat/XmlVectorParserTest.kt
+++ b/ui/ui-core/src/androidAndroidTest/kotlin/androidx/ui/graphics/vector/compat/XmlVectorParserTest.kt
@@ -114,8 +114,16 @@
         val root = asset.root
         assertEquals(1, root.size)
 
+        val delta = 0.001f
         val group = root[0].assertType<VectorGroup>()
         assertEquals(1, group.size)
+        assertEquals(1f, group.pivotX, delta)
+        assertEquals(2f, group.pivotY, delta)
+        assertEquals(3f, group.rotation, delta)
+        assertEquals(4f, group.scaleX, delta)
+        assertEquals(5f, group.scaleY, delta)
+        assertEquals(6f, group.translationX, delta)
+        assertEquals(7f, group.translationY, delta)
 
         val path = group[0].assertType<VectorPath>().pathData
 
diff --git a/ui/ui-core/src/androidAndroidTest/res/drawable/test_compose_vector3.xml b/ui/ui-core/src/androidAndroidTest/res/drawable/test_compose_vector3.xml
index df35290..c7f858a 100644
--- a/ui/ui-core/src/androidAndroidTest/res/drawable/test_compose_vector3.xml
+++ b/ui/ui-core/src/androidAndroidTest/res/drawable/test_compose_vector3.xml
@@ -19,7 +19,14 @@
     android:height="24dp"
     android:viewportHeight="24"
     android:viewportWidth="24">
-    <group>
+    <group
+        android:pivotX="1"
+        android:pivotY="2"
+        android:rotation="3"
+        android:scaleX="4"
+        android:scaleY="5"
+        android:translateX="6"
+        android:translateY="7">
         <clip-path android:pathData="M20,10, 10,0z" />
         <path
             android:fillColor="#FFFF0000"
diff --git a/ui/ui-core/src/androidMain/kotlin/androidx/ui/graphics/vector/compat/XmlVectorParser.kt b/ui/ui-core/src/androidMain/kotlin/androidx/ui/graphics/vector/compat/XmlVectorParser.kt
index 5625834..725e651 100644
--- a/ui/ui-core/src/androidMain/kotlin/androidx/ui/graphics/vector/compat/XmlVectorParser.kt
+++ b/ui/ui-core/src/androidMain/kotlin/androidx/ui/graphics/vector/compat/XmlVectorParser.kt
@@ -377,14 +377,14 @@
     val translateX = TypedArrayUtils.getNamedFloat(
         a,
         this,
-        "translationX",
+        "translateX",
         AndroidVectorResources.STYLEABLE_VECTOR_DRAWABLE_GROUP_TRANSLATE_X,
         DefaultTranslationX
     )
     val translateY = TypedArrayUtils.getNamedFloat(
         a,
         this,
-        "translationY",
+        "translateY",
         AndroidVectorResources.STYLEABLE_VECTOR_DRAWABLE_GROUP_TRANSLATE_Y,
         DefaultTranslationY
     )