Skip to content

Commit 0e24321

Browse files
exlandexland
committed
PAINTROID-624 Linter
1 parent 947032c commit 0e24321

File tree

9 files changed

+48
-120
lines changed

9 files changed

+48
-120
lines changed

‎Paintroid/src/androidTest/java/org/catrobat/paintroid/test/espresso/ToolPixelIntegrationTest.kt

-6
This file was deleted.

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

+11-49
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,29 @@
11
package org.catrobat.paintroid.test.espresso.tools
22

3-
import android.graphics.Bitmap
4-
import android.graphics.Color
5-
import android.graphics.PointF
6-
import android.widget.SeekBar
73
import androidx.test.espresso.Espresso.onView
8-
import androidx.test.espresso.PerformException
9-
import androidx.test.espresso.action.ViewActions.*
10-
import androidx.test.espresso.assertion.ViewAssertions
4+
import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
5+
import androidx.test.espresso.action.ViewActions.replaceText
6+
import androidx.test.espresso.action.ViewActions.click
117
import androidx.test.espresso.assertion.ViewAssertions.matches
12-
import androidx.test.espresso.matcher.ViewMatchers.*
13-
import androidx.test.ext.junit.runners.AndroidJUnit4
14-
import androidx.test.filters.LargeTest
8+
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
9+
import androidx.test.espresso.matcher.ViewMatchers.withId
10+
import androidx.test.espresso.matcher.ViewMatchers.withText
1511
import androidx.test.rule.ActivityTestRule
16-
import kotlinx.coroutines.delay
17-
import kotlinx.coroutines.runBlocking
1812
import org.catrobat.paintroid.MainActivity
1913
import org.catrobat.paintroid.R
2014
import org.catrobat.paintroid.contract.LayerContracts
21-
import org.catrobat.paintroid.test.espresso.util.DrawingSurfaceLocationProvider
22-
import org.catrobat.paintroid.test.espresso.util.EspressoUtils.waitForToast
2315
import org.catrobat.paintroid.test.espresso.util.MainActivityHelper
24-
import org.catrobat.paintroid.test.espresso.util.UiInteractions
25-
import org.catrobat.paintroid.test.espresso.util.wrappers.DrawingSurfaceInteraction.Companion.onDrawingSurfaceView
26-
import org.catrobat.paintroid.test.espresso.util.wrappers.LayerMenuViewInteraction
2716
import org.catrobat.paintroid.test.espresso.util.wrappers.ToolBarViewInteraction
28-
import org.catrobat.paintroid.test.espresso.util.wrappers.ToolBarViewInteraction.Companion.onToolBarView
29-
import org.catrobat.paintroid.test.espresso.util.wrappers.ToolPropertiesInteraction
30-
import org.catrobat.paintroid.test.espresso.util.wrappers.TopBarViewInteraction
31-
import org.catrobat.paintroid.test.espresso.util.wrappers.TransformToolOptionsViewInteraction.Companion.onTransformToolOptionsView
3217
import org.catrobat.paintroid.test.utils.ScreenshotOnFailRule
3318
import org.catrobat.paintroid.tools.ToolReference
3419
import org.catrobat.paintroid.tools.ToolType
35-
import org.catrobat.paintroid.tools.implementation.*
20+
import org.catrobat.paintroid.tools.implementation.MAXIMUM_BITMAP_SIZE_FACTOR
21+
import org.catrobat.paintroid.tools.implementation.PixelTool
3622
import org.catrobat.paintroid.ui.Perspective
37-
import org.hamcrest.Matchers.equalTo
38-
import org.hamcrest.Matchers.greaterThan
39-
import org.hamcrest.Matchers.lessThan
40-
import org.hamcrest.Matchers.not
4123
import org.junit.Assert.assertEquals
42-
import org.junit.Assert.assertThat
43-
import org.junit.Assert.assertTrue
4424
import org.junit.Before
4525
import org.junit.Rule
4626
import org.junit.Test
47-
import org.junit.runner.RunWith
4827

