feat: 함수 일부 네이밍 변경 및 Circle, Rectangle 그리기 기능 추가

app/src/main/java/woowacourse/paint/MainActivity.kt

@@ -40,6 +40,9 @@ class MainActivity : AppCompatActivity() {
  adapter.submitList(colors)
  }
  }
+ viewModel.selectedBrush.observe(this) { brush ->
+ canvasView.setupBrush(brush)
+ }
  }
 
  private fun setupCanvas() {
@@ -69,6 +72,7 @@ class MainActivity : AppCompatActivity() {
  private fun setupWidthSlider() {
  binding.rsThicknessChanger.valueFrom = minWidth
  binding.rsThicknessChanger.valueTo = maxWidth
+ binding.rsThicknessChanger.setValues(viewModel.width.value)
  binding.rsThicknessChanger.addOnChangeListener(
  RangeSlider.OnChangeListener { _, value, _ ->
  viewModel.pickWidth(value)
@@ -77,7 +81,7 @@ class MainActivity : AppCompatActivity() {
  }
 
  companion object {
- private const val minWidth = 0f
+ private const val minWidth = 1f
  private const val maxWidth = 100f
  }
 }

app/src/main/java/woowacourse/paint/MainViewModel.kt

@@ -70,7 +70,7 @@ class MainViewModel : ViewModel() {
  }
 
  companion object {
- const val DEFAULT_WIDTH = 0F
+ const val DEFAULT_WIDTH = 1F
  val DEFAULT_SELECTED_COLOR = PaletteColor.RED
  }
 }

app/src/main/java/woowacourse/paint/canvas/CanvasView.kt

@@ -13,33 +13,45 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
  context,
  attr,
 ) {
- private var path = Path()
+ private var brush = Brush.PEN
  private var paint = Paint()
+ private var path = Path()
+
  private var startPoint: Point = Point(0f, 0f)
- private val lines = mutableListOf<Line>()
+ private val drawings = mutableListOf<Drawing>()
 
  fun initPaint(width: Float, color: PaletteColor) {
  paint = getPaint(width, color.colorCode)
  }
 
  override fun onDraw(canvas: Canvas) {
  super.onDraw(canvas)
- lines.forEach { line ->
+ drawings.forEach { line ->
  canvas.drawPath(line.path, line.paint)
  }
  canvas.drawPath(path, paint)
  }
 
  override fun onTouchEvent(event: MotionEvent): Boolean {
+ when (brush) {
+ Brush.PEN -> drawByPen(event)
+ Brush.RECTANGLE -> drawRect(event)
+ Brush.CIRCLE -> drawCircle(event)
+ Brush.ERASER -> TODO()
+ }
+ return true
+ }
+
+ private fun drawByPen(event: MotionEvent) {
  val x = event.x
  val y = event.y
 
  when (event.action) {
  MotionEvent.ACTION_DOWN -> drawDot(x, y)
  MotionEvent.ACTION_MOVE -> drawLine(x, y)
+ MotionEvent.ACTION_UP -> addDrawing()
  else -> super.onTouchEvent(event)
  }
- return true
  }
 
  private fun drawDot(x: Float, y: Float) {
@@ -56,26 +68,71 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
  invalidate()
  }
 
+ private fun drawRect(event: MotionEvent) {
+ val x = event.x
+ val y = event.y
+
+ when (event.action) {
+ MotionEvent.ACTION_DOWN -> {
+ startPoint = Point(x, y)
+ }
+
+ MotionEvent.ACTION_MOVE -> {
+ path.reset()
+ path.addRect(startPoint.x, startPoint.y, x, y, Path.Direction.CW)
+ invalidate()
+ }
+
+ MotionEvent.ACTION_UP -> addDrawing()
+ else -> super.onTouchEvent(event)
+ }
+ }
+
+ private fun drawCircle(event: MotionEvent) {
+ val x = event.x
+ val y = event.y
+
+ when (event.action) {
+ MotionEvent.ACTION_DOWN -> {
+ startPoint = Point(x, y)
+ }
+
+ MotionEvent.ACTION_MOVE -> {
+ path.reset()
+ path.addOval(startPoint.x, startPoint.y, x, y, Path.Direction.CW)
+ invalidate()
+ }
+
+ MotionEvent.ACTION_UP -> addDrawing()
+ else -> super.onTouchEvent(event)
+ }
+ }
+
+ private fun erasePath() {
+ }
+
+ fun setupBrush(selectedBrush: Brush) {
+ brush = selectedBrush
+ }
+
  fun setupWidth(width: Float) {
- addLine()
  paint = getPaint(width, paint.color)
  }
 
  fun setupColor(color: PaletteColor) {
- addLine()
  paint = getPaint(paint.strokeWidth, color.colorCode)
  }
 
- private fun addLine() {
+ private fun addDrawing() {
  if (path.isEmpty) return
- lines.add(Line(path, paint))
+ drawings.add(Drawing(path, paint))
  path = Path()
  }
 
  private fun getPaint(width: Float, @ColorInt selectedColor: Int): Paint {
  return Paint().apply {
  isAntiAlias = true
- style = Paint.Style.STROKE
+ style = Paint.Style.FILL_AND_STROKE
  strokeJoin = Paint.Join.ROUND
  color = selectedColor
  strokeWidth = width

app/src/main/java/woowacourse/paint/canvas/Line.kt → app/src/main/java/woowacourse/paint/canvas/Drawing.kt

@@ -3,4 +3,4 @@ package woowacourse.paint.canvas
 import android.graphics.Paint
 import android.graphics.Path
 
-class Line(val path: Path, val paint: Paint)
+class Drawing(val path: Path, val paint: Paint)