PAINTROID-540 Changing to spraytool sets stroke width to 5

Catrobat · Apr 1, 2023 · e95b90a · e95b90a
1 parent 73096f2
commit e95b90a
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 6 deletions.
diff --git a/...c/androidTest/java/org/catrobat/paintroid/test/espresso/tools/SprayToolIntegrationTest.kt b/...c/androidTest/java/org/catrobat/paintroid/test/espresso/tools/SprayToolIntegrationTest.kt
@@ -61,4 +61,37 @@ class SprayToolIntegrationTest {
         onView(withId(R.id.pocketpaint_spray_radius_seek_bar))
             .check(matches(withProgress(MIN_RADIUS)))
     }
+
+    @Test
+    fun testSprayRadiusToStrokeWidthStaysConsistent() {
+        ToolBarViewInteraction.onToolBarView().performSelectTool(ToolType.BRUSH)
+
+        var radius = "30"
+        onView(withId(R.id.pocketpaint_stroke_width_width_text))
+            .perform(replaceText(radius))
+            .check(matches(withText(radius)))
+        onView(withId(R.id.pocketpaint_stroke_width_seek_bar))
+            .check(matches(withProgress(radius.toInt())))
+
+        ToolBarViewInteraction.onToolBarView().performSelectTool(ToolType.SPRAY)
+        onView(withId(R.id.pocketpaint_radius_text))
+            .perform(replaceText(radius))
+            .check(matches(withText(radius)))
+        onView(withId(R.id.pocketpaint_spray_radius_seek_bar))
+            .check(matches(withProgress(radius.toInt())))
+
+        radius = "20"
+        onView(withId(R.id.pocketpaint_radius_text))
+            .perform(replaceText(radius))
+            .check(matches(withText(radius)))
+        onView(withId(R.id.pocketpaint_spray_radius_seek_bar))
+            .check(matches(withProgress(radius.toInt())))
+
+        ToolBarViewInteraction.onToolBarView().performSelectTool(ToolType.BRUSH)
+        onView(withId(R.id.pocketpaint_stroke_width_width_text))
+            .perform(replaceText(radius))
+            .check(matches(withText(radius)))
+        onView(withId(R.id.pocketpaint_stroke_width_seek_bar))
+            .check(matches(withProgress(radius.toInt())))
+    }
 }
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/controller/DefaultToolController.kt b/Paintroid/src/main/java/org/catrobat/paintroid/controller/DefaultToolController.kt
@@ -36,6 +36,7 @@ import org.catrobat.paintroid.tools.Workspace
 import org.catrobat.paintroid.tools.implementation.ClippingTool
 import org.catrobat.paintroid.tools.implementation.ImportTool
 import org.catrobat.paintroid.tools.implementation.LineTool
+import org.catrobat.paintroid.tools.implementation.SprayTool
 import org.catrobat.paintroid.tools.options.ToolOptionsViewController
 
 class DefaultToolController(
@@ -73,6 +74,9 @@ class DefaultToolController(
         } else {
             toolOptionsViewController.hideCheckmark()
         }
+        if (toolReference.tool?.toolType == ToolType.SPRAY) {
+            (currentTool as SprayTool).resetRadiusToStrokeWidth()
+        }
         val tool: Tool = toolFactory.createTool(
             toolType,
             toolOptionsViewController,

diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/tools/implementation/SprayTool.kt b/Paintroid/src/main/java/org/catrobat/paintroid/tools/implementation/SprayTool.kt
@@ -49,7 +49,7 @@ private const val STROKE_WIDTH = 5f
 private const val CONSTANT_1 = 0.5f
 
 class SprayTool(
-    var stampToolOptionsView: SprayToolOptionsView,
+    var sprayToolOptionsView: SprayToolOptionsView,
     override var contextCallback: ContextCallback,
     toolOptionsViewController: ToolOptionsViewController,
     toolPaint: ToolPaint,
@@ -76,15 +76,14 @@ class SprayTool(
     private val previewCanvas = Canvas(previewBitmap)
 
     init {
-        toolPaint.strokeWidth = STROKE_WIDTH
-
-        stampToolOptionsView.setCallback(object : SprayToolOptionsView.Callback {
+        sprayToolOptionsView.setCallback(object : SprayToolOptionsView.Callback {
             override fun radiusChanged(radius: Int) {
                 sprayRadius = DEFAULT_RADIUS + radius * 2
             }
         })
 
-        stampToolOptionsView.setCurrentPaint(toolPaint.paint)
+        sprayToolOptionsView.setCurrentPaint(toolPaint.paint)
+        toolPaint.strokeWidth = STROKE_WIDTH
         toolOptionsViewController.showDelayed()
     }
 
@@ -131,7 +130,7 @@ class SprayTool(
         super.onRestoreInstanceState(bundle)
         bundle?.getInt(BUNDLE_RADIUS)?.let { radius ->
             sprayRadius = radius
-            stampToolOptionsView.setRadius(radius)
+            sprayToolOptionsView.setRadius(radius)
         }
     }
 
@@ -184,4 +183,8 @@ class SprayTool(
         point.y = radius * sin(theta).toFloat() + (currentCoordinate?.y ?: 0f)
         return point
     }
+
+    fun resetRadiusToStrokeWidth() {
+        toolPaint.strokeWidth = sprayToolOptionsView.getRadius()
+    }
 }
diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/tools/options/SprayToolOptionsView.kt b/Paintroid/src/main/java/org/catrobat/paintroid/tools/options/SprayToolOptionsView.kt
@@ -27,6 +27,8 @@ interface SprayToolOptionsView {
 
     fun setCurrentPaint(paint: Paint)
 
+    fun getRadius(): Float
+
     interface Callback {
         fun radiusChanged(radius: Int)
     }

diff --git a/Paintroid/src/main/java/org/catrobat/paintroid/ui/tools/DefaultSprayToolOptionsView.kt b/Paintroid/src/main/java/org/catrobat/paintroid/ui/tools/DefaultSprayToolOptionsView.kt
@@ -31,6 +31,7 @@ import com.google.android.material.textfield.TextInputEditText
 import org.catrobat.paintroid.R
 import org.catrobat.paintroid.tools.helper.DefaultNumberRangeFilter
 import org.catrobat.paintroid.tools.options.SprayToolOptionsView
+import java.util.Locale
 
 const val MIN_RADIUS = 1
 private const val DEFAULT_RADIUS = 5
@@ -107,9 +108,17 @@ class DefaultSprayToolOptionsView(rootView: ViewGroup) : SprayToolOptionsView {
 
     override fun setRadius(radius: Int) {
         radiusSeekBar.progress = radius
+        radiusText.setText(
+            String.format(
+                Locale.getDefault(), "%d",
+                radius
+            )
+        )
     }
 
     override fun setCurrentPaint(paint: Paint) {
         setRadius(paint.strokeWidth.toInt())
     }
+
+    override fun getRadius(): Float = radiusSeekBar.progress.toFloat()
 }