PAINTROID_684_apply_outline_to_text

writing new tests

Author: Julian Raphael Jautz

Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/tools/TextToolIntegrationTest.kt

@@ -63,6 +63,7 @@ import org.catrobat.paintroid.tools.FontType
 import org.catrobat.paintroid.tools.ToolReference
 import org.catrobat.paintroid.tools.ToolType
 import org.catrobat.paintroid.tools.implementation.BOX_OFFSET
+import org.catrobat.paintroid.tools.implementation.DEFAULT_TEXT_OUTLINE_WIDTH
 import org.catrobat.paintroid.tools.implementation.MARGIN_TOP
 import org.catrobat.paintroid.tools.implementation.TEXT_SIZE_MAGNIFICATION_FACTOR
 import org.catrobat.paintroid.tools.implementation.TextTool
@@ -76,8 +77,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import kotlin.math.roundToInt
 
-private const val DEFAULT_OUTLINE_WIDTH = 25
-
 @RunWith(AndroidJUnit4::class)
 @Suppress("LargeClass")
 class TextToolIntegrationTest {
@@ -849,8 +848,8 @@ class TextToolIntegrationTest {
         outlineWidthLayout?.let { Assert.assertTrue(it.isVisible) }
         val outlineWidthInput = onView(withId(R.id.pocketpaint_outline_width_text))
         val outlineWidthSeekbar = onView(withId(R.id.pocketpaint_outline_width_seek_bar))
-        outlineWidthInput.check(matches(ViewMatchers.withText(DEFAULT_OUTLINE_WIDTH.toString())))
-        outlineWidthSeekbar.check(matches(UiMatcher.withProgress(DEFAULT_OUTLINE_WIDTH)))
+        outlineWidthInput.check(matches(ViewMatchers.withText(DEFAULT_TEXT_OUTLINE_WIDTH.toString())))
+        outlineWidthSeekbar.check(matches(UiMatcher.withProgress(DEFAULT_TEXT_OUTLINE_WIDTH)))
 
         enterTestText()
 

Paintroid/src/main/java/org/catrobat/paintroid/command/implementation/TextToolCommand.kt

@@ -27,9 +27,9 @@ import org.catrobat.paintroid.command.Command
 import org.catrobat.paintroid.command.serialization.SerializableTypeface
 import org.catrobat.paintroid.common.ITALIC_FONT_BOX_ADJUSTMENT
 import org.catrobat.paintroid.contract.LayerContracts
+import org.catrobat.paintroid.tools.implementation.OUTLINED_FONT_WIDTH_ADJUSTMENT
 
 const val TEXT_SIZE_MAGNIFICATION_FACTOR = 3f
-const val OUTLINED_FONT_WIDTH_ADJUSTMENT = 350f
 
 class TextToolCommand(
     multilineText: Array<String>,

Paintroid/src/main/java/org/catrobat/paintroid/tools/implementation/TextTool.kt

@@ -52,12 +52,14 @@ const val BOX_OFFSET = 20
 @VisibleForTesting
 const val MARGIN_TOP = 200f
 
+@VisibleForTesting
+const val DEFAULT_TEXT_OUTLINE_WIDTH = 25
+
 private const val ROTATION_ENABLED = true
 private const val RESIZE_POINTS_VISIBLE = true
 private const val ITALIC_TEXT_SKEW = -0.25f
 private const val DEFAULT_TEXT_SKEW = 0.0f
 private const val DEFAULT_TEXT_SIZE = 20
-private const val DEFAULT_OUTLINE_WIDTH = 25
 const val OUTLINED_FONT_WIDTH_ADJUSTMENT = 350f
 private const val BUNDLE_TOOL_UNDERLINED = "BUNDLE_TOOL_UNDERLINED"
 private const val BUNDLE_TOOL_ITALIC = "BUNDLE_TOOL_ITALIC"
@@ -120,7 +122,7 @@ class TextTool(
     private var oldBoxWidth = 0f
     private var oldBoxHeight = 0f
     private var oldToolPosition: PointF? = null
-    private var outlineWidth = DEFAULT_OUTLINE_WIDTH
+    private var outlineWidth = DEFAULT_TEXT_OUTLINE_WIDTH
 
     @get:VisibleForTesting
     val multilineText: Array<String>