Improve edit current svg

ARK-Builders · Nov 27, 2024 · 2d63e78 · 2d63e78
1 parent b836a95
commit 2d63e78
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/canvas/src/main/java/dev/arkbuilders/canvas/presentation/drawing/EditCanvas.kt b/canvas/src/main/java/dev/arkbuilders/canvas/presentation/drawing/EditCanvas.kt
@@ -184,7 +184,6 @@ fun DrawCanvas(modifier: Modifier, viewModel: EditViewModel) {
 
                     svg.apply {
                         val svgCommand = SVGCommand.MoveTo(eventX, eventY).apply {
-                            //TODO Add color for paint
                             paintColor = editManager.currentPaint.color.value
                             brushSizeId = Size.MEDIUM.id
                         }

diff --git a/...as/src/main/java/dev/arkbuilders/canvas/presentation/resourceloader/SvgResourceManager.kt b/...as/src/main/java/dev/arkbuilders/canvas/presentation/resourceloader/SvgResourceManager.kt
@@ -14,6 +14,7 @@ class SvgResourceManager(
             editManager.addDrawPath(draw.path)
             editManager.setPaintColor(draw.paint.color)
         }
+        editManager.svg.addAll(svgPaths.getCommands())
     }
 
     override suspend fun saveResource(path: Path) {

diff --git a/canvas/src/main/java/dev/arkbuilders/canvas/presentation/utils/SVG.kt b/canvas/src/main/java/dev/arkbuilders/canvas/presentation/utils/SVG.kt
@@ -38,6 +38,10 @@ class SVG {
         commands.addLast(command)
     }
 
+    fun getCommands(): ArrayDeque<SVGCommand> {
+        return commands
+    }
+
     fun addPath(path: DrawPath) {
         paths.addLast(path)
     }
@@ -110,6 +114,10 @@ class SVG {
         }
     }
 
+    fun addAll(commands: ArrayDeque<SVGCommand>) {
+        commands.addAll(commands)
+    }
+
     companion object {
         fun parse(path: Path): SVG = SVG().apply {
             val xmlParser = Xml.newPullParser()