From 5bd121cdd5a3c862b4084ebc2fb700871e0cf83a Mon Sep 17 00:00:00 2001 From: Justin Brooks Date: Sun, 15 Sep 2024 21:56:02 -0400 Subject: [PATCH] Avoid inserting grouping commas into large numbers --- .../jzbrooks/vgo/svg/ScalableVectorGraphicCommandPrinter.kt | 1 + .../kotlin/com/jzbrooks/vgo/vd/VectorDrawableCommandPrinter.kt | 1 + .../com/jzbrooks/vgo/vd/VectorDrawableOptimizationRegistry.kt | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/vgo/src/main/kotlin/com/jzbrooks/vgo/svg/ScalableVectorGraphicCommandPrinter.kt b/vgo/src/main/kotlin/com/jzbrooks/vgo/svg/ScalableVectorGraphicCommandPrinter.kt index 85328062..0367dc00 100644 --- a/vgo/src/main/kotlin/com/jzbrooks/vgo/svg/ScalableVectorGraphicCommandPrinter.kt +++ b/vgo/src/main/kotlin/com/jzbrooks/vgo/svg/ScalableVectorGraphicCommandPrinter.kt @@ -23,6 +23,7 @@ class ScalableVectorGraphicCommandPrinter(private val decimalDigits: Int) : Comm DecimalFormat().apply { maximumFractionDigits = decimalDigits isDecimalSeparatorAlwaysShown = false + isGroupingUsed = false roundingMode = RoundingMode.HALF_UP minimumIntegerDigits = 0 } diff --git a/vgo/src/main/kotlin/com/jzbrooks/vgo/vd/VectorDrawableCommandPrinter.kt b/vgo/src/main/kotlin/com/jzbrooks/vgo/vd/VectorDrawableCommandPrinter.kt index 61642a39..b79925ed 100644 --- a/vgo/src/main/kotlin/com/jzbrooks/vgo/vd/VectorDrawableCommandPrinter.kt +++ b/vgo/src/main/kotlin/com/jzbrooks/vgo/vd/VectorDrawableCommandPrinter.kt @@ -23,6 +23,7 @@ class VectorDrawableCommandPrinter(private val decimalDigits: Int) : CommandPrin DecimalFormat().apply { maximumFractionDigits = decimalDigits isDecimalSeparatorAlwaysShown = false + isGroupingUsed = false roundingMode = RoundingMode.HALF_UP } diff --git a/vgo/src/main/kotlin/com/jzbrooks/vgo/vd/VectorDrawableOptimizationRegistry.kt b/vgo/src/main/kotlin/com/jzbrooks/vgo/vd/VectorDrawableOptimizationRegistry.kt index a05320ba..f716e4c1 100644 --- a/vgo/src/main/kotlin/com/jzbrooks/vgo/vd/VectorDrawableOptimizationRegistry.kt +++ b/vgo/src/main/kotlin/com/jzbrooks/vgo/vd/VectorDrawableOptimizationRegistry.kt @@ -4,6 +4,7 @@ import com.jzbrooks.vgo.core.optimization.BakeTransformations import com.jzbrooks.vgo.core.optimization.BreakoutImplicitCommands import com.jzbrooks.vgo.core.optimization.CollapseGroups import com.jzbrooks.vgo.core.optimization.CommandVariant +import com.jzbrooks.vgo.core.optimization.ConvertCurvesToArcs import com.jzbrooks.vgo.core.optimization.MergePaths import com.jzbrooks.vgo.core.optimization.OptimizationRegistry import com.jzbrooks.vgo.core.optimization.Polycommands @@ -29,7 +30,7 @@ class VectorDrawableOptimizationRegistry : OptimizationRegistry(BOTTOM_UP, TOP_D BreakoutImplicitCommands(), CommandVariant(CommandVariant.Mode.Relative), SimplifyLineCommands(1e-3f), -// ConvertCurvesToArcs(VectorDrawableCommandPrinter(3)), + ConvertCurvesToArcs(VectorDrawableCommandPrinter(3)), SimplifyBezierCurveCommands(1e-3f), RemoveRedundantCommands(), CommandVariant(CommandVariant.Mode.Compact(VectorDrawableCommandPrinter(3))),