PAINTROID-396 Multiline tool with movable intermediate points

CR
Catrobat · Sep 11, 2023 · 50cfc22 · 50cfc22
1 parent 9daa735
commit 50cfc22
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 99 deletions.
diff --git a/...oidTest/java/org/catrobat/paintroid/test/espresso/tools/DynamicLineToolIntegrationTest.kt b/...oidTest/java/org/catrobat/paintroid/test/espresso/tools/DynamicLineToolIntegrationTest.kt
@@ -886,7 +886,7 @@ class DynamicLineToolIntegrationTest {
         val currentTool = launchActivityRule.activity.defaultToolController.currentTool as DynamicLineTool
         Assert.assertEquals(7, currentTool.vertexStack.size)
 
-        var uriFile = saveImage()
+        val uriFile = saveImage()
 
         newImage()
         Assert.assertEquals(0, currentTool.vertexStack.size)
@@ -898,7 +898,7 @@ class DynamicLineToolIntegrationTest {
     }
 
     private fun loadImage(uriFile: Uri) {
-        var fileContent = CommandSerializer(activity, activity.commandManager, activity.model).readFromFile(uriFile!!)
+        val fileContent = CommandSerializer(activity, activity.commandManager, activity.model).readFromFile(uriFile)
         for (command in fileContent.commandModel.commands) {
             activity.commandManager.addCommand(command)
         }

diff --git a/...troid/src/androidTest/java/org/catrobat/paintroid/test/junit/tools/DynamicLineToolTest.kt b/...troid/src/androidTest/java/org/catrobat/paintroid/test/junit/tools/DynamicLineToolTest.kt
@@ -114,7 +114,7 @@ class DynamicLineToolTest {
     fun testTwoVerticesCreatedAfterFirstClick() {
         Assert.assertEquals(0, tool.vertexStack.size)
 
-        var firstClickCoordinate = PointF(5f, 5f)
+        val firstClickCoordinate = PointF(5f, 5f)
         tool.handleDown(firstClickCoordinate)
         tool.handleUp(firstClickCoordinate)
 
@@ -124,18 +124,18 @@ class DynamicLineToolTest {
     @Test
     @UiThreadTest
     fun testLastVertexCenterChangesAfterClick() {
-        var firstClickCoordinate = PointF(5f, 5f)
+        val firstClickCoordinate = PointF(5f, 5f)
         tool.handleDown(firstClickCoordinate)
         tool.handleUp(firstClickCoordinate)
 
-        var secondClickCoordinate = PointF(100f, 100f)
+        val secondClickCoordinate = PointF(100f, 100f)
         tool.handleDown(secondClickCoordinate)
         tool.handleUp(secondClickCoordinate)
 
         Assert.assertEquals(2, tool.vertexStack.size)
         Assert.assertEquals(secondClickCoordinate, tool.vertexStack.last.vertexCenter)
 
-        var thirdClickCoordinate = PointF(200f, 200f)
+        val thirdClickCoordinate = PointF(200f, 200f)
         tool.handleDown(thirdClickCoordinate)
         tool.handleUp(thirdClickCoordinate)
 
@@ -146,11 +146,11 @@ class DynamicLineToolTest {
     @Test
     @UiThreadTest
     fun testLastVertexCenterChangesAfterMove() {
-        var firstClickCoordinate = PointF(5f, 5f)
+        val firstClickCoordinate = PointF(5f, 5f)
         tool.handleDown(firstClickCoordinate)
         tool.handleUp(firstClickCoordinate)
 
-        var secondClickCoordinate = PointF(100f, 100f)
+        val secondClickCoordinate = PointF(100f, 100f)
         tool.handleDown(secondClickCoordinate)
         tool.handleUp(secondClickCoordinate)
 
@@ -159,7 +159,7 @@ class DynamicLineToolTest {
 
         tool.handleDown(secondClickCoordinate)
 
-        var movingCoordinate = PointF(200f, 200f)
+        val movingCoordinate = PointF(200f, 200f)
         tool.handleMove(movingCoordinate)
         tool.handleUp(movingCoordinate)
 
@@ -170,11 +170,11 @@ class DynamicLineToolTest {
     @Test
     @UiThreadTest
     fun testFirstVertexCenterChangesAfterMove() {
-        var firstClickCoordinate = PointF(5f, 5f)
+        val firstClickCoordinate = PointF(5f, 5f)
         tool.handleDown(firstClickCoordinate)
         tool.handleUp(firstClickCoordinate)
 
-        var secondClickCoordinate = PointF(100f, 100f)
+        val secondClickCoordinate = PointF(100f, 100f)
         tool.handleDown(secondClickCoordinate)
         tool.handleUp(secondClickCoordinate)
 
@@ -183,7 +183,7 @@ class DynamicLineToolTest {
 
         tool.handleDown(firstClickCoordinate)
 
-        var movingCoordinate = PointF(200f, 200f)
+        val movingCoordinate = PointF(200f, 200f)
         tool.handleMove(movingCoordinate)
         tool.handleUp(movingCoordinate)
 
@@ -197,8 +197,8 @@ class DynamicLineToolTest {
         var plusButtonVisibility = DynamicLineTool.topBarViewHolder?.plusButton?.visibility
         Assert.assertEquals(plusButtonVisibility, View.GONE)
 
-        var tapDownCoordinate = PointF(5f, 5f)
-        var tapUpCoordinate = PointF(10f, 10f)
+        val tapDownCoordinate = PointF(5f, 5f)
+        val tapUpCoordinate = PointF(10f, 10f)
         tool.handleDown(tapDownCoordinate)
         tool.handleUp(tapUpCoordinate)
 
@@ -211,11 +211,11 @@ class DynamicLineToolTest {
     fun testAddPathIsSetAfterClickingPlus() {
         Assert.assertEquals(false, tool.addNewPath)
 
-        var firstClickCoordinate = PointF(5f, 5f)
+        val firstClickCoordinate = PointF(5f, 5f)
         tool.handleDown(firstClickCoordinate)
         tool.handleUp(firstClickCoordinate)
 
-        var secondClickCoordinate = PointF(100f, 100f)
+        val secondClickCoordinate = PointF(100f, 100f)
         tool.handleDown(secondClickCoordinate)
         tool.handleUp(secondClickCoordinate)
 
@@ -229,17 +229,17 @@ class DynamicLineToolTest {
     fun testThreeVerticesCreatedAfterClickingPlus() {
         Assert.assertEquals(0, tool.vertexStack.size)
 
-        var firstClickCoordinate = PointF(5f, 5f)
+        val firstClickCoordinate = PointF(5f, 5f)
         tool.handleDown(firstClickCoordinate)
         tool.handleUp(firstClickCoordinate)
 
-        var secondClickCoordinate = PointF(100f, 100f)
+        val secondClickCoordinate = PointF(100f, 100f)
         tool.handleDown(secondClickCoordinate)
         tool.handleUp(secondClickCoordinate)
 
         tool.onClickOnPlus()
 
-        var thirdClickCoordinate = PointF(200f, 200f)
+        val thirdClickCoordinate = PointF(200f, 200f)
         tool.handleDown(thirdClickCoordinate)
         tool.handleUp(thirdClickCoordinate)
 
@@ -252,8 +252,8 @@ class DynamicLineToolTest {
         var plusButtonVisibility = DynamicLineTool.topBarViewHolder?.plusButton?.visibility
         Assert.assertEquals(plusButtonVisibility, View.GONE)
 
-        var tapDownCoordinate = PointF(5f, 5f)
-        var tapUpCoordinate = PointF(10f, 10f)
+        val tapDownCoordinate = PointF(5f, 5f)
+        val tapUpCoordinate = PointF(10f, 10f)
         tool.handleDown(tapDownCoordinate)
         tool.handleUp(tapUpCoordinate)
 
@@ -315,8 +315,8 @@ class DynamicLineToolTest {
     fun testVertexStackIsClearedAfterCheckmark() {
         Assert.assertEquals(0, tool.vertexStack.size)
 
-        var tapDownCoordinate = PointF(5f, 5f)
-        var tapUpCoordinate = PointF(10f, 10f)
+        val tapDownCoordinate = PointF(5f, 5f)
+        val tapUpCoordinate = PointF(10f, 10f)
         tool.handleDown(tapDownCoordinate)
         tool.handleUp(tapUpCoordinate)
 
@@ -332,17 +332,17 @@ class DynamicLineToolTest {
         Assert.assertEquals(null, tool.movingVertex)
         Assert.assertEquals(null, tool.successorVertex)
 
-        var firstVertexCoordinate = PointF(5f, 5f)
+        val firstVertexCoordinate = PointF(5f, 5f)
         tool.handleDown(firstVertexCoordinate)
         tool.handleUp(firstVertexCoordinate)
 
-        var middleVertexCoordinate = PointF(100f, 100f)
+        val middleVertexCoordinate = PointF(100f, 100f)
         tool.handleDown(middleVertexCoordinate)
         tool.handleUp(middleVertexCoordinate)
 
         tool.onClickOnPlus()
 
-        var lastVertexCoordinate = PointF(200f, 200f)
+        val lastVertexCoordinate = PointF(200f, 200f)
         tool.handleDown(lastVertexCoordinate)
         tool.handleUp(lastVertexCoordinate)
 
@@ -360,17 +360,17 @@ class DynamicLineToolTest {
         Assert.assertEquals(null, tool.movingVertex)
         Assert.assertEquals(null, tool.successorVertex)
 
-        var firstVertexCoordinate = PointF(5f, 5f)
+        val firstVertexCoordinate = PointF(5f, 5f)
         tool.handleDown(firstVertexCoordinate)
         tool.handleUp(firstVertexCoordinate)
 
-        var middleVertexCoordinate = PointF(100f, 100f)
+        val middleVertexCoordinate = PointF(100f, 100f)
         tool.handleDown(middleVertexCoordinate)
         tool.handleUp(middleVertexCoordinate)
 
         tool.onClickOnPlus()
 
-        var lastVertexCoordinate = PointF(200f, 200f)
+        val lastVertexCoordinate = PointF(200f, 200f)
         tool.handleDown(lastVertexCoordinate)
         tool.handleUp(lastVertexCoordinate)
 

diff --git a/...roid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt b/...roid/src/main/java/org/catrobat/paintroid/command/implementation/DefaultCommandManager.kt
@@ -113,7 +113,7 @@ class DefaultCommandManager(
             val command = undoCommandList.pop()
 
             if (command is DynamicPathCommand) {
-                var switchedTool = handleUndoForDynamicLineTool(command)
+                val switchedTool = handleUndoForDynamicLineTool(command)
                 if (switchedTool) return
             }
             redoCommandList.addFirst(command)
@@ -126,7 +126,7 @@ class DefaultCommandManager(
 
     private fun handleUndoForDynamicLineTool(command: DynamicPathCommand): Boolean {
         if (mainActivity == null) return false
-        var currentTool = mainActivity.defaultToolController.currentTool
+        val currentTool = mainActivity.defaultToolController.currentTool
         if (currentTool is DynamicLineTool && currentTool.vertexStack.isNotEmpty()) {
             currentTool.updateVertexStackAfterUndo()
             currentTool.setToolPaint(command)
@@ -255,23 +255,6 @@ class DefaultCommandManager(
         }
     }
 
-//    private fun handleRedoForDynamicLineTool(command: Command) {
-//        var currentTool = mainActivity.defaultToolController.currentTool
-//        if (currentTool is DynamicLineTool && command !is DynamicPathCommand) {
-//            currentTool.clear()
-//        }
-//        if (command is DynamicPathCommand) {
-//            if (currentTool !is DynamicLineTool) {
-//                command.switchToDynamicLineTool(mainActivity)
-//            }
-//            while (mainActivity.defaultToolController.currentTool !is DynamicLineTool)
-//                currentTool = mainActivity.defaultToolController.currentTool
-//            if (command.isSourcePath) {
-//                (currentTool as DynamicLineTool).clear()
-//            }
-//            (currentTool as DynamicLineTool).updateVertexStackAfterRedo(command)
-//        }
-//    }
     private fun handleRedoForDynamicLineTool(command: Command) {
         if (mainActivity == null) return
         var currentTool = mainActivity.defaultToolController.currentTool
@@ -314,13 +297,11 @@ class DefaultCommandManager(
 
     override fun shutdown() = Unit
 
-    // LINETOOL_ONLY
     override fun undoIgnoringColorChanges() {
         addAndExecuteCommands(separateColorCommandsAndUndo())
         notifyCommandExecuted()
     }
 
-    // LINETOOL_ONLY
     override fun undoIgnoringColorChangesAndAddCommand(command: Command) {
         val colorCommandList = separateColorCommandsAndUndo()
         undoCommandList.addFirst(command)
@@ -330,7 +311,6 @@ class DefaultCommandManager(
         notifyCommandExecuted()
     }
 
-    // LINETOOL_ONLY
     private fun separateColorCommandsAndUndo(): Deque<Command> {
         val colorCommandList = removeColorCommands()
         if (undoCommandList.isNotEmpty() && undoCommandList.first != null) {
@@ -341,7 +321,6 @@ class DefaultCommandManager(
         return colorCommandList
     }
 
-    // LINETOOL_ONLY
     override fun undoInConnectedLinesMode() {
         val colorCommandList = removeColorCommands()
         if (undoCommandList.isNotEmpty()) {
@@ -364,7 +343,6 @@ class DefaultCommandManager(
         }
     }
 
-    // LINETOOL_ONLY
     private fun recolorLastLine(colorCommandList: Deque<Command>) {
         if (undoCommandList.isNotEmpty() && undoCommandList.first !is ColorChangedCommand) {
             val firstNonColorCommand = undoCommandList.pop()
@@ -401,7 +379,6 @@ class DefaultCommandManager(
         notifyCommandExecuted()
     }
 
-    // LINETOOL_ONLY
     override fun redoInConnectedLinesMode() {
         if (isRedoAvailable) {
             val command = redoCommandList.pop()
@@ -522,7 +499,6 @@ class DefaultCommandManager(
         }
     }
 
-    // LINETOOL_ONLY
     private fun removeColorCommands(): Deque<Command> {
         val colorCommandList: Deque<Command> = ArrayDeque()
         while (undoCommandList.isNotEmpty() && undoCommandList.first is ColorChangedCommand) {

diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/DynamicPathCommand.kt b/Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/DynamicPathCommand.kt
@@ -74,7 +74,7 @@ class DynamicPathCommand(var paint: Paint, path: Path, startPoint: PointF, endPo
         mainActivity.runOnUiThread {
             mainActivity.presenter.switchToDynamicLineTool()
             if (mainActivity.defaultToolController.currentTool !is DynamicLineTool) return@runOnUiThread
-            var tool = mainActivity.defaultToolController.currentTool as DynamicLineTool
+            val tool = mainActivity.defaultToolController.currentTool as DynamicLineTool
             tool.createSourceAndDestinationVertices(
                 dynamicPathCommands.first.startPoint,
                 dynamicPathCommands.first.endPoint,

diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/presenter/MainActivityPresenter.kt b/Paintroid/src/main/java/org/catrobat/paintroid/presenter/MainActivityPresenter.kt
@@ -811,7 +811,6 @@ open class MainActivityPresenter(
     override fun switchToDynamicLineTool() {
         if (toolController.toolType == ToolType.DYNAMICLINE) return
         idlingResource.increment()
-//        bottomBarViewHolder.hide()
         checkForImplicitToolApplication()
         switchTool(ToolType.DYNAMICLINE)
         idlingResource.decrement()