From f39b8b769d00aadfb0e18d897f3a8cae74b5a02d Mon Sep 17 00:00:00 2001 From: Michael Ehrmann Date: Wed, 6 May 2020 23:50:42 +0200 Subject: [PATCH] fixed fill rule, updates --- .travis.yml | 1 + src/main/kotlin/lt/neworld/vd2svg/converter/Converter.kt | 1 + src/test/testData/after_aapt/case_03.svg | 2 +- src/test/testData/color_alias/case_01.svg | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8413b0d..ed8c239 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: java +jdk: oraclejdk11 sudo: false # faster builds notifications: diff --git a/src/main/kotlin/lt/neworld/vd2svg/converter/Converter.kt b/src/main/kotlin/lt/neworld/vd2svg/converter/Converter.kt index 2875470..1c46d41 100644 --- a/src/main/kotlin/lt/neworld/vd2svg/converter/Converter.kt +++ b/src/main/kotlin/lt/neworld/vd2svg/converter/Converter.kt @@ -59,6 +59,7 @@ class Converter(val colors: ResourceCollector) { doc.getElementsByTagNameNS(null, "path").iterable.map { it as Element }.forEach { it.attributes.rename(ANDROID_NS, "pathData", SVG_NS, "d") + it.attributes.rename(ANDROID_NS, "fillType", SVG_NS, "fill-rule") it.fix() } diff --git a/src/test/testData/after_aapt/case_03.svg b/src/test/testData/after_aapt/case_03.svg index aa78181..e5d8940 100644 --- a/src/test/testData/after_aapt/case_03.svg +++ b/src/test/testData/after_aapt/case_03.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/src/test/testData/color_alias/case_01.svg b/src/test/testData/color_alias/case_01.svg index 42d4c30..ccca1ea 100644 --- a/src/test/testData/color_alias/case_01.svg +++ b/src/test/testData/color_alias/case_01.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file