4928
class PixelationToolIntegrationTest {
5029
@get:Rule
@@ -64,23 +43,8 @@ class PixelationToolIntegrationTest {
6443
private lateinit var toolReference: ToolReference
6544
private lateinit var mainActivity: MainActivity
6645
private lateinit var activityHelper: MainActivityHelper
67-
private lateinit var pixelTool : PixelTool
46+
private lateinit var pixelTool: PixelTool
6847

69-
private var toolSelectionBoxHeight: Float
70-
get() {
71-
return (toolReference.tool as BaseToolWithRectangleShape).boxHeight
72-
}
73-
private set(height) {
74-
(toolReference.tool as BaseToolWithRectangleShape).boxHeight = height
75-
}
76-
77-
private var toolSelectionBoxWidth: Float
78-
get() {
79-
return (toolReference.tool as BaseToolWithRectangleShape).boxWidth
80-
}
81-
private set(width) {
82-
(toolReference.tool as BaseToolWithRectangleShape).boxWidth = width
83-
}
8448
@Before
8549
fun setUp() {
8650
mainActivity = launchActivityRule.activity
@@ -101,9 +65,7 @@ class PixelationToolIntegrationTest {
10165
}
10266

10367
@Test
104-
fun inputeTest()
105-
{
106-
68+
fun inputeTest() {
10769
var width = 80.0f
10870
var height = 49.0f
10971
onView(withId(R.id.pocketpaint_pixel_width_value))
@@ -133,4 +95,4 @@ class PixelationToolIntegrationTest {
13395
assertEquals(pixelTool.numPixelHeight, height)
13496
// assertEquals(pixelTool.numCollors.toInt(),collor )
13597
}
136-
}
98+
}

‎Paintroid/src/main/java/org/catrobat/paintroid/tools/ToolType.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,7 @@ enum class ToolType(
214214
R.id.pocketpaint_tools_clipping,
215215
INVALID_RESOURCE_ID,
216216
true
217-
)
218-
,
217+
),
219218
PIXEL(
220219
R.string.button_pixel,
221220
R.string.help_content_text,

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

+10-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,15 @@ import org.catrobat.paintroid.tools.ToolPaint
2929
import org.catrobat.paintroid.tools.ToolType
3030
import org.catrobat.paintroid.tools.Workspace
3131
import org.catrobat.paintroid.tools.options.ToolOptionsViewController
32-
import org.catrobat.paintroid.ui.tools.*
32+
import org.catrobat.paintroid.ui.tools.DefaultBrushToolOptionsView
33+
import org.catrobat.paintroid.ui.tools.DefaultClipboardToolOptionsView
34+
import org.catrobat.paintroid.ui.tools.DefaultShapeToolOptionsView
35+
import org.catrobat.paintroid.ui.tools.DefaultFillToolOptionsView
36+
import org.catrobat.paintroid.ui.tools.DefaultTransformToolOptionsView
37+
import org.catrobat.paintroid.ui.tools.DefaultTextToolOptionsView
38+
import org.catrobat.paintroid.ui.tools.DefaultSprayToolOptionsView
39+
import org.catrobat.paintroid.ui.tools.DefaultPixelToolOptionsView
40+
import org.catrobat.paintroid.ui.tools.DefaultSmudgeToolOptionsView
3341

3442
private const val DRAW_TIME_INIT: Long = 30_000_000
3543

@@ -196,7 +204,7 @@ class DefaultToolFactory(mainActivity: MainActivity) : ToolFactory {
196204
DRAW_TIME_INIT,
197205
mainActivity
198206
)
199-
ToolType.PIXEL ->PixelTool(
207+
ToolType.PIXEL -> PixelTool(
200208
DefaultPixelToolOptionsView(toolLayout),
201209
contextCallback,
202210
toolOptionsViewController,

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

+6-13
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package org.catrobat.paintroid.tools.implementation
22

33
import android.graphics.Bitmap
44
import android.graphics.PointF
5-
import android.widget.Toast
65
import androidx.annotation.VisibleForTesting
76
import androidx.test.espresso.idling.CountingIdlingResource
87
import org.catrobat.paintroid.command.CommandManager
@@ -15,16 +14,15 @@ import org.catrobat.paintroid.tools.options.ToolOptionsViewController
1514
import org.catrobat.paintroid.ui.tools.DefaultPixelToolOptionsView
1615

1716
class PixelTool(
18-
pixelToolOptionsViewParam : PixelationToolOptionsView,
19-
contextCallback : ContextCallback,
17+
pixelToolOptionsViewParam: PixelationToolOptionsView,
18+
contextCallback: ContextCallback,
2019
toolOptionsViewController: ToolOptionsViewController,
2120
toolPaint: ToolPaint,
2221
workspace: Workspace,
2322
idlingResource: CountingIdlingResource,
2423
commandManager: CommandManager,
2524
override var drawTime: Long
26-
) : BaseToolWithRectangleShape(contextCallback, toolOptionsViewController,toolPaint, workspace, idlingResource, commandManager)
27-
{
25+
) : BaseToolWithRectangleShape(contextCallback, toolOptionsViewController, toolPaint, workspace, idlingResource, commandManager) {
2826
private val pixelToolOptionsView: PixelationToolOptionsView
2927
@VisibleForTesting
3028
@JvmField
@@ -46,7 +44,7 @@ class PixelTool(
4644
this.pixelToolOptionsView = pixelToolOptionsViewParam
4745
setBitmap(Bitmap.createBitmap(boxWidth.toInt(), boxHeight.toInt(), Bitmap.Config.ARGB_8888))
4846
toolOptionsViewController.showDelayed()
49-
this.pixelToolOptionsView.setPixelPreviewListener(object : PixelationToolOptionsView.OnPixelationPreviewListener {
47+
this.pixelToolOptionsView.setPixelPreviewListener(object : PixelationToolOptionsView.OnPixelationPreviewListener {
5048
override fun setPixelWidth(widthPixels: Float) {
5149
this@PixelTool.numPixelWidth = widthPixels
5250
}
@@ -58,11 +56,9 @@ class PixelTool(
5856
override fun setNumCollor(collorNum: Float) {
5957
this@PixelTool.numCollors = collorNum
6058
}
61-
6259
})
6360
}
6461

65-
6662
override val toolType: ToolType
6763
get() = ToolType.PIXEL
6864

@@ -74,15 +70,12 @@ class PixelTool(
7470
super.handleDown(coordinate)
7571
}
7672

77-
override fun toolPositionCoordinates(coordinate: PointF): PointF = coordinate
73+
override fun toolPositionCoordinates(coordinate: PointF): PointF = coordinate
7874

7975
// is the checkmark to run the programm
8076
override fun onClickOnButton() {
8177
// test if the ui works good then shoudl be enought for the 30.8
82-
var i = 10
83-
8478
}
8579

8680
override fun resetInternalState() = Unit
87-
88-
}
81+
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ class TransformTool(
371371
}
372372
}
373373

374-
private fun onApplyResizeClicked(resizePercentage: Int) {
374+
private fun onApplyResizeClicked(resizePercentage: Int) {
375375
val newWidth = (workspace.width / HUNDRED * resizePercentage).toInt()
376376
val newHeight = (workspace.height / HUNDRED * resizePercentage).toInt()
377377
if (newWidth == 0 || newHeight == 0) {

‎Paintroid/src/main/java/org/catrobat/paintroid/tools/options/PixelationToolOptionsView.kt

+3-11
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,14 @@ package org.catrobat.paintroid.tools.options
33
import android.view.View
44

55
interface PixelationToolOptionsView {
6-
fun invalidate ()
7-
8-
fun getTopToolOptions(): View
9-
10-
fun getBottomToolOptions(): View
116

127
fun setPixelPreviewListener(onPixelationPreviewListener: OnPixelationPreviewListener)
138

14-
interface OnPixelationPreviewListener{
15-
fun setPixelWidth(widthPixels : Float)
9+
interface OnPixelationPreviewListener {
10+
fun setPixelWidth(widthPixels: Float)
1611

17-
fun setPixelHeight(heightPixels : Float)
12+
fun setPixelHeight(heightPixels: Float)
1813

1914
fun setNumCollor(collorNum: Float)
2015
}
2116
}
22-
23-
24-

‎Paintroid/src/main/java/org/catrobat/paintroid/ui/tools/DefaultPixelToolOptionsView.kt

+16-34
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,28 @@ import java.util.Locale
2424

2525
@VisibleForTesting
2626

27-
private const val MIN_WIDTH = 1
27+
/*private const val MIN_WIDTH = 1
2828
private const val MAX_WIDTH = 100
2929
private const val MIN_HEIGHT = 1
30-
private const val MAX_HEIGHT = 200
30+
private const val MAX_HEIGHT = 200*/
3131
private const val MIN_COLOR = 1
3232
private const val MAX_COLOR = 40
3333

3434
// ask PO maybe nee ded the minumum but the bar is not scalable so far (API 21 is current?)
3535

36-
@SuppressLint("SetTextI18n")
37-
class DefaultPixelToolOptionsView (rootView : ViewGroup): PixelationToolOptionsView{
3836

39-
private val pixelNumWidth : AppCompatEditText
40-
private val pixelNumHeight : AppCompatEditText
41-
private var colorNumText : AppCompatEditText
42-
//private val thisLayer : Chip
43-
private val currentView = rootView
44-
private var pixelChangedListener : OnPixelationPreviewListener? = null
45-
private var pixelNumWidthWatcher : PixelToolNumTextWatcher
46-
private var pixelNumHeightWatcher : PixelToolNumTextWatcher
47-
private var colorNumBar : AppCompatSeekBar
37+
@SuppressLint("NotImplementedDeclaration")
38+
class DefaultPixelToolOptionsView (rootView: ViewGroup): PixelationToolOptionsView{
4839

40+
private val pixelNumWidth: AppCompatEditText
41+
private val pixelNumHeight: AppCompatEditText
42+
private var colorNumText: AppCompatEditText
43+
// private val thisLayer : Chip
44+
// private val currentView = rootView
45+
private var pixelChangedListener: OnPixelationPreviewListener? = null
46+
private var pixelNumWidthWatcher: PixelToolNumTextWatcher
47+
private var pixelNumHeightWatcher: PixelToolNumTextWatcher
48+
private var colorNumBar: AppCompatSeekBar
4949

5050
companion object {
5151
private val TAG = DefaultPixelToolOptionsView::class.java.simpleName
@@ -55,7 +55,7 @@ class DefaultPixelToolOptionsView (rootView : ViewGroup): PixelationToolOptionsV
5555
}
5656

5757
init {
58-
val inflater = LayoutInflater.from(rootView.context)
58+
val inflater = LayoutInflater.from(rootView.context)
5959
val pixelView = inflater.inflate(R.layout.dialog_pocketpaint_pixel, rootView, true)
6060
colorNumBar = pixelView.findViewById(R.id.pocketpaint_pixel_color_seekbar)
6161
colorNumText = pixelView.findViewById(R.id.pocketpaint_transform_pixel_color_text)
@@ -66,7 +66,7 @@ class DefaultPixelToolOptionsView (rootView : ViewGroup): PixelationToolOptionsV
6666
pixelNumWidth.setText(defaulWidth.toString())
6767
pixelNumHeight.setText(defaultHeight.toString())
6868
// initColorText()
69-
// initWidthText()
69+
// initWidthText()
7070
// initHeightText()
7171

7272
pixelNumWidthWatcher = object : PixelToolNumTextWatcher() {
@@ -124,28 +124,12 @@ class DefaultPixelToolOptionsView (rootView : ViewGroup): PixelationToolOptionsV
124124

125125
pixelChangedListener?.setNumCollor(colorNumBar.progress.toFloat())
126126
}
127-
128-
129-
}
130-
// handle up probs error
131-
132-
override fun invalidate() {
133-
TODO("Not yet implemented")
134-
}
135-
136-
override fun getTopToolOptions(): View {
137-
TODO("Not yet implemented")
138-
} //topLayout
139-
140-
override fun getBottomToolOptions(): View {
141-
TODO("Not yet implemented")
142127
}
143128

144129
override fun setPixelPreviewListener(onPixelationPreviewListener: PixelationToolOptionsView.OnPixelationPreviewListener) {
145130
this.pixelChangedListener = onPixelationPreviewListener
146131
}
147132

148-
149133
abstract class PixelToolNumTextWatcher : TextWatcher {
150134

151135
protected abstract fun setValue(value: Float)
@@ -157,7 +141,6 @@ class DefaultPixelToolOptionsView (rootView : ViewGroup): PixelationToolOptionsV
157141
var str = editable.toString()
158142
if (str.isEmpty()) {
159143
str = MAX_COLOR.toString()
160-
161144
}
162145
try {
163146
val value = NumberFormat.getIntegerInstance().parse(str)?.toFloat()
@@ -167,5 +150,4 @@ class DefaultPixelToolOptionsView (rootView : ViewGroup): PixelationToolOptionsV
167150
}
168151
}
169152
}
170-
171-
}
153+
}

‎Paintroid/src/main/res/layout/dialog_pocketpaint_pixel.xml

-2
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@
111111
android:layout_width="21dp" />
112112
</LinearLayout>
113113

114-
115-
116114
<TextView
117115
style="@style/PocketPaintToolSubtitle"
118116
android:text="@string/pixel_ui_color" />

0 commit comments

Comments
 (0)