From b0fa8d60af21fdafdef7abc6b7e115f2f80b7165 Mon Sep 17 00:00:00 2001 From: Kirill Grouchnikov Date: Thu, 24 Feb 2022 09:32:19 -0500 Subject: [PATCH] Upgrade to 1.1.0 And start finalizing release 1.1.0 of Aurora --- .gitignore | 4 +- build.gradle.kts | 2 +- .../aurora/demo/svg/random/text.kt | 348 +++++++++++++----- gradle.properties | 2 +- scripts/convert-svg.sh | 4 +- scripts/screenshot/doc-robot-schemes.sh | 4 +- scripts/screenshot/doc-robot-skins-icons.sh | 4 +- scripts/screenshot/doc-robot-skins.sh | 4 +- 8 files changed, 263 insertions(+), 109 deletions(-) diff --git a/.gitignore b/.gitignore index 4775aee4..21b6c790 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,4 @@ build/ out/ bin/ -drop/*-SNAPSHOT/** -drop/*-beta*/** -drop/*-rc*/** +drop/ diff --git a/build.gradle.kts b/build.gradle.kts index 7fa5f4bc..ecd1c075 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath("org.jetbrains.compose:compose-gradle-plugin:1.1.0-rc01") + classpath("org.jetbrains.compose:compose-gradle-plugin:1.1.0") classpath(kotlin("gradle-plugin", version = "1.6.10")) classpath("com.github.ben-manes:gradle-versions-plugin:0.42.0") classpath("com.vanniktech:gradle-maven-publish-plugin:0.18.0") diff --git a/demo/src/desktopMain/kotlin/org/pushingpixels/aurora/demo/svg/random/text.kt b/demo/src/desktopMain/kotlin/org/pushingpixels/aurora/demo/svg/random/text.kt index 2da1904e..bcf1c6ae 100644 --- a/demo/src/desktopMain/kotlin/org/pushingpixels/aurora/demo/svg/random/text.kt +++ b/demo/src/desktopMain/kotlin/org/pushingpixels/aurora/demo/svg/random/text.kt @@ -262,108 +262,264 @@ if (generalPathText == null) { } else { generalPathText!!.reset() } -generalPathText!!.moveTo(90.60547f, 54.21875f) -generalPathText!!.quadraticBezierTo(85.05078f, 55.722656f, 81.14453f, 55.722656f) -generalPathText!!.quadraticBezierTo(74.25f, 55.722656f, 71.353516f, 51.796875f) -generalPathText!!.quadraticBezierTo(68.45703f, 47.871094f, 69.921875f, 40.546875f) -generalPathText!!.quadraticBezierTo(71.359375f, 33.359375f, 75.88867f, 29.365234f) -generalPathText!!.quadraticBezierTo(80.41797f, 25.371094f, 87.15625f, 25.371094f) -generalPathText!!.quadraticBezierTo(91.57031f, 25.371094f, 96.07422f, 26.679688f) -generalPathText!!.lineTo(95.31641f, 30.46875f) -generalPathText!!.quadraticBezierTo(89.74609f, 28.4375f, 86.5625f, 28.4375f) -generalPathText!!.quadraticBezierTo(81.875f, 28.4375f, 78.65039f, 31.621094f) -generalPathText!!.quadraticBezierTo(75.42578f, 34.804688f, 74.26953f, 40.585938f) -generalPathText!!.quadraticBezierTo(73.125f, 46.308594f, 75.26367f, 49.48242f) -generalPathText!!.quadraticBezierTo(77.40234f, 52.65625f, 82.40234f, 52.65625f) -generalPathText!!.quadraticBezierTo(84.453125f, 52.65625f, 86.98047f, 51.933594f) -generalPathText!!.lineTo(88.86328f, 42.51953f) -generalPathText!!.lineTo(92.94531f, 42.51953f) +generalPathText!!.moveTo(93.78906f, 27.910156f) +generalPathText!!.lineTo(91.81641f, 36.25f) +generalPathText!!.lineTo(91.07422f, 36.25f) +generalPathText!!.quadraticBezierTo(91.25f, 34.785156f, 91.25f, 34.08203f) +generalPathText!!.quadraticBezierTo(91.25f, 32.16797f, 89.56055f, 30.69336f) +generalPathText!!.quadraticBezierTo(87.87109f, 29.21875f, 84.90234f, 29.21875f) +generalPathText!!.quadraticBezierTo(78.828125f, 29.21875f, 74.98047f, 34.921875f) +generalPathText!!.quadraticBezierTo(71.91406f, 39.433594f, 71.91406f, 45.01953f) +generalPathText!!.quadraticBezierTo(71.91406f, 48.73047f, 73.80859f, 51.42578f) +generalPathText!!.quadraticBezierTo(75.703125f, 54.121094f, 79.64844f, 54.121094f) +generalPathText!!.quadraticBezierTo(80.625f, 54.121094f, 81.49414f, 53.945312f) +generalPathText!!.quadraticBezierTo(82.36328f, 53.76953f, 84.12109f, 53.164062f) +generalPathText!!.lineTo(86.05469f, 46.347656f) +generalPathText!!.quadraticBezierTo(86.46484f, 44.941406f, 86.46484f, 44.101562f) +generalPathText!!.quadraticBezierTo(86.46484f, 43.398438f, 85.95703f, 43.027344f) +generalPathText!!.quadraticBezierTo(85.13672f, 42.460938f, 83.30078f, 42.460938f) +generalPathText!!.lineTo(82.75391f, 42.460938f) +generalPathText!!.lineTo(82.96875f, 41.69922f) +generalPathText!!.lineTo(93.984375f, 41.69922f) +generalPathText!!.lineTo(93.78906f, 42.460938f) +generalPathText!!.quadraticBezierTo(92.28516f, 42.48047f, 91.60156f, 42.8125f) +generalPathText!!.quadraticBezierTo(90.91797f, 43.14453f, 90.42969f, 43.945312f) +generalPathText!!.quadraticBezierTo(90.09766f, 44.472656f, 89.35547f, 47.01172f) +generalPathText!!.lineTo(87.40234f, 53.710938f) +generalPathText!!.quadraticBezierTo(84.72656f, 54.86328f, 83.08594f, 55.24414f) +generalPathText!!.quadraticBezierTo(81.44531f, 55.625f, 79.62891f, 55.625f) +generalPathText!!.quadraticBezierTo(75.44922f, 55.625f, 72.85156f, 54.052734f) +generalPathText!!.quadraticBezierTo(70.25391f, 52.48047f, 69.01367f, 49.89258f) +generalPathText!!.quadraticBezierTo(67.77344f, 47.304688f, 67.77344f, 44.746094f) +generalPathText!!.quadraticBezierTo(67.77344f, 41.308594f, 69.21875f, 38.21289f) +generalPathText!!.quadraticBezierTo(70.66406f, 35.117188f, 72.822266f, 32.978516f) +generalPathText!!.quadraticBezierTo(74.98047f, 30.839844f, 77.51953f, 29.609375f) +generalPathText!!.quadraticBezierTo(81.015625f, 27.910156f, 84.86328f, 27.910156f) +generalPathText!!.quadraticBezierTo(87.69531f, 27.910156f, 89.98047f, 28.847656f) +generalPathText!!.quadraticBezierTo(90.89844f, 29.21875f, 91.328125f, 29.21875f) +generalPathText!!.quadraticBezierTo(91.81641f, 29.21875f, 92.1582f, 28.99414f) +generalPathText!!.quadraticBezierTo(92.5f, 28.769531f, 93.046875f, 27.910156f) generalPathText!!.close() -generalPathText!!.moveTo(97.75391f, 55.0f) -generalPathText!!.lineTo(101.99609f, 33.789062f) -generalPathText!!.lineTo(105.84375f, 33.789062f) -generalPathText!!.lineTo(105.046875f, 37.773438f) -generalPathText!!.quadraticBezierTo(108.22266f, 33.320312f, 112.578125f, 33.320312f) -generalPathText!!.quadraticBezierTo(113.16406f, 33.320312f, 113.78906f, 33.41797f) -generalPathText!!.lineTo(113.07031f, 37.01172f) -generalPathText!!.quadraticBezierTo(112.140625f, 36.679688f, 111.37891f, 36.679688f) -generalPathText!!.quadraticBezierTo(107.72656f, 36.679688f, 104.39844f, 41.015625f) -generalPathText!!.lineTo(101.60156f, 55.0f) +generalPathText!!.moveTo(95.97656f, 38.41797f) +generalPathText!!.lineTo(102.71484f, 37.32422f) +generalPathText!!.lineTo(99.90234f, 46.816406f) +generalPathText!!.quadraticBezierTo(103.32031f, 40.976562f, 106.11328f, 38.652344f) +generalPathText!!.quadraticBezierTo(107.69531f, 37.32422f, 108.69141f, 37.32422f) +generalPathText!!.quadraticBezierTo(109.33594f, 37.32422f, 109.70703f, 37.70508f) +generalPathText!!.quadraticBezierTo(110.078125f, 38.085938f, 110.078125f, 38.808594f) +generalPathText!!.quadraticBezierTo(110.078125f, 40.097656f, 109.41406f, 41.26953f) +generalPathText!!.quadraticBezierTo(108.94531f, 42.148438f, 108.06641f, 42.148438f) +generalPathText!!.quadraticBezierTo(107.61719f, 42.148438f, 107.29492f, 41.85547f) +generalPathText!!.quadraticBezierTo(106.97266f, 41.5625f, 106.89453f, 40.95703f) +generalPathText!!.quadraticBezierTo(106.85547f, 40.585938f, 106.71875f, 40.46875f) +generalPathText!!.quadraticBezierTo(106.5625f, 40.3125f, 106.34766f, 40.3125f) +generalPathText!!.quadraticBezierTo(106.015625f, 40.3125f, 105.72266f, 40.46875f) +generalPathText!!.quadraticBezierTo(105.21484f, 40.742188f, 104.17969f, 41.992188f) +generalPathText!!.quadraticBezierTo(102.55859f, 43.90625f, 100.66406f, 46.953125f) +generalPathText!!.quadraticBezierTo(99.84375f, 48.242188f, 99.25781f, 49.86328f) +generalPathText!!.quadraticBezierTo(98.4375f, 52.089844f, 98.32031f, 52.539062f) +generalPathText!!.lineTo(97.69531f, 55.0f) +generalPathText!!.lineTo(94.70703f, 55.0f) +generalPathText!!.lineTo(98.32031f, 42.871094f) +generalPathText!!.quadraticBezierTo(98.94531f, 40.76172f, 98.94531f, 39.86328f) +generalPathText!!.quadraticBezierTo(98.94531f, 39.51172f, 98.65234f, 39.277344f) +generalPathText!!.quadraticBezierTo(98.26172f, 38.964844f, 97.61719f, 38.964844f) +generalPathText!!.quadraticBezierTo(97.20703f, 38.964844f, 96.11328f, 39.140625f) generalPathText!!.close() -generalPathText!!.moveTo(127.38281f, 55.0f) -generalPathText!!.lineTo(128.17969f, 51.015625f) -generalPathText!!.quadraticBezierTo(124.21875f, 55.48828f, 119.84375f, 55.48828f) -generalPathText!!.quadraticBezierTo(117.07031f, 55.48828f, 115.7793f, 53.740234f) -generalPathText!!.quadraticBezierTo(114.48828f, 51.992188f, 115.08203f, 49.023438f) -generalPathText!!.lineTo(118.12891f, 33.789062f) -generalPathText!!.lineTo(121.97656f, 33.789062f) -generalPathText!!.lineTo(119.17969f, 47.773438f) -generalPathText!!.quadraticBezierTo(118.703125f, 50.15625f, 119.19531f, 51.16211f) -generalPathText!!.quadraticBezierTo(119.6875f, 52.16797f, 121.30859f, 52.16797f) -generalPathText!!.quadraticBezierTo(124.82422f, 52.16797f, 128.875f, 47.539062f) -generalPathText!!.lineTo(131.625f, 33.789062f) -generalPathText!!.lineTo(135.47266f, 33.789062f) -generalPathText!!.lineTo(131.23047f, 55.0f) +generalPathText!!.moveTo(128.28125f, 37.79297f) +generalPathText!!.lineTo(124.88281f, 49.433594f) +generalPathText!!.quadraticBezierTo(124.12109f, 52.03125f, 124.12109f, 52.714844f) +generalPathText!!.quadraticBezierTo(124.12109f, 53.066406f, 124.24805f, 53.23242f) +generalPathText!!.quadraticBezierTo(124.375f, 53.398438f, 124.58984f, 53.398438f) +generalPathText!!.quadraticBezierTo(124.921875f, 53.398438f, 125.322266f, 53.095703f) +generalPathText!!.quadraticBezierTo(125.72266f, 52.79297f, 127.34375f, 50.683594f) +generalPathText!!.lineTo(127.92969f, 51.132812f) +generalPathText!!.quadraticBezierTo(126.38672f, 53.57422f, 124.765625f, 54.726562f) +generalPathText!!.quadraticBezierTo(123.69141f, 55.46875f, 122.69531f, 55.46875f) +generalPathText!!.quadraticBezierTo(121.93359f, 55.46875f, 121.50391f, 55.039062f) +generalPathText!!.quadraticBezierTo(121.07422f, 54.609375f, 121.07422f, 53.92578f) +generalPathText!!.quadraticBezierTo(121.07422f, 53.26172f, 121.328125f, 52.16797f) +generalPathText!!.quadraticBezierTo(121.640625f, 50.722656f, 123.10547f, 45.878906f) +generalPathText!!.quadraticBezierTo(119.78516f, 51.328125f, 117.54883f, 53.398438f) +generalPathText!!.quadraticBezierTo(115.3125f, 55.46875f, 113.39844f, 55.46875f) +generalPathText!!.quadraticBezierTo(112.5f, 55.46875f, 111.875f, 54.84375f) +generalPathText!!.quadraticBezierTo(111.25f, 54.21875f, 111.25f, 53.26172f) +generalPathText!!.quadraticBezierTo(111.25f, 51.796875f, 112.109375f, 48.76953f) +generalPathText!!.lineTo(113.80859f, 42.734375f) +generalPathText!!.quadraticBezierTo(114.43359f, 40.566406f, 114.43359f, 40.039062f) +generalPathText!!.quadraticBezierTo(114.43359f, 39.804688f, 114.26758f, 39.63867f) +generalPathText!!.quadraticBezierTo(114.10156f, 39.472656f, 113.90625f, 39.472656f) +generalPathText!!.quadraticBezierTo(113.49609f, 39.472656f, 113.08594f, 39.765625f) +generalPathText!!.quadraticBezierTo(112.67578f, 40.058594f, 111.23047f, 41.933594f) +generalPathText!!.lineTo(110.625f, 41.503906f) +generalPathText!!.quadraticBezierTo(112.08984f, 39.23828f, 113.73047f, 38.164062f) +generalPathText!!.quadraticBezierTo(114.98047f, 37.32422f, 116.03516f, 37.32422f) +generalPathText!!.quadraticBezierTo(116.75781f, 37.32422f, 117.2168f, 37.783203f) +generalPathText!!.quadraticBezierTo(117.67578f, 38.242188f, 117.67578f, 38.964844f) +generalPathText!!.quadraticBezierTo(117.67578f, 40.01953f, 116.89453f, 42.734375f) +generalPathText!!.lineTo(115.05859f, 49.04297f) +generalPathText!!.quadraticBezierTo(114.296875f, 51.621094f, 114.296875f, 52.304688f) +generalPathText!!.quadraticBezierTo(114.296875f, 52.67578f, 114.541016f, 52.90039f) +generalPathText!!.quadraticBezierTo(114.78516f, 53.125f, 115.19531f, 53.125f) +generalPathText!!.quadraticBezierTo(115.83984f, 53.125f, 116.875f, 52.48047f) +generalPathText!!.quadraticBezierTo(117.91016f, 51.835938f, 119.63867f, 49.61914f) +generalPathText!!.quadraticBezierTo(121.36719f, 47.402344f, 122.490234f, 45.458984f) +generalPathText!!.quadraticBezierTo(123.61328f, 43.515625f, 124.88281f, 39.277344f) +generalPathText!!.lineTo(125.3125f, 37.79297f) generalPathText!!.close() -generalPathText!!.moveTo(138.94531f, 55.0f) -generalPathText!!.lineTo(143.1875f, 33.789062f) -generalPathText!!.lineTo(147.03516f, 33.789062f) -generalPathText!!.lineTo(146.23828f, 37.773438f) -generalPathText!!.quadraticBezierTo(149.9414f, 33.320312f, 154.35547f, 33.320312f) -generalPathText!!.quadraticBezierTo(158.61328f, 33.320312f, 159.26562f, 37.773438f) -generalPathText!!.quadraticBezierTo(162.89453f, 33.30078f, 167.26953f, 33.30078f) -generalPathText!!.quadraticBezierTo(170.08203f, 33.30078f, 171.29492f, 34.95117f) -generalPathText!!.quadraticBezierTo(172.50781f, 36.601562f, 171.91406f, 39.570312f) -generalPathText!!.lineTo(168.82812f, 55.0f) -generalPathText!!.lineTo(164.96094f, 55.0f) -generalPathText!!.lineTo(167.92578f, 40.17578f) -generalPathText!!.quadraticBezierTo(168.65234f, 36.54297f, 165.78125f, 36.54297f) -generalPathText!!.quadraticBezierTo(162.79297f, 36.54297f, 158.66406f, 40.78125f) -generalPathText!!.lineTo(155.82031f, 55.0f) -generalPathText!!.lineTo(151.95312f, 55.0f) -generalPathText!!.lineTo(154.91797f, 40.17578f) -generalPathText!!.quadraticBezierTo(155.64844f, 36.523438f, 152.71875f, 36.523438f) -generalPathText!!.quadraticBezierTo(149.8086f, 36.523438f, 145.63672f, 40.78125f) -generalPathText!!.lineTo(142.79297f, 55.0f) +generalPathText!!.moveTo(138.125f, 37.32422f) +generalPathText!!.lineTo(135.58594f, 46.132812f) +generalPathText!!.quadraticBezierTo(137.28516f, 43.027344f, 138.47656f, 41.464844f) +generalPathText!!.quadraticBezierTo(140.33203f, 39.04297f, 142.08984f, 37.94922f) +generalPathText!!.quadraticBezierTo(143.125f, 37.32422f, 144.25781f, 37.32422f) +generalPathText!!.quadraticBezierTo(145.23438f, 37.32422f, 145.8789f, 37.94922f) +generalPathText!!.quadraticBezierTo(146.52344f, 38.57422f, 146.52344f, 39.55078f) +generalPathText!!.quadraticBezierTo(146.52344f, 40.507812f, 146.07422f, 42.05078f) +generalPathText!!.lineTo(144.6875f, 47.01172f) +generalPathText!!.quadraticBezierTo(147.8711f, 41.054688f, 150.72266f, 38.652344f) +generalPathText!!.quadraticBezierTo(152.30469f, 37.32422f, 153.84766f, 37.32422f) +generalPathText!!.quadraticBezierTo(154.7461f, 37.32422f, 155.32227f, 37.939453f) +generalPathText!!.quadraticBezierTo(155.89844f, 38.554688f, 155.89844f, 39.84375f) +generalPathText!!.quadraticBezierTo(155.89844f, 40.976562f, 155.54688f, 42.246094f) +generalPathText!!.lineTo(153.39844f, 49.84375f) +generalPathText!!.quadraticBezierTo(152.69531f, 52.32422f, 152.69531f, 52.597656f) +generalPathText!!.quadraticBezierTo(152.69531f, 52.871094f, 152.8711f, 53.066406f) +generalPathText!!.quadraticBezierTo(152.98828f, 53.203125f, 153.1836f, 53.203125f) +generalPathText!!.quadraticBezierTo(153.3789f, 53.203125f, 153.86719f, 52.83203f) +generalPathText!!.quadraticBezierTo(154.98047f, 51.972656f, 155.95703f, 50.566406f) +generalPathText!!.lineTo(156.60156f, 50.976562f) +generalPathText!!.quadraticBezierTo(156.11328f, 51.757812f, 154.87305f, 53.125f) +generalPathText!!.quadraticBezierTo(153.63281f, 54.492188f, 152.7539f, 54.98047f) +generalPathText!!.quadraticBezierTo(151.875f, 55.46875f, 151.13281f, 55.46875f) +generalPathText!!.quadraticBezierTo(150.44922f, 55.46875f, 149.99023f, 55.0f) +generalPathText!!.quadraticBezierTo(149.53125f, 54.53125f, 149.53125f, 53.847656f) +generalPathText!!.quadraticBezierTo(149.53125f, 52.910156f, 150.33203f, 50.078125f) +generalPathText!!.lineTo(152.10938f, 43.808594f) +generalPathText!!.quadraticBezierTo(152.71484f, 41.640625f, 152.7539f, 41.40625f) +generalPathText!!.quadraticBezierTo(152.8125f, 41.035156f, 152.8125f, 40.683594f) +generalPathText!!.quadraticBezierTo(152.8125f, 40.195312f, 152.59766f, 39.921875f) +generalPathText!!.quadraticBezierTo(152.36328f, 39.648438f, 152.07031f, 39.648438f) +generalPathText!!.quadraticBezierTo(151.25f, 39.648438f, 150.33203f, 40.48828f) +generalPathText!!.quadraticBezierTo(147.63672f, 42.96875f, 145.29297f, 47.441406f) +generalPathText!!.quadraticBezierTo(143.75f, 50.390625f, 142.40234f, 55.0f) +generalPathText!!.lineTo(139.45312f, 55.0f) +generalPathText!!.lineTo(142.79297f, 43.183594f) +generalPathText!!.quadraticBezierTo(143.33984f, 41.26953f, 143.33984f, 40.625f) +generalPathText!!.quadraticBezierTo(143.33984f, 40.097656f, 143.125f, 39.84375f) +generalPathText!!.quadraticBezierTo(142.91016f, 39.589844f, 142.59766f, 39.589844f) +generalPathText!!.quadraticBezierTo(141.95312f, 39.589844f, 141.23047f, 40.058594f) +generalPathText!!.quadraticBezierTo(140.0586f, 40.820312f, 138.21289f, 43.320312f) +generalPathText!!.quadraticBezierTo(136.36719f, 45.820312f, 135.35156f, 48.10547f) +generalPathText!!.quadraticBezierTo(134.86328f, 49.179688f, 133.02734f, 55.0f) +generalPathText!!.lineTo(130.13672f, 55.0f) +generalPathText!!.lineTo(133.75f, 42.34375f) +generalPathText!!.lineTo(134.21875f, 40.703125f) +generalPathText!!.quadraticBezierTo(134.35547f, 40.33203f, 134.35547f, 40.15625f) +generalPathText!!.quadraticBezierTo(134.35547f, 39.726562f, 133.96484f, 39.384766f) +generalPathText!!.quadraticBezierTo(133.57422f, 39.04297f, 132.96875f, 39.04297f) +generalPathText!!.quadraticBezierTo(132.71484f, 39.04297f, 131.5625f, 39.277344f) +generalPathText!!.lineTo(131.38672f, 38.554688f) generalPathText!!.close() -generalPathText!!.moveTo(174.7461f, 62.714844f) -generalPathText!!.lineTo(180.53125f, 33.789062f) -generalPathText!!.lineTo(184.3789f, 33.789062f) -generalPathText!!.lineTo(183.58203f, 37.773438f) -generalPathText!!.quadraticBezierTo(186.83594f, 33.320312f, 191.5625f, 33.320312f) -generalPathText!!.quadraticBezierTo(195.39062f, 33.320312f, 197.0293f, 36.11328f) -generalPathText!!.quadraticBezierTo(198.66797f, 38.90625f, 197.69922f, 43.75f) -generalPathText!!.quadraticBezierTo(196.64453f, 49.023438f, 193.50781f, 52.25586f) -generalPathText!!.quadraticBezierTo(190.3711f, 55.48828f, 186.3086f, 55.48828f) -generalPathText!!.quadraticBezierTo(182.53906f, 55.48828f, 180.61719f, 52.597656f) -generalPathText!!.lineTo(178.59375f, 62.714844f) +generalPathText!!.moveTo(167.1875f, 37.32422f) +generalPathText!!.lineTo(165.83984f, 41.816406f) +generalPathText!!.quadraticBezierTo(167.96875f, 39.316406f, 169.63867f, 38.320312f) +generalPathText!!.quadraticBezierTo(171.3086f, 37.32422f, 173.04688f, 37.32422f) +generalPathText!!.quadraticBezierTo(174.78516f, 37.32422f, 176.01562f, 38.70117f) +generalPathText!!.quadraticBezierTo(177.2461f, 40.078125f, 177.2461f, 42.285156f) +generalPathText!!.quadraticBezierTo(177.2461f, 46.58203f, 173.75f, 51.02539f) +generalPathText!!.quadraticBezierTo(170.2539f, 55.46875f, 165.60547f, 55.46875f) +generalPathText!!.quadraticBezierTo(164.6289f, 55.46875f, 163.87695f, 55.253906f) +generalPathText!!.quadraticBezierTo(163.125f, 55.039062f, 162.1875f, 54.492188f) +generalPathText!!.lineTo(160.76172f, 59.53125f) +generalPathText!!.quadraticBezierTo(160.33203f, 61.015625f, 160.33203f, 61.464844f) +generalPathText!!.quadraticBezierTo(160.33203f, 61.89453f, 160.55664f, 62.197266f) +generalPathText!!.quadraticBezierTo(160.78125f, 62.5f, 161.28906f, 62.666016f) +generalPathText!!.quadraticBezierTo(161.79688f, 62.83203f, 163.30078f, 62.83203f) +generalPathText!!.lineTo(163.125f, 63.554688f) +generalPathText!!.lineTo(153.92578f, 63.554688f) +generalPathText!!.lineTo(154.1211f, 62.83203f) +generalPathText!!.quadraticBezierTo(155.9375f, 62.753906f, 156.57227f, 62.20703f) +generalPathText!!.quadraticBezierTo(157.20703f, 61.660156f, 157.91016f, 59.179688f) +generalPathText!!.lineTo(162.85156f, 42.070312f) +generalPathText!!.quadraticBezierTo(163.30078f, 40.44922f, 163.30078f, 40.058594f) +generalPathText!!.quadraticBezierTo(163.30078f, 39.53125f, 162.99805f, 39.23828f) +generalPathText!!.quadraticBezierTo(162.69531f, 38.945312f, 162.07031f, 38.945312f) +generalPathText!!.quadraticBezierTo(161.5039f, 38.945312f, 160.48828f, 39.08203f) +generalPathText!!.lineTo(160.48828f, 38.320312f) generalPathText!!.close() -generalPathText!!.moveTo(181.14844f, 49.941406f) -generalPathText!!.quadraticBezierTo(183.58594f, 52.597656f, 186.28125f, 52.597656f) -generalPathText!!.quadraticBezierTo(191.82812f, 52.597656f, 193.51953f, 44.140625f) -generalPathText!!.quadraticBezierTo(195.01172f, 36.679688f, 190.08984f, 36.679688f) -generalPathText!!.quadraticBezierTo(186.86719f, 36.679688f, 183.10156f, 40.17578f) +generalPathText!!.moveTo(162.63672f, 52.94922f) +generalPathText!!.quadraticBezierTo(163.84766f, 54.39453f, 165.89844f, 54.39453f) +generalPathText!!.quadraticBezierTo(166.91406f, 54.39453f, 167.96875f, 53.828125f) +generalPathText!!.quadraticBezierTo(169.02344f, 53.26172f, 170.0293f, 52.148438f) +generalPathText!!.quadraticBezierTo(171.03516f, 51.035156f, 171.83594f, 49.58008f) +generalPathText!!.quadraticBezierTo(172.63672f, 48.125f, 173.27148f, 46.152344f) +generalPathText!!.quadraticBezierTo(173.90625f, 44.179688f, 173.90625f, 42.246094f) +generalPathText!!.quadraticBezierTo(173.90625f, 40.683594f, 173.19336f, 39.853516f) +generalPathText!!.quadraticBezierTo(172.48047f, 39.023438f, 171.52344f, 39.023438f) +generalPathText!!.quadraticBezierTo(169.41406f, 39.023438f, 167.35352f, 41.445312f) +generalPathText!!.quadraticBezierTo(165.29297f, 43.867188f, 164.33594f, 47.109375f) generalPathText!!.close() -generalPathText!!.moveTo(201.15234f, 62.714844f) -generalPathText!!.lineTo(206.13281f, 55.0f) -generalPathText!!.lineTo(202.17188f, 33.789062f) -generalPathText!!.lineTo(206.33203f, 33.789062f) -generalPathText!!.lineTo(209.21094f, 49.765625f) -generalPathText!!.lineTo(218.89062f, 33.789062f) -generalPathText!!.lineTo(222.52344f, 33.789062f) -generalPathText!!.lineTo(205.15625f, 62.714844f) +generalPathText!!.moveTo(184.72656f, 37.32422f) +generalPathText!!.quadraticBezierTo(185.39062f, 38.45703f, 185.64453f, 39.44336f) +generalPathText!!.quadraticBezierTo(185.89844f, 40.429688f, 186.15234f, 43.320312f) +generalPathText!!.lineTo(187.01172f, 52.929688f) +generalPathText!!.quadraticBezierTo(188.1836f, 51.523438f, 190.41016f, 48.476562f) +generalPathText!!.quadraticBezierTo(191.48438f, 46.992188f, 193.0664f, 44.433594f) +generalPathText!!.quadraticBezierTo(194.02344f, 42.871094f, 194.23828f, 42.246094f) +generalPathText!!.quadraticBezierTo(194.35547f, 41.933594f, 194.35547f, 41.601562f) +generalPathText!!.quadraticBezierTo(194.35547f, 41.38672f, 194.21875f, 41.25f) +generalPathText!!.quadraticBezierTo(194.08203f, 41.11328f, 193.50586f, 40.927734f) +generalPathText!!.quadraticBezierTo(192.92969f, 40.742188f, 192.54883f, 40.24414f) +generalPathText!!.quadraticBezierTo(192.16797f, 39.746094f, 192.16797f, 39.101562f) +generalPathText!!.quadraticBezierTo(192.16797f, 38.30078f, 192.63672f, 37.8125f) +generalPathText!!.quadraticBezierTo(193.10547f, 37.32422f, 193.8086f, 37.32422f) +generalPathText!!.quadraticBezierTo(194.66797f, 37.32422f, 195.27344f, 38.03711f) +generalPathText!!.quadraticBezierTo(195.8789f, 38.75f, 195.8789f, 40.0f) +generalPathText!!.quadraticBezierTo(195.8789f, 41.54297f, 194.82422f, 43.52539f) +generalPathText!!.quadraticBezierTo(193.76953f, 45.507812f, 190.76172f, 49.609375f) +generalPathText!!.quadraticBezierTo(187.7539f, 53.710938f, 183.47656f, 58.554688f) +generalPathText!!.quadraticBezierTo(180.52734f, 61.89453f, 179.10156f, 62.76367f) +generalPathText!!.quadraticBezierTo(177.67578f, 63.632812f, 176.66016f, 63.632812f) +generalPathText!!.quadraticBezierTo(176.05469f, 63.632812f, 175.5957f, 63.17383f) +generalPathText!!.quadraticBezierTo(175.13672f, 62.714844f, 175.13672f, 62.109375f) +generalPathText!!.quadraticBezierTo(175.13672f, 61.347656f, 175.77148f, 60.722656f) +generalPathText!!.quadraticBezierTo(176.40625f, 60.097656f, 177.14844f, 60.097656f) +generalPathText!!.quadraticBezierTo(177.53906f, 60.097656f, 177.79297f, 60.273438f) +generalPathText!!.quadraticBezierTo(177.94922f, 60.371094f, 178.13477f, 60.83008f) +generalPathText!!.quadraticBezierTo(178.32031f, 61.289062f, 178.47656f, 61.445312f) +generalPathText!!.quadraticBezierTo(178.57422f, 61.54297f, 178.71094f, 61.54297f) +generalPathText!!.quadraticBezierTo(178.82812f, 61.54297f, 179.1211f, 61.347656f) +generalPathText!!.quadraticBezierTo(180.19531f, 60.683594f, 181.6211f, 59.23828f) +generalPathText!!.quadraticBezierTo(183.4961f, 57.32422f, 184.39453f, 56.11328f) +generalPathText!!.lineTo(183.30078f, 43.73047f) +generalPathText!!.quadraticBezierTo(183.02734f, 40.664062f, 182.48047f, 40.0f) +generalPathText!!.quadraticBezierTo(181.9336f, 39.335938f, 180.64453f, 39.335938f) +generalPathText!!.quadraticBezierTo(180.23438f, 39.335938f, 179.17969f, 39.453125f) +generalPathText!!.lineTo(179.0039f, 38.73047f) generalPathText!!.close() -generalPathText!!.moveTo(222.91016f, 55.0f) -generalPathText!!.lineTo(223.67969f, 51.152344f) -generalPathText!!.lineTo(227.52734f, 51.152344f) -generalPathText!!.lineTo(226.75781f, 55.0f) +generalPathText!!.moveTo(202.40234f, 48.554688f) +generalPathText!!.lineTo(201.66016f, 48.554688f) +generalPathText!!.quadraticBezierTo(202.61719f, 45.01953f, 203.00781f, 43.154297f) +generalPathText!!.quadraticBezierTo(203.39844f, 41.289062f, 203.88672f, 38.28125f) +generalPathText!!.quadraticBezierTo(204.86328f, 32.070312f, 205.07812f, 31.035156f) +generalPathText!!.quadraticBezierTo(205.46875f, 29.277344f, 206.34766f, 28.359375f) +generalPathText!!.quadraticBezierTo(206.75781f, 27.910156f, 207.48047f, 27.910156f) +generalPathText!!.quadraticBezierTo(208.02734f, 27.910156f, 208.4082f, 28.339844f) +generalPathText!!.quadraticBezierTo(208.78906f, 28.769531f, 208.78906f, 29.492188f) +generalPathText!!.quadraticBezierTo(208.78906f, 30.292969f, 208.41797f, 31.523438f) +generalPathText!!.quadraticBezierTo(207.61719f, 34.21875f, 205.2539f, 40.371094f) +generalPathText!!.quadraticBezierTo(204.1211f, 43.28125f, 204.0039f, 43.61328f) +generalPathText!!.quadraticBezierTo(203.63281f, 44.70703f, 202.40234f, 48.554688f) generalPathText!!.close() -generalPathText!!.moveTo(224.9414f, 47.285156f) -generalPathText!!.lineTo(227.53516f, 31.875f) -generalPathText!!.lineTo(228.6914f, 26.09375f) -generalPathText!!.lineTo(232.53906f, 26.09375f) -generalPathText!!.lineTo(231.38281f, 31.875f) -generalPathText!!.lineTo(227.83203f, 47.285156f) +generalPathText!!.moveTo(201.09375f, 51.640625f) +generalPathText!!.quadraticBezierTo(201.9336f, 51.640625f, 202.51953f, 52.226562f) +generalPathText!!.quadraticBezierTo(203.10547f, 52.8125f, 203.10547f, 53.652344f) +generalPathText!!.quadraticBezierTo(203.10547f, 54.472656f, 202.51953f, 55.058594f) +generalPathText!!.quadraticBezierTo(201.9336f, 55.64453f, 201.09375f, 55.64453f) +generalPathText!!.quadraticBezierTo(200.27344f, 55.64453f, 199.6875f, 55.058594f) +generalPathText!!.quadraticBezierTo(199.10156f, 54.472656f, 199.10156f, 53.652344f) +generalPathText!!.quadraticBezierTo(199.10156f, 52.8125f, 199.6875f, 52.226562f) +generalPathText!!.quadraticBezierTo(200.27344f, 51.640625f, 201.09375f, 51.640625f) generalPathText!!.close() shapeText = Outline.Generic(generalPathText!!) drawOutline(outline = shapeText!!, style = Fill, brush=brush!!, alpha = alphaText, blendMode = blendModeText) @@ -417,7 +573,7 @@ blendMode = blendModeStack.removeAt(0) * @return The width of the bounding box of the original SVG image. */ fun getOrigWidth(): Double { - return 0.8805277943611145 + return 0.7815694808959961 } /** @@ -426,7 +582,7 @@ blendMode = blendModeStack.removeAt(0) * @return The height of the bounding box of the original SVG image. */ fun getOrigHeight(): Double { - return 0.1958618313074112 + return 0.1996866911649704 } diff --git a/gradle.properties b/gradle.properties index 49db19a5..dae1ef33 100755 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx2048m kotlin.code.style=official GROUP=org.pushing-pixels -VERSION_NAME=1.1-SNAPSHOT +VERSION_NAME=1.1.0 VERSION_CODENAME=Blizzard POM_DESCRIPTION=Building modern, elegant and fast Compose Desktop applications diff --git a/scripts/convert-svg.sh b/scripts/convert-svg.sh index 99aa0482..f4d0873f 100755 --- a/scripts/convert-svg.sh +++ b/scripts/convert-svg.sh @@ -16,10 +16,10 @@ export JAVA_HOME=`/usr/libexec/java_home -v 11` alias JAVA="java" -AURORA_VERSION=1.1-SNAPSHOT +AURORA_VERSION=1.1.0 KOTLIN_VERSION=1.6.10 KOTLIN_COROUTINES_VERSION=1.6.0 -COMPOSE_VERSION=1.0.1 +COMPOSE_VERSION=1.1.0 CLASSPATH=../drop/$AURORA_VERSION/aurora-svg-transcoder-desktop-$AURORA_VERSION.jar:../build/libs/batik-all-1.14.jar:../build/libs/xml-apis-1.4.01.jar:../build/libs/xml-apis-ext-1.3.04.jar:../build/libs/xmlgraphics-commons-2.6.jar:../build/libs/kotlin-stdlib-$KOTLIN_VERSION.jar:../build/libs/kotlin-stdlib-common-$KOTLIN_VERSION.jar:../build/libs/kotlinx-coroutines-core-jvm-$KOTLIN_COROUTINES_VERSION.jar:../build/libs/ui-graphics-desktop-$COMPOSE_VERSION.jar:../build/libs/ui-geometry-desktop-$COMPOSE_VERSION.jar # Don't convert the demo transcoding to deep traversal since one of the diff --git a/scripts/screenshot/doc-robot-schemes.sh b/scripts/screenshot/doc-robot-schemes.sh index d81cc65c..73ebd1f2 100755 --- a/scripts/screenshot/doc-robot-schemes.sh +++ b/scripts/screenshot/doc-robot-schemes.sh @@ -16,10 +16,10 @@ export JAVA_HOME=`/usr/libexec/java_home -v 11` alias JAVA="java" -AURORA_VERSION=1.1-SNAPSHOT +AURORA_VERSION=1.1.0 KOTLIN_VERSION=1.6.10 KOTLIN_COROUTINES_VERSION=1.6.0 -COMPOSE_VERSION=1.0.1-rc2 +COMPOSE_VERSION=1.1.0 CLASSPATH=../../drop/$AURORA_VERSION/aurora-screenshot-desktop-$AURORA_VERSION.jar:../../demo/build/libs/aurora-demo-desktop.jar:../build/libs/:../../build/libs/* java -cp $CLASSPATH org.pushingpixels.aurora.tools.screenshot.theming.schemes.AuroraColorSchemesDriverKt \ diff --git a/scripts/screenshot/doc-robot-skins-icons.sh b/scripts/screenshot/doc-robot-skins-icons.sh index 2315ce07..e5f80779 100755 --- a/scripts/screenshot/doc-robot-skins-icons.sh +++ b/scripts/screenshot/doc-robot-skins-icons.sh @@ -16,10 +16,10 @@ export JAVA_HOME=`/usr/libexec/java_home -v 11` alias JAVA="java" -AURORA_VERSION=1.1-SNAPSHOT +AURORA_VERSION=1.1.0 KOTLIN_VERSION=1.6.10 KOTLIN_COROUTINES_VERSION=1.6.0 -COMPOSE_VERSION=1.0.1-rc2 +COMPOSE_VERSION=1.1.0 CLASSPATH=../../drop/$AURORA_VERSION/aurora-screenshot-desktop-$AURORA_VERSION.jar:../../demo/build/libs/aurora-demo-desktop.jar:../build/libs/:../../build/libs/* java -cp $CLASSPATH org.pushingpixels.aurora.tools.screenshot.theming.skins.AuroraSkinsIconFilterDriverKt \ diff --git a/scripts/screenshot/doc-robot-skins.sh b/scripts/screenshot/doc-robot-skins.sh index a696ea88..e79d5cf1 100755 --- a/scripts/screenshot/doc-robot-skins.sh +++ b/scripts/screenshot/doc-robot-skins.sh @@ -16,10 +16,10 @@ export JAVA_HOME=`/usr/libexec/java_home -v 11` alias JAVA="java" -AURORA_VERSION=1.1-SNAPSHOT +AURORA_VERSION=1.1.0 KOTLIN_VERSION=1.6.10 KOTLIN_COROUTINES_VERSION=1.6.0 -COMPOSE_VERSION=1.0.1-rc2 +COMPOSE_VERSION=1.1.0 CLASSPATH=../../drop/$AURORA_VERSION/aurora-screenshot-desktop-$AURORA_VERSION.jar:../../demo/build/libs/aurora-demo-desktop.jar:../build/libs/:../../build/libs/* java -cp $CLASSPATH org.pushingpixels.aurora.tools.screenshot.theming.skins.AuroraSkinsDriverKt \