From dc16a7d916ee03f1508275be147f2e7764ced1d0 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Mon, 9 Oct 2023 21:22:36 +0900
Subject: [PATCH 01/28] =?UTF-8?q?feat:=20button=20bindingAdapter=EB=A1=9C?=
 =?UTF-8?q?=20isSelected=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                                 |  1 +
 .../java/woowacourse/paint/utils/BindingAdapter.kt   | 12 ++++++++++++
 build.gradle.kts                                     |  1 +
 3 files changed, 14 insertions(+)
 create mode 100644 app/src/main/java/woowacourse/paint/utils/BindingAdapter.kt

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d07ba820..ee49ffc9 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
+    id("kotlin-kapt")
 }
 
 android {
diff --git a/app/src/main/java/woowacourse/paint/utils/BindingAdapter.kt b/app/src/main/java/woowacourse/paint/utils/BindingAdapter.kt
new file mode 100644
index 00000000..b23af66d
--- /dev/null
+++ b/app/src/main/java/woowacourse/paint/utils/BindingAdapter.kt
@@ -0,0 +1,12 @@
+package woowacourse.paint.utils
+
+import android.widget.Button
+import androidx.databinding.BindingAdapter
+
+object BindingAdapter {
+    @BindingAdapter("isSelected")
+    @JvmStatic
+    fun isSelected(button: Button, isSelected: Boolean) {
+        button.isSelected = isSelected
+    }
+}
diff --git a/build.gradle.kts b/build.gradle.kts
index 547b25c8..d8627a2a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     val kotlinVersion = "1.8.10"
     kotlin("android") version kotlinVersion apply false
     kotlin("jvm") version kotlinVersion apply false
+    kotlin("kapt") version "1.9.10" apply false
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0" apply false
 }
 

From dee7ae14edde6855fbafadcc8d0ee6ad4ff5a826 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Mon, 9 Oct 2023 21:23:06 +0900
Subject: [PATCH 02/28] =?UTF-8?q?feat:=20=EC=84=A0=ED=83=9D=EB=90=9C=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EC=83=89=EA=B9=94=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/color/brush_selected.xml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 app/src/main/res/color/brush_selected.xml

diff --git a/app/src/main/res/color/brush_selected.xml b/app/src/main/res/color/brush_selected.xml
new file mode 100644
index 00000000..ee3d6ff0
--- /dev/null
+++ b/app/src/main/res/color/brush_selected.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/purple_200" android:state_selected="false" />
+    <item android:color="@color/teal_200" android:state_selected="true" />
+</selector>

From 74f09cb4b6a8698d54641f88a5e73dfaa0f8999c Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Mon, 9 Oct 2023 21:23:31 +0900
Subject: [PATCH 03/28] =?UTF-8?q?feat:=20=EB=B8=8C=EB=9F=AC=EC=89=AC=20?=
 =?UTF-8?q?=EC=9A=94=EC=86=8C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/woowacourse/paint/PaintChangingState.kt | 1 +
 app/src/main/java/woowacourse/paint/canvas/Brushes.kt     | 5 +++++
 app/src/main/res/values/strings.xml                       | 5 +++++
 3 files changed, 11 insertions(+)
 create mode 100644 app/src/main/java/woowacourse/paint/canvas/Brushes.kt

diff --git a/app/src/main/java/woowacourse/paint/PaintChangingState.kt b/app/src/main/java/woowacourse/paint/PaintChangingState.kt
index bb45f621..bafbe293 100644
--- a/app/src/main/java/woowacourse/paint/PaintChangingState.kt
+++ b/app/src/main/java/woowacourse/paint/PaintChangingState.kt
@@ -4,4 +4,5 @@ sealed class PaintChangingState {
     object Nothing : PaintChangingState()
     object ColorChanging : PaintChangingState()
     object WidthChanging : PaintChangingState()
+    object BrushChanging : PaintChangingState()
 }
diff --git a/app/src/main/java/woowacourse/paint/canvas/Brushes.kt b/app/src/main/java/woowacourse/paint/canvas/Brushes.kt
new file mode 100644
index 00000000..9b2f5186
--- /dev/null
+++ b/app/src/main/java/woowacourse/paint/canvas/Brushes.kt
@@ -0,0 +1,5 @@
+package woowacourse.paint.canvas
+
+enum class Brushes {
+    PEN, RECTANGLE, CIRCLE, ERASER
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0bded494..8b393621 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,4 +2,9 @@
     <string name="app_name">Paint</string>
     <string name="main_change_color">색상 변경</string>
     <string name="main_change_thickness">굵기 변경</string>
+    <string name="main_change_brush">브러쉬 변경</string>
+    <string name="pen">펜</string>
+    <string name="rectangle">직사각형</string>
+    <string name="circle">원</string>
+    <string name="eraser">지우개</string>
 </resources>

From 4e324fd5843197c649fb6dca12d7b16852274640 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Mon, 9 Oct 2023 21:29:52 +0900
Subject: [PATCH 04/28] =?UTF-8?q?feat:=20=EB=B8=8C=EB=9F=AC=EC=89=AC=20?=
 =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EA=B8=B0=EB=8A=A5=20UI=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/woowacourse/paint/MainViewModel.kt   | 17 +++++
 .../paint/canvas/{Brushes.kt => Brush.kt}     |  2 +-
 app/src/main/res/layout/activity_main.xml     | 73 ++++++++++++++++++-
 3 files changed, 87 insertions(+), 5 deletions(-)
 rename app/src/main/java/woowacourse/paint/canvas/{Brushes.kt => Brush.kt} (77%)

diff --git a/app/src/main/java/woowacourse/paint/MainViewModel.kt b/app/src/main/java/woowacourse/paint/MainViewModel.kt
index 4f3481e1..72daf508 100644
--- a/app/src/main/java/woowacourse/paint/MainViewModel.kt
+++ b/app/src/main/java/woowacourse/paint/MainViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
+import woowacourse.paint.canvas.Brush
 import woowacourse.paint.canvas.PaletteColor
 import woowacourse.paint.model.ColorUiModel
 
@@ -18,6 +19,10 @@ class MainViewModel : ViewModel() {
     val colors: LiveData<List<ColorUiModel>>
         get() = _colors
 
+    private var _selectedBrush = MutableLiveData(Brush.PEN)
+    val selectedBrush: LiveData<Brush>
+        get() = _selectedBrush
+
     val selectedColor: LiveData<PaletteColor>
         get() = Transformations.map(_colors) { colors ->
             colors.firstOrNull { it.isPicked }?.color ?: DEFAULT_SELECTED_COLOR
@@ -27,6 +32,14 @@ class MainViewModel : ViewModel() {
     val width: LiveData<Float>
         get() = _width
 
+    fun setBrushSettingState() {
+        if (_paintChangingState.value == PaintChangingState.BrushChanging) {
+            _paintChangingState.value = PaintChangingState.Nothing
+            return
+        }
+        _paintChangingState.value = PaintChangingState.BrushChanging
+    }
+
     fun setColorSettingState() {
         if (_paintChangingState.value == PaintChangingState.ColorChanging) {
             _paintChangingState.value = PaintChangingState.Nothing
@@ -43,6 +56,10 @@ class MainViewModel : ViewModel() {
         _paintChangingState.value = PaintChangingState.WidthChanging
     }
 
+    fun pickBrush(brush: Brush) {
+        _selectedBrush.value = brush
+    }
+
     fun pickColor(model: ColorUiModel) {
         val colors = _colors.value ?: return
         _colors.value = colors.map { it.copy(isPicked = it.color == model.color) }
diff --git a/app/src/main/java/woowacourse/paint/canvas/Brushes.kt b/app/src/main/java/woowacourse/paint/canvas/Brush.kt
similarity index 77%
rename from app/src/main/java/woowacourse/paint/canvas/Brushes.kt
rename to app/src/main/java/woowacourse/paint/canvas/Brush.kt
index 9b2f5186..804f7ef8 100644
--- a/app/src/main/java/woowacourse/paint/canvas/Brushes.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/Brush.kt
@@ -1,5 +1,5 @@
 package woowacourse.paint.canvas
 
-enum class Brushes {
+enum class Brush {
     PEN, RECTANGLE, CIRCLE, ERASER
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 11529f90..676e110e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,6 +9,8 @@
 
         <import type="woowacourse.paint.PaintChangingState" />
 
+        <import type="woowacourse.paint.canvas.Brush" />
+
         <import type="android.view.View" />
     </data>
 
@@ -43,11 +45,75 @@
             android:orientation="horizontal"
             android:visibility="@{viewModel.paintChangingState instanceof PaintChangingState.ColorChanging ? View.VISIBLE : View.GONE}"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintBottom_toTopOf="@id/ll_brushes"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/rs_thickness_changer"
             tools:listitem="@layout/item_color_palette" />
 
+        <LinearLayout
+            android:id="@+id/ll_brushes"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:orientation="horizontal"
+            android:visibility="@{viewModel.paintChangingState instanceof PaintChangingState.BrushChanging ? View.VISIBLE : View.GONE}"
+            app:layout_constraintBottom_toTopOf="@id/btn_change_brush"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent">
+
+            <Button
+                android:id="@+id/btn_pen"
+                isSelected="@{viewModel.selectedBrush == Brush.PEN}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dp"
+                android:backgroundTint="@color/brush_selected"
+                android:onClick="@{() -> viewModel.pickBrush(Brush.PEN)}"
+                android:text="@string/pen" />
+
+            <Button
+                android:id="@+id/btn_rectangle"
+                isSelected="@{viewModel.selectedBrush == Brush.RECTANGLE}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dp"
+                android:backgroundTint="@color/brush_selected"
+                android:onClick="@{() -> viewModel.pickBrush(Brush.RECTANGLE)}"
+                android:text="@string/rectangle" />
+
+            <Button
+                android:id="@+id/btn_circle"
+                isSelected="@{viewModel.selectedBrush == Brush.CIRCLE}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dp"
+                android:backgroundTint="@color/brush_selected"
+                android:onClick="@{() -> viewModel.pickBrush(Brush.CIRCLE)}"
+                android:text="@string/circle" />
+
+            <Button
+                android:id="@+id/btn_eraser"
+                isSelected="@{viewModel.selectedBrush == Brush.ERASER}"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="5dp"
+                android:backgroundTint="@color/brush_selected"
+                android:onClick="@{() -> viewModel.pickBrush(Brush.ERASER)}"
+                android:text="@string/eraser" />
+        </LinearLayout>
+
+
+        <Button
+            android:id="@+id/btn_change_brush"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp"
+            android:onClick="@{() -> viewModel.setBrushSettingState()}"
+            android:text="@string/main_change_brush"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/btn_change_color"
+            app:layout_constraintStart_toStartOf="parent" />
+
         <Button
             android:id="@+id/btn_change_color"
             android:layout_width="0dp"
@@ -58,7 +124,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/btn_change_thickness"
             app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toEndOf="@id/btn_change_brush" />
 
         <Button
             android:id="@+id/btn_change_thickness"
@@ -69,8 +135,7 @@
             android:text="@string/main_change_thickness"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/btn_change_color"
-            app:layout_constraintTop_toBottomOf="@id/rv_colors" />
+            app:layout_constraintStart_toEndOf="@id/btn_change_color" />
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>

From 2e8ae10592c65e53127a1192a6a09e5755aebfa8 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Mon, 9 Oct 2023 22:13:18 +0900
Subject: [PATCH 05/28] =?UTF-8?q?feat:=20=ED=95=A8=EC=88=98=20=EC=9D=BC?=
 =?UTF-8?q?=EB=B6=80=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80=EA=B2=BD=20?=
 =?UTF-8?q?=EB=B0=8F=20Circle,=20Rectangle=20=EA=B7=B8=EB=A6=AC=EA=B8=B0?=
 =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/woowacourse/paint/MainActivity.kt    |  6 +-
 .../java/woowacourse/paint/MainViewModel.kt   |  2 +-
 .../woowacourse/paint/canvas/CanvasView.kt    | 75 ++++++++++++++++---
 .../paint/canvas/{Line.kt => Drawing.kt}      |  2 +-
 4 files changed, 73 insertions(+), 12 deletions(-)
 rename app/src/main/java/woowacourse/paint/canvas/{Line.kt => Drawing.kt} (66%)

diff --git a/app/src/main/java/woowacourse/paint/MainActivity.kt b/app/src/main/java/woowacourse/paint/MainActivity.kt
index 4da7b3a7..c78b3744 100644
--- a/app/src/main/java/woowacourse/paint/MainActivity.kt
+++ b/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
     }
 }
diff --git a/app/src/main/java/woowacourse/paint/MainViewModel.kt b/app/src/main/java/woowacourse/paint/MainViewModel.kt
index 72daf508..196ed9db 100644
--- a/app/src/main/java/woowacourse/paint/MainViewModel.kt
+++ b/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
     }
 }
diff --git a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
index cab03df0..ca59c649 100644
--- a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
@@ -13,10 +13,12 @@ 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)
@@ -24,22 +26,32 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
 
     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
diff --git a/app/src/main/java/woowacourse/paint/canvas/Line.kt b/app/src/main/java/woowacourse/paint/canvas/Drawing.kt
similarity index 66%
rename from app/src/main/java/woowacourse/paint/canvas/Line.kt
rename to app/src/main/java/woowacourse/paint/canvas/Drawing.kt
index a1e0d5c5..1795b2ed 100644
--- a/app/src/main/java/woowacourse/paint/canvas/Line.kt
+++ b/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)

From 4c813d6388cff2b9a34780b3e4ed5b78ba1e5109 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Mon, 9 Oct 2023 22:21:35 +0900
Subject: [PATCH 06/28] =?UTF-8?q?refactor:=20=ED=95=A8=EC=88=98=20?=
 =?UTF-8?q?=EB=B6=84=EB=A6=AC=20=EB=B0=8F=20=EC=A4=91=EB=B3=B5=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../woowacourse/paint/canvas/CanvasView.kt    | 41 +++++--------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
index ca59c649..d97c6339 100644
--- a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
@@ -35,8 +35,7 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
     override fun onTouchEvent(event: MotionEvent): Boolean {
         when (brush) {
             Brush.PEN -> drawByPen(event)
-            Brush.RECTANGLE -> drawRect(event)
-            Brush.CIRCLE -> drawCircle(event)
+            Brush.RECTANGLE, Brush.CIRCLE -> drawShape(event)
             Brush.ERASER -> TODO()
         }
         return true
@@ -68,44 +67,26 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
         invalidate()
     }
 
-    private fun drawRect(event: MotionEvent) {
+    private fun drawShape(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_DOWN -> startPoint = Point(x, y)
+            MotionEvent.ACTION_MOVE -> drawPreview(x, y)
             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 drawPreview(x: Float, y: Float) {
+        path.reset()
+        when (brush) {
+            Brush.RECTANGLE -> path.addRect(startPoint.x, startPoint.y, x, y, Path.Direction.CW)
+            Brush.CIRCLE -> path.addOval(startPoint.x, startPoint.y, x, y, Path.Direction.CW)
+            else -> return
         }
+        invalidate()
     }
 
     private fun erasePath() {

From c56475f834b218fcf7e505c8a702718741e8f204 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Mon, 9 Oct 2023 22:31:31 +0900
Subject: [PATCH 07/28] =?UTF-8?q?feat:=20=EC=A7=80=EC=9A=B0=EA=B0=9C=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../woowacourse/paint/canvas/CanvasView.kt    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
index d97c6339..0bc895b6 100644
--- a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
@@ -4,6 +4,8 @@ import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.Path
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffXfermode
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.View
@@ -24,6 +26,10 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
         paint = getPaint(width, color.colorCode)
     }
 
+    init {
+        setLayerType(LAYER_TYPE_HARDWARE, null)
+    }
+
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
         drawings.forEach { line ->
@@ -34,14 +40,13 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
         when (brush) {
-            Brush.PEN -> drawByPen(event)
+            Brush.PEN, Brush.ERASER -> drawLine(event)
             Brush.RECTANGLE, Brush.CIRCLE -> drawShape(event)
-            Brush.ERASER -> TODO()
         }
         return true
     }
 
-    private fun drawByPen(event: MotionEvent) {
+    private fun drawLine(event: MotionEvent) {
         val x = event.x
         val y = event.y
 
@@ -89,11 +94,9 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
         invalidate()
     }
 
-    private fun erasePath() {
-    }
-
     fun setupBrush(selectedBrush: Brush) {
         brush = selectedBrush
+        paint = getPaint(paint.strokeWidth, paint.color)
     }
 
     fun setupWidth(width: Float) {
@@ -114,10 +117,14 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
         return Paint().apply {
             isAntiAlias = true
             style = Paint.Style.FILL_AND_STROKE
-            strokeJoin = Paint.Join.ROUND
             color = selectedColor
             strokeWidth = width
             strokeCap = Paint.Cap.ROUND
+            xfermode = if (brush == Brush.ERASER) {
+                PorterDuffXfermode(PorterDuff.Mode.CLEAR)
+            } else {
+                null
+            }
         }
     }
 }

From dc53032905d71d2de91d0295241b16add29b3542 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Mon, 9 Oct 2023 22:45:12 +0900
Subject: [PATCH 08/28] =?UTF-8?q?refactor:=20Drawing=20=ED=81=B4=EB=9E=98?=
 =?UTF-8?q?=EC=8A=A4=EC=97=90=EC=84=9C=20Path,=20Paint=20=EB=B3=B5?=
 =?UTF-8?q?=EC=82=AC=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../woowacourse/paint/canvas/CanvasView.kt    | 48 +++++++++----------
 .../java/woowacourse/paint/canvas/Drawing.kt  |  6 ++-
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
index 0bc895b6..d2e73dbe 100644
--- a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
@@ -9,21 +9,30 @@ import android.graphics.PorterDuffXfermode
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.View
-import androidx.annotation.ColorInt
 
 class CanvasView(context: Context, attr: AttributeSet) : View(
     context,
     attr,
 ) {
     private var brush = Brush.PEN
-    private var paint = Paint()
-    private var path = Path()
+    private val paint = Paint().apply {
+        isAntiAlias = true
+        style = Paint.Style.FILL_AND_STROKE
+        strokeCap = Paint.Cap.ROUND
+        xfermode = if (brush == Brush.ERASER) {
+            PorterDuffXfermode(PorterDuff.Mode.CLEAR)
+        } else {
+            null
+        }
+    }
+    private val path = Path()
 
     private var startPoint: Point = Point(0f, 0f)
     private val drawings = mutableListOf<Drawing>()
 
-    fun initPaint(width: Float, color: PaletteColor) {
-        paint = getPaint(width, color.colorCode)
+    fun initPaint(width: Float, selectedColor: PaletteColor) {
+        setupWidth(width)
+        setupColor(selectedColor)
     }
 
     init {
@@ -96,35 +105,24 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
 
     fun setupBrush(selectedBrush: Brush) {
         brush = selectedBrush
-        paint = getPaint(paint.strokeWidth, paint.color)
+        if (brush == Brush.ERASER) {
+            paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR)
+            return
+        }
+        paint.xfermode = null
     }
 
     fun setupWidth(width: Float) {
-        paint = getPaint(width, paint.color)
+        paint.strokeWidth = width
     }
 
     fun setupColor(color: PaletteColor) {
-        paint = getPaint(paint.strokeWidth, color.colorCode)
+        paint.color = color.colorCode
     }
 
     private fun addDrawing() {
         if (path.isEmpty) return
-        drawings.add(Drawing(path, paint))
-        path = Path()
-    }
-
-    private fun getPaint(width: Float, @ColorInt selectedColor: Int): Paint {
-        return Paint().apply {
-            isAntiAlias = true
-            style = Paint.Style.FILL_AND_STROKE
-            color = selectedColor
-            strokeWidth = width
-            strokeCap = Paint.Cap.ROUND
-            xfermode = if (brush == Brush.ERASER) {
-                PorterDuffXfermode(PorterDuff.Mode.CLEAR)
-            } else {
-                null
-            }
-        }
+        drawings.add(Drawing.of(path, paint))
+        path.reset()
     }
 }
diff --git a/app/src/main/java/woowacourse/paint/canvas/Drawing.kt b/app/src/main/java/woowacourse/paint/canvas/Drawing.kt
index 1795b2ed..333d5f85 100644
--- a/app/src/main/java/woowacourse/paint/canvas/Drawing.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/Drawing.kt
@@ -3,4 +3,8 @@ package woowacourse.paint.canvas
 import android.graphics.Paint
 import android.graphics.Path
 
-class Drawing(val path: Path, val paint: Paint)
+class Drawing private constructor(val path: Path, val paint: Paint) {
+    companion object {
+        fun of(path: Path, paint: Paint) = Drawing(Path(path), Paint(paint))
+    }
+}

From 7da23affe622a41e67f1214ea37aa3aa1bcb47c9 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Mon, 9 Oct 2023 23:23:44 +0900
Subject: [PATCH 09/28] =?UTF-8?q?feat:=20=EC=A0=84=EC=B2=B4=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C,=20undo,=20redo=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/woowacourse/paint/MainActivity.kt    | 14 +++++++
 .../woowacourse/paint/canvas/CanvasView.kt    | 31 ++++++++++++--
 app/src/main/res/drawable/ic_clear_24.xml     |  5 +++
 app/src/main/res/drawable/ic_redo_24.xml      |  5 +++
 app/src/main/res/drawable/ic_undo_24.xml      |  5 +++
 app/src/main/res/layout/activity_main.xml     | 41 ++++++++++++++++++-
 app/src/main/res/values/strings.xml           |  2 +-
 app/src/main/res/values/themes.xml            |  2 +-
 8 files changed, 99 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_clear_24.xml
 create mode 100644 app/src/main/res/drawable/ic_redo_24.xml
 create mode 100644 app/src/main/res/drawable/ic_undo_24.xml

diff --git a/app/src/main/java/woowacourse/paint/MainActivity.kt b/app/src/main/java/woowacourse/paint/MainActivity.kt
index c78b3744..b364e412 100644
--- a/app/src/main/java/woowacourse/paint/MainActivity.kt
+++ b/app/src/main/java/woowacourse/paint/MainActivity.kt
@@ -18,6 +18,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setupBinding()
         setupViewModel()
+        setupToolbar()
         setupCanvas()
         setupColors()
         setupWidthSlider()
@@ -45,6 +46,19 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun setupToolbar() {
+        setSupportActionBar(binding.tbPaint)
+        binding.ivRedo.setOnClickListener {
+            canvasView.redo()
+        }
+        binding.ivUndo.setOnClickListener {
+            canvasView.undo()
+        }
+        binding.ivClear.setOnClickListener {
+            canvasView.eraseAll()
+        }
+    }
+
     private fun setupCanvas() {
         binding.cvCanvas.initPaint(
             viewModel.width.value ?: MainViewModel.DEFAULT_WIDTH,
diff --git a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
index d2e73dbe..19ef8091 100644
--- a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
@@ -30,6 +30,8 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
     private var startPoint: Point = Point(0f, 0f)
     private val drawings = mutableListOf<Drawing>()
 
+    private val drawingsCanceled = mutableListOf<Drawing>()
+
     fun initPaint(width: Float, selectedColor: PaletteColor) {
         setupWidth(width)
         setupColor(selectedColor)
@@ -81,6 +83,12 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
         invalidate()
     }
 
+    private fun addDrawing() {
+        if (path.isEmpty) return
+        drawings.add(Drawing.of(path, paint))
+        path.reset()
+    }
+
     private fun drawShape(event: MotionEvent) {
         val x = event.x
         val y = event.y
@@ -120,9 +128,26 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
         paint.color = color.colorCode
     }
 
-    private fun addDrawing() {
-        if (path.isEmpty) return
-        drawings.add(Drawing.of(path, paint))
+    fun eraseAll() {
+        drawings.clear()
+        drawingsCanceled.clear()
         path.reset()
+        invalidate()
+    }
+
+    fun undo() {
+        val drawing = drawings.removeLastOrNull()
+        if (drawing != null) {
+            drawingsCanceled.add(drawing)
+            invalidate()
+        }
+    }
+
+    fun redo() {
+        val drawing = drawingsCanceled.removeLastOrNull()
+        if (drawing != null) {
+            drawings.add(drawing)
+            invalidate()
+        }
     }
 }
diff --git a/app/src/main/res/drawable/ic_clear_24.xml b/app/src/main/res/drawable/ic_clear_24.xml
new file mode 100644
index 00000000..ff31d2ae
--- /dev/null
+++ b/app/src/main/res/drawable/ic_clear_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,9l1.25,-2.75L23,5l-2.75,-1.25L19,1l-1.25,2.75L15,5l2.75,1.25L19,9zM11.5,9.5L9,4 6.5,9.5 1,12l5.5,2.5L9,20l2.5,-5.5L17,12l-5.5,-2.5zM19,15l-1.25,2.75L15,19l2.75,1.25L19,23l1.25,-2.75L23,19l-2.75,-1.25L19,15z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_redo_24.xml b/app/src/main/res/drawable/ic_redo_24.xml
new file mode 100644
index 00000000..dcd6cffc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_redo_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#FFFFFF" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18.4,10.6C16.55,8.99 14.15,8 11.5,8c-4.65,0 -8.58,3.03 -9.96,7.22L3.9,16c1.05,-3.19 4.05,-5.5 7.6,-5.5 1.95,0 3.73,0.72 5.12,1.88L13,16h9V7l-3.6,3.6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_undo_24.xml b/app/src/main/res/drawable/ic_undo_24.xml
new file mode 100644
index 00000000..077d163c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_undo_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#FFFFFF" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12.5,8c-2.65,0 -5.05,0.99 -6.9,2.6L2,7v9h9l-3.62,-3.62c1.39,-1.16 3.16,-1.88 5.12,-1.88 3.54,0 6.55,2.31 7.6,5.5l2.37,-0.78C21.08,11.03 17.15,8 12.5,8z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 676e110e..11ec6ed7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -20,6 +20,45 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/tb_paint"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:background="?attr/colorPrimary"
+            android:minHeight="?attr/actionBarSize"
+            android:theme="?attr/actionBarTheme"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:titleTextColor="@color/white">
+
+            <ImageView
+                android:id="@+id/iv_redo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginEnd="18dp"
+                android:src="@drawable/ic_redo_24" />
+
+            <ImageView
+                android:id="@+id/iv_undo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginEnd="14dp"
+                android:src="@drawable/ic_undo_24" />
+
+            <ImageView
+                android:id="@+id/iv_clear"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginEnd="20dp"
+                android:src="@drawable/ic_clear_24" />
+
+        </androidx.appcompat.widget.Toolbar>
+
+
         <woowacourse.paint.canvas.CanvasView
             android:id="@+id/cv_canvas"
             android:layout_width="0dp"
@@ -27,7 +66,7 @@
             app:layout_constraintBottom_toTopOf="@id/rs_thickness_changer"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@id/tb_paint" />
 
         <com.google.android.material.slider.RangeSlider
             android:id="@+id/rs_thickness_changer"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8b393621..a8c80eb7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Paint</string>
+    <string name="app_name">둘리의 캔버스</string>
     <string name="main_change_color">색상 변경</string>
     <string name="main_change_thickness">굵기 변경</string>
     <string name="main_change_brush">브러쉬 변경</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 163e9061..0c5db2a8 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Paint" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.Paint" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>

From e22dfd62ecae1a6ea26ff3742110b06841a120bd Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Mon, 9 Oct 2023 23:24:49 +0900
Subject: [PATCH 10/28] =?UTF-8?q?refactor:=20=ED=95=A8=EC=88=98=20?=
 =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/woowacourse/paint/canvas/CanvasView.kt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
index 19ef8091..16bb4938 100644
--- a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
@@ -32,15 +32,15 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
 
     private val drawingsCanceled = mutableListOf<Drawing>()
 
+    init {
+        setLayerType(LAYER_TYPE_HARDWARE, null)
+    }
+
     fun initPaint(width: Float, selectedColor: PaletteColor) {
         setupWidth(width)
         setupColor(selectedColor)
     }
 
-    init {
-        setLayerType(LAYER_TYPE_HARDWARE, null)
-    }
-
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
         drawings.forEach { line ->

From 87daa315f9e494277f7fb636fd4e6bf162e3fa99 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Mon, 9 Oct 2023 23:31:47 +0900
Subject: [PATCH 11/28] =?UTF-8?q?refactor:=20SettingState=20sealed=20class?=
 =?UTF-8?q?=20->=20enum=20class=EB=A1=9C=20=EB=B3=80=EA=B2=BD,=20=EC=83=81?=
 =?UTF-8?q?=EC=88=98=20=EC=9C=84=EC=B9=98=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/woowacourse/paint/MainActivity.kt    |  9 ++-----
 .../java/woowacourse/paint/MainViewModel.kt   | 26 +++++--------------
 .../woowacourse/paint/PaintChangingState.kt   |  7 ++---
 app/src/main/res/layout/activity_main.xml     | 12 ++++-----
 4 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/woowacourse/paint/MainActivity.kt b/app/src/main/java/woowacourse/paint/MainActivity.kt
index b364e412..f97e3b84 100644
--- a/app/src/main/java/woowacourse/paint/MainActivity.kt
+++ b/app/src/main/java/woowacourse/paint/MainActivity.kt
@@ -84,8 +84,8 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun setupWidthSlider() {
-        binding.rsThicknessChanger.valueFrom = minWidth
-        binding.rsThicknessChanger.valueTo = maxWidth
+        binding.rsThicknessChanger.valueFrom = MainViewModel.MIN_WIDTH
+        binding.rsThicknessChanger.valueTo = MainViewModel.MAX_WIDTH
         binding.rsThicknessChanger.setValues(viewModel.width.value)
         binding.rsThicknessChanger.addOnChangeListener(
             RangeSlider.OnChangeListener { _, value, _ ->
@@ -93,9 +93,4 @@ class MainActivity : AppCompatActivity() {
             },
         )
     }
-
-    companion object {
-        private const val minWidth = 1f
-        private const val maxWidth = 100f
-    }
 }
diff --git a/app/src/main/java/woowacourse/paint/MainViewModel.kt b/app/src/main/java/woowacourse/paint/MainViewModel.kt
index 196ed9db..05ca5ef8 100644
--- a/app/src/main/java/woowacourse/paint/MainViewModel.kt
+++ b/app/src/main/java/woowacourse/paint/MainViewModel.kt
@@ -10,7 +10,7 @@ import woowacourse.paint.model.ColorUiModel
 
 class MainViewModel : ViewModel() {
     private val _paintChangingState =
-        MutableLiveData<PaintChangingState>(PaintChangingState.Nothing)
+        MutableLiveData(PaintChangingState.Nothing)
     val paintChangingState: LiveData<PaintChangingState>
         get() = _paintChangingState
 
@@ -32,28 +32,12 @@ class MainViewModel : ViewModel() {
     val width: LiveData<Float>
         get() = _width
 
-    fun setBrushSettingState() {
-        if (_paintChangingState.value == PaintChangingState.BrushChanging) {
+    fun setSettingState(state: PaintChangingState) {
+        if (_paintChangingState.value == state) {
             _paintChangingState.value = PaintChangingState.Nothing
             return
         }
-        _paintChangingState.value = PaintChangingState.BrushChanging
-    }
-
-    fun setColorSettingState() {
-        if (_paintChangingState.value == PaintChangingState.ColorChanging) {
-            _paintChangingState.value = PaintChangingState.Nothing
-            return
-        }
-        _paintChangingState.value = PaintChangingState.ColorChanging
-    }
-
-    fun setWidthSettingState() {
-        if (_paintChangingState.value == PaintChangingState.WidthChanging) {
-            _paintChangingState.value = PaintChangingState.Nothing
-            return
-        }
-        _paintChangingState.value = PaintChangingState.WidthChanging
+        _paintChangingState.value = state
     }
 
     fun pickBrush(brush: Brush) {
@@ -71,6 +55,8 @@ class MainViewModel : ViewModel() {
 
     companion object {
         const val DEFAULT_WIDTH = 1F
+        const val MIN_WIDTH = 1f
+        const val MAX_WIDTH = 100f
         val DEFAULT_SELECTED_COLOR = PaletteColor.RED
     }
 }
diff --git a/app/src/main/java/woowacourse/paint/PaintChangingState.kt b/app/src/main/java/woowacourse/paint/PaintChangingState.kt
index bafbe293..8b043fc7 100644
--- a/app/src/main/java/woowacourse/paint/PaintChangingState.kt
+++ b/app/src/main/java/woowacourse/paint/PaintChangingState.kt
@@ -1,8 +1,5 @@
 package woowacourse.paint
 
-sealed class PaintChangingState {
-    object Nothing : PaintChangingState()
-    object ColorChanging : PaintChangingState()
-    object WidthChanging : PaintChangingState()
-    object BrushChanging : PaintChangingState()
+enum class PaintChangingState {
+    Nothing, ColorChanging, WidthChanging, BrushChanging
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 11ec6ed7..1cd72fd7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -72,7 +72,7 @@
             android:id="@+id/rs_thickness_changer"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="@{viewModel.paintChangingState instanceof PaintChangingState.WidthChanging ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.paintChangingState == PaintChangingState.WidthChanging ? View.VISIBLE : View.GONE}"
             app:layout_constraintBottom_toTopOf="@id/rv_colors"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
@@ -82,7 +82,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:visibility="@{viewModel.paintChangingState instanceof PaintChangingState.ColorChanging ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.paintChangingState == PaintChangingState.ColorChanging ? View.VISIBLE : View.GONE}"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toTopOf="@id/ll_brushes"
             app:layout_constraintEnd_toEndOf="parent"
@@ -95,7 +95,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
             android:orientation="horizontal"
-            android:visibility="@{viewModel.paintChangingState instanceof PaintChangingState.BrushChanging ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.paintChangingState == PaintChangingState.BrushChanging ? View.VISIBLE : View.GONE}"
             app:layout_constraintBottom_toTopOf="@id/btn_change_brush"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent">
@@ -147,7 +147,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
-            android:onClick="@{() -> viewModel.setBrushSettingState()}"
+            android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.BrushChanging)}"
             android:text="@string/main_change_brush"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/btn_change_color"
@@ -158,7 +158,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
-            android:onClick="@{() -> viewModel.setColorSettingState()}"
+            android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.ColorChanging)}"
             android:text="@string/main_change_color"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/btn_change_thickness"
@@ -170,7 +170,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
-            android:onClick="@{() -> viewModel.setWidthSettingState()}"
+            android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.WidthChanging)}"
             android:text="@string/main_change_thickness"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

From 0b210df0719e70ab995714a90b059a7ddd73b500 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Mon, 9 Oct 2023 23:34:45 +0900
Subject: [PATCH 12/28] =?UTF-8?q?refactor:=20width=EB=A1=9C=20=EA=B5=B5?=
 =?UTF-8?q?=EA=B8=B0=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=ED=86=B5=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/woowacourse/paint/MainActivity.kt | 8 ++++----
 app/src/main/res/layout/activity_main.xml           | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/woowacourse/paint/MainActivity.kt b/app/src/main/java/woowacourse/paint/MainActivity.kt
index f97e3b84..cb443cb0 100644
--- a/app/src/main/java/woowacourse/paint/MainActivity.kt
+++ b/app/src/main/java/woowacourse/paint/MainActivity.kt
@@ -84,10 +84,10 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun setupWidthSlider() {
-        binding.rsThicknessChanger.valueFrom = MainViewModel.MIN_WIDTH
-        binding.rsThicknessChanger.valueTo = MainViewModel.MAX_WIDTH
-        binding.rsThicknessChanger.setValues(viewModel.width.value)
-        binding.rsThicknessChanger.addOnChangeListener(
+        binding.rsWidthChanger.valueFrom = MainViewModel.MIN_WIDTH
+        binding.rsWidthChanger.valueTo = MainViewModel.MAX_WIDTH
+        binding.rsWidthChanger.setValues(viewModel.width.value)
+        binding.rsWidthChanger.addOnChangeListener(
             RangeSlider.OnChangeListener { _, value, _ ->
                 viewModel.pickWidth(value)
             },
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1cd72fd7..f4705292 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -63,13 +63,13 @@
             android:id="@+id/cv_canvas"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:layout_constraintBottom_toTopOf="@id/rs_thickness_changer"
+            app:layout_constraintBottom_toTopOf="@id/rs_width_changer"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tb_paint" />
 
         <com.google.android.material.slider.RangeSlider
-            android:id="@+id/rs_thickness_changer"
+            android:id="@+id/rs_width_changer"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:visibility="@{viewModel.paintChangingState == PaintChangingState.WidthChanging ? View.VISIBLE : View.GONE}"

From 943e72cfce68dc956aaf1d3eee69a01ba510ce5b Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Tue, 10 Oct 2023 17:10:20 +0900
Subject: [PATCH 13/28] =?UTF-8?q?refactor:=20Brush=20->=20Tool=EB=A1=9C=20?=
 =?UTF-8?q?=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/woowacourse/paint/MainActivity.kt    |  2 +-
 .../java/woowacourse/paint/MainViewModel.kt   | 12 +++++-----
 .../woowacourse/paint/canvas/CanvasView.kt    | 22 +++++++++----------
 .../paint/canvas/{Brush.kt => Tool.kt}        |  2 +-
 app/src/main/res/layout/activity_main.xml     | 18 +++++++--------
 5 files changed, 28 insertions(+), 28 deletions(-)
 rename app/src/main/java/woowacourse/paint/canvas/{Brush.kt => Tool.kt} (78%)

diff --git a/app/src/main/java/woowacourse/paint/MainActivity.kt b/app/src/main/java/woowacourse/paint/MainActivity.kt
index cb443cb0..956174e3 100644
--- a/app/src/main/java/woowacourse/paint/MainActivity.kt
+++ b/app/src/main/java/woowacourse/paint/MainActivity.kt
@@ -41,7 +41,7 @@ class MainActivity : AppCompatActivity() {
                 adapter.submitList(colors)
             }
         }
-        viewModel.selectedBrush.observe(this) { brush ->
+        viewModel.selectedTool.observe(this) { brush ->
             canvasView.setupBrush(brush)
         }
     }
diff --git a/app/src/main/java/woowacourse/paint/MainViewModel.kt b/app/src/main/java/woowacourse/paint/MainViewModel.kt
index 05ca5ef8..2df886c0 100644
--- a/app/src/main/java/woowacourse/paint/MainViewModel.kt
+++ b/app/src/main/java/woowacourse/paint/MainViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
-import woowacourse.paint.canvas.Brush
+import woowacourse.paint.canvas.Tool
 import woowacourse.paint.canvas.PaletteColor
 import woowacourse.paint.model.ColorUiModel
 
@@ -19,9 +19,9 @@ class MainViewModel : ViewModel() {
     val colors: LiveData<List<ColorUiModel>>
         get() = _colors
 
-    private var _selectedBrush = MutableLiveData(Brush.PEN)
-    val selectedBrush: LiveData<Brush>
-        get() = _selectedBrush
+    private var _selectedTool = MutableLiveData(Tool.PEN)
+    val selectedTool: LiveData<Tool>
+        get() = _selectedTool
 
     val selectedColor: LiveData<PaletteColor>
         get() = Transformations.map(_colors) { colors ->
@@ -40,8 +40,8 @@ class MainViewModel : ViewModel() {
         _paintChangingState.value = state
     }
 
-    fun pickBrush(brush: Brush) {
-        _selectedBrush.value = brush
+    fun pickBrush(tool: Tool) {
+        _selectedTool.value = tool
     }
 
     fun pickColor(model: ColorUiModel) {
diff --git a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
index 16bb4938..423f28b6 100644
--- a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
@@ -14,12 +14,12 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
     context,
     attr,
 ) {
-    private var brush = Brush.PEN
+    private var tool = Tool.PEN
     private val paint = Paint().apply {
         isAntiAlias = true
         style = Paint.Style.FILL_AND_STROKE
         strokeCap = Paint.Cap.ROUND
-        xfermode = if (brush == Brush.ERASER) {
+        xfermode = if (tool == Tool.ERASER) {
             PorterDuffXfermode(PorterDuff.Mode.CLEAR)
         } else {
             null
@@ -50,9 +50,9 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
     }
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
-        when (brush) {
-            Brush.PEN, Brush.ERASER -> drawLine(event)
-            Brush.RECTANGLE, Brush.CIRCLE -> drawShape(event)
+        when (tool) {
+            Tool.PEN, Tool.ERASER -> drawLine(event)
+            Tool.RECTANGLE, Tool.CIRCLE -> drawShape(event)
         }
         return true
     }
@@ -103,17 +103,17 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
 
     private fun drawPreview(x: Float, y: Float) {
         path.reset()
-        when (brush) {
-            Brush.RECTANGLE -> path.addRect(startPoint.x, startPoint.y, x, y, Path.Direction.CW)
-            Brush.CIRCLE -> path.addOval(startPoint.x, startPoint.y, x, y, Path.Direction.CW)
+        when (tool) {
+            Tool.RECTANGLE -> path.addRect(startPoint.x, startPoint.y, x, y, Path.Direction.CW)
+            Tool.CIRCLE -> path.addOval(startPoint.x, startPoint.y, x, y, Path.Direction.CW)
             else -> return
         }
         invalidate()
     }
 
-    fun setupBrush(selectedBrush: Brush) {
-        brush = selectedBrush
-        if (brush == Brush.ERASER) {
+    fun setupBrush(selectedTool: Tool) {
+        tool = selectedTool
+        if (tool == Tool.ERASER) {
             paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR)
             return
         }
diff --git a/app/src/main/java/woowacourse/paint/canvas/Brush.kt b/app/src/main/java/woowacourse/paint/canvas/Tool.kt
similarity index 78%
rename from app/src/main/java/woowacourse/paint/canvas/Brush.kt
rename to app/src/main/java/woowacourse/paint/canvas/Tool.kt
index 804f7ef8..d736afbe 100644
--- a/app/src/main/java/woowacourse/paint/canvas/Brush.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/Tool.kt
@@ -1,5 +1,5 @@
 package woowacourse.paint.canvas
 
-enum class Brush {
+enum class Tool {
     PEN, RECTANGLE, CIRCLE, ERASER
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f4705292..0f4af926 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,7 +9,7 @@
 
         <import type="woowacourse.paint.PaintChangingState" />
 
-        <import type="woowacourse.paint.canvas.Brush" />
+        <import type="woowacourse.paint.canvas.Tool" />
 
         <import type="android.view.View" />
     </data>
@@ -102,42 +102,42 @@
 
             <Button
                 android:id="@+id/btn_pen"
-                isSelected="@{viewModel.selectedBrush == Brush.PEN}"
+                isSelected="@{viewModel.selectedTool == Tool.PEN}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
                 android:backgroundTint="@color/brush_selected"
-                android:onClick="@{() -> viewModel.pickBrush(Brush.PEN)}"
+                android:onClick="@{() -> viewModel.pickBrush(Tool.PEN)}"
                 android:text="@string/pen" />
 
             <Button
                 android:id="@+id/btn_rectangle"
-                isSelected="@{viewModel.selectedBrush == Brush.RECTANGLE}"
+                isSelected="@{viewModel.selectedTool == Tool.RECTANGLE}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
                 android:backgroundTint="@color/brush_selected"
-                android:onClick="@{() -> viewModel.pickBrush(Brush.RECTANGLE)}"
+                android:onClick="@{() -> viewModel.pickBrush(Tool.RECTANGLE)}"
                 android:text="@string/rectangle" />
 
             <Button
                 android:id="@+id/btn_circle"
-                isSelected="@{viewModel.selectedBrush == Brush.CIRCLE}"
+                isSelected="@{viewModel.selectedTool == Tool.CIRCLE}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
                 android:backgroundTint="@color/brush_selected"
-                android:onClick="@{() -> viewModel.pickBrush(Brush.CIRCLE)}"
+                android:onClick="@{() -> viewModel.pickBrush(Tool.CIRCLE)}"
                 android:text="@string/circle" />
 
             <Button
                 android:id="@+id/btn_eraser"
-                isSelected="@{viewModel.selectedBrush == Brush.ERASER}"
+                isSelected="@{viewModel.selectedTool == Tool.ERASER}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_margin="5dp"
                 android:backgroundTint="@color/brush_selected"
-                android:onClick="@{() -> viewModel.pickBrush(Brush.ERASER)}"
+                android:onClick="@{() -> viewModel.pickBrush(Tool.ERASER)}"
                 android:text="@string/eraser" />
         </LinearLayout>
 

From 1cf36731e3d7991cce283e3b1f0bd128ca53409b Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Tue, 10 Oct 2023 17:12:08 +0900
Subject: [PATCH 14/28] =?UTF-8?q?refactor:=20enum=20class=20=EC=83=81?=
 =?UTF-8?q?=EC=88=98=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/woowacourse/paint/MainViewModel.kt |  4 ++--
 .../java/woowacourse/paint/PaintChangingState.kt     |  2 +-
 app/src/main/res/layout/activity_main.xml            | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/woowacourse/paint/MainViewModel.kt b/app/src/main/java/woowacourse/paint/MainViewModel.kt
index 2df886c0..55b8f7f6 100644
--- a/app/src/main/java/woowacourse/paint/MainViewModel.kt
+++ b/app/src/main/java/woowacourse/paint/MainViewModel.kt
@@ -10,7 +10,7 @@ import woowacourse.paint.model.ColorUiModel
 
 class MainViewModel : ViewModel() {
     private val _paintChangingState =
-        MutableLiveData(PaintChangingState.Nothing)
+        MutableLiveData(PaintChangingState.NOTHING)
     val paintChangingState: LiveData<PaintChangingState>
         get() = _paintChangingState
 
@@ -34,7 +34,7 @@ class MainViewModel : ViewModel() {
 
     fun setSettingState(state: PaintChangingState) {
         if (_paintChangingState.value == state) {
-            _paintChangingState.value = PaintChangingState.Nothing
+            _paintChangingState.value = PaintChangingState.NOTHING
             return
         }
         _paintChangingState.value = state
diff --git a/app/src/main/java/woowacourse/paint/PaintChangingState.kt b/app/src/main/java/woowacourse/paint/PaintChangingState.kt
index 8b043fc7..c74a36b3 100644
--- a/app/src/main/java/woowacourse/paint/PaintChangingState.kt
+++ b/app/src/main/java/woowacourse/paint/PaintChangingState.kt
@@ -1,5 +1,5 @@
 package woowacourse.paint
 
 enum class PaintChangingState {
-    Nothing, ColorChanging, WidthChanging, BrushChanging
+    NOTHING, COLOR_CHANGING, WIDTH_CHANGING, TOOL_CHANGING
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0f4af926..d025a07d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -72,7 +72,7 @@
             android:id="@+id/rs_width_changer"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="@{viewModel.paintChangingState == PaintChangingState.WidthChanging ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.paintChangingState == PaintChangingState.WIDTH_CHANGING ? View.VISIBLE : View.GONE}"
             app:layout_constraintBottom_toTopOf="@id/rv_colors"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
@@ -82,7 +82,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:visibility="@{viewModel.paintChangingState == PaintChangingState.ColorChanging ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.paintChangingState == PaintChangingState.COLOR_CHANGING ? View.VISIBLE : View.GONE}"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toTopOf="@id/ll_brushes"
             app:layout_constraintEnd_toEndOf="parent"
@@ -95,7 +95,7 @@
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
             android:orientation="horizontal"
-            android:visibility="@{viewModel.paintChangingState == PaintChangingState.BrushChanging ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.paintChangingState == PaintChangingState.TOOL_CHANGING ? View.VISIBLE : View.GONE}"
             app:layout_constraintBottom_toTopOf="@id/btn_change_brush"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent">
@@ -147,7 +147,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
-            android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.BrushChanging)}"
+            android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.TOOL_CHANGING)}"
             android:text="@string/main_change_brush"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/btn_change_color"
@@ -158,7 +158,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
-            android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.ColorChanging)}"
+            android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.COLOR_CHANGING)}"
             android:text="@string/main_change_color"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@id/btn_change_thickness"
@@ -170,7 +170,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
-            android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.WidthChanging)}"
+            android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.WIDTH_CHANGING)}"
             android:text="@string/main_change_thickness"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

From 316933edf57da6e80c517f7cd65fb6ff9a51f691 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Tue, 10 Oct 2023 17:40:59 +0900
Subject: [PATCH 15/28] =?UTF-8?q?refactor:=20Drawing=20=ED=81=B4=EB=9E=98?=
 =?UTF-8?q?=EC=8A=A4=20=EC=84=B8=EB=B6=84=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/woowacourse/paint/canvas/CanvasView.kt |  3 ++-
 .../java/woowacourse/paint/canvas/Drawing.kt    | 10 ----------
 .../woowacourse/paint/canvas/drawing/Circle.kt  | 10 ++++++++++
 .../woowacourse/paint/canvas/drawing/Drawing.kt | 17 +++++++++++++++++
 .../woowacourse/paint/canvas/drawing/Line.kt    | 10 ++++++++++
 .../paint/canvas/drawing/Rectangle.kt           | 10 ++++++++++
 6 files changed, 49 insertions(+), 11 deletions(-)
 delete mode 100644 app/src/main/java/woowacourse/paint/canvas/Drawing.kt
 create mode 100644 app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt
 create mode 100644 app/src/main/java/woowacourse/paint/canvas/drawing/Drawing.kt
 create mode 100644 app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt
 create mode 100644 app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt

diff --git a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
index 423f28b6..df9207fa 100644
--- a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
@@ -9,6 +9,7 @@ import android.graphics.PorterDuffXfermode
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.View
+import woowacourse.paint.canvas.drawing.Drawing
 
 class CanvasView(context: Context, attr: AttributeSet) : View(
     context,
@@ -85,7 +86,7 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
 
     private fun addDrawing() {
         if (path.isEmpty) return
-        drawings.add(Drawing.of(path, paint))
+        drawings.add(Drawing.of(path, paint, tool))
         path.reset()
     }
 
diff --git a/app/src/main/java/woowacourse/paint/canvas/Drawing.kt b/app/src/main/java/woowacourse/paint/canvas/Drawing.kt
deleted file mode 100644
index 333d5f85..00000000
--- a/app/src/main/java/woowacourse/paint/canvas/Drawing.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package woowacourse.paint.canvas
-
-import android.graphics.Paint
-import android.graphics.Path
-
-class Drawing private constructor(val path: Path, val paint: Paint) {
-    companion object {
-        fun of(path: Path, paint: Paint) = Drawing(Path(path), Paint(paint))
-    }
-}
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt
new file mode 100644
index 00000000..492c2486
--- /dev/null
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt
@@ -0,0 +1,10 @@
+package woowacourse.paint.canvas.drawing
+
+import android.graphics.Paint
+import android.graphics.Path
+
+class Circle private constructor(path: Path, paint: Paint) : Drawing(path, paint) {
+    companion object {
+        fun of(path: Path, paint: Paint) = Circle(Path(path), Paint(paint))
+    }
+}
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Drawing.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Drawing.kt
new file mode 100644
index 00000000..6b093122
--- /dev/null
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Drawing.kt
@@ -0,0 +1,17 @@
+package woowacourse.paint.canvas.drawing
+
+import android.graphics.Paint
+import android.graphics.Path
+import woowacourse.paint.canvas.Tool
+
+abstract class Drawing(val path: Path, val paint: Paint) {
+    companion object {
+        fun of(path: Path, paint: Paint, tool: Tool): Drawing {
+            return when (tool) {
+                Tool.PEN, Tool.ERASER -> Line.of(path, paint)
+                Tool.RECTANGLE -> Rectangle.of(path, paint)
+                Tool.CIRCLE -> Circle.of(path, paint)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt
new file mode 100644
index 00000000..bf514cea
--- /dev/null
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt
@@ -0,0 +1,10 @@
+package woowacourse.paint.canvas.drawing
+
+import android.graphics.Paint
+import android.graphics.Path
+
+class Line private constructor(path: Path, paint: Paint) : Drawing(path, paint) {
+    companion object {
+        fun of(path: Path, paint: Paint) = Line(Path(path), Paint(paint))
+    }
+}
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt
new file mode 100644
index 00000000..fd33fa72
--- /dev/null
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt
@@ -0,0 +1,10 @@
+package woowacourse.paint.canvas.drawing
+
+import android.graphics.Paint
+import android.graphics.Path
+
+class Rectangle private constructor(path: Path, paint: Paint) : Drawing(path, paint) {
+    companion object {
+        fun of(path: Path, paint: Paint) = Rectangle(Path(path), Paint(paint))
+    }
+}

From 2d10fa3caf140876179f6e86f638b40bf3374c86 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Tue, 10 Oct 2023 17:55:04 +0900
Subject: [PATCH 16/28] =?UTF-8?q?refactor:=20tool=EC=9D=B4=20drawing=20?=
 =?UTF-8?q?=EA=B0=9D=EC=B2=B4=EB=A5=BC=20=EB=A6=AC=ED=84=B4=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../woowacourse/paint/canvas/CanvasView.kt    |  2 +-
 .../java/woowacourse/paint/canvas/Tool.kt     | 22 ++++++++++++++++++-
 .../paint/canvas/drawing/Circle.kt            |  8 +++++++
 .../paint/canvas/drawing/Drawing.kt           | 13 +++--------
 .../woowacourse/paint/canvas/drawing/Line.kt  |  8 +++++++
 .../paint/canvas/drawing/Rectangle.kt         |  8 +++++++
 6 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
index df9207fa..72b97682 100644
--- a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
@@ -86,7 +86,7 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
 
     private fun addDrawing() {
         if (path.isEmpty) return
-        drawings.add(Drawing.of(path, paint, tool))
+        drawings.add(tool.draw(path, paint))
         path.reset()
     }
 
diff --git a/app/src/main/java/woowacourse/paint/canvas/Tool.kt b/app/src/main/java/woowacourse/paint/canvas/Tool.kt
index d736afbe..19a84509 100644
--- a/app/src/main/java/woowacourse/paint/canvas/Tool.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/Tool.kt
@@ -1,5 +1,25 @@
 package woowacourse.paint.canvas
 
+import android.graphics.Paint
+import android.graphics.Path
+import woowacourse.paint.canvas.drawing.Circle
+import woowacourse.paint.canvas.drawing.Drawing
+import woowacourse.paint.canvas.drawing.Line
+import woowacourse.paint.canvas.drawing.Rectangle
+
 enum class Tool {
-    PEN, RECTANGLE, CIRCLE, ERASER
+    PEN {
+        override fun draw(path: Path, paint: Paint): Drawing = Line.of(path, paint)
+    },
+    RECTANGLE {
+        override fun draw(path: Path, paint: Paint): Drawing = Rectangle.of(path, paint)
+    },
+    CIRCLE {
+        override fun draw(path: Path, paint: Paint): Drawing = Circle.of(path, paint)
+    },
+    ERASER {
+        override fun draw(path: Path, paint: Paint): Drawing = Line.of(path, paint)
+    }, ;
+
+    abstract fun draw(path: Path, paint: Paint): Drawing
 }
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt
index 492c2486..5b989a0f 100644
--- a/app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt
@@ -2,8 +2,16 @@ package woowacourse.paint.canvas.drawing
 
 import android.graphics.Paint
 import android.graphics.Path
+import android.view.MotionEvent
 
 class Circle private constructor(path: Path, paint: Paint) : Drawing(path, paint) {
+    override fun onDraw() {
+        TODO("Not yet implemented")
+    }
+
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        TODO("Not yet implemented")
+    }
     companion object {
         fun of(path: Path, paint: Paint) = Circle(Path(path), Paint(paint))
     }
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Drawing.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Drawing.kt
index 6b093122..6097d000 100644
--- a/app/src/main/java/woowacourse/paint/canvas/drawing/Drawing.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Drawing.kt
@@ -2,16 +2,9 @@ package woowacourse.paint.canvas.drawing
 
 import android.graphics.Paint
 import android.graphics.Path
-import woowacourse.paint.canvas.Tool
+import android.view.MotionEvent
 
 abstract class Drawing(val path: Path, val paint: Paint) {
-    companion object {
-        fun of(path: Path, paint: Paint, tool: Tool): Drawing {
-            return when (tool) {
-                Tool.PEN, Tool.ERASER -> Line.of(path, paint)
-                Tool.RECTANGLE -> Rectangle.of(path, paint)
-                Tool.CIRCLE -> Circle.of(path, paint)
-            }
-        }
-    }
+    abstract fun onDraw()
+    abstract fun onTouchEvent(event: MotionEvent): Boolean
 }
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt
index bf514cea..5cedbed4 100644
--- a/app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt
@@ -2,8 +2,16 @@ package woowacourse.paint.canvas.drawing
 
 import android.graphics.Paint
 import android.graphics.Path
+import android.view.MotionEvent
 
 class Line private constructor(path: Path, paint: Paint) : Drawing(path, paint) {
+    override fun onDraw() {
+        TODO("Not yet implemented")
+    }
+
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        TODO("Not yet implemented")
+    }
     companion object {
         fun of(path: Path, paint: Paint) = Line(Path(path), Paint(paint))
     }
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt
index fd33fa72..e0670e52 100644
--- a/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt
@@ -2,8 +2,16 @@ package woowacourse.paint.canvas.drawing
 
 import android.graphics.Paint
 import android.graphics.Path
+import android.view.MotionEvent
 
 class Rectangle private constructor(path: Path, paint: Paint) : Drawing(path, paint) {
+    override fun onDraw() {
+        TODO("Not yet implemented")
+    }
+
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        TODO("Not yet implemented")
+    }
     companion object {
         fun of(path: Path, paint: Paint) = Rectangle(Path(path), Paint(paint))
     }

From f67b8ac349da8ed0fa1dd6166c3c2932d44e61e4 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Wed, 11 Oct 2023 12:42:53 +0900
Subject: [PATCH 17/28] =?UTF-8?q?refactor:=20CanvasView=EA=B0=80=20?=
 =?UTF-8?q?=ED=95=98=EB=8D=98=20=EC=9D=BC=EC=9D=84=20Drawing=20=ED=81=B4?=
 =?UTF-8?q?=EB=9E=98=EC=8A=A4=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../woowacourse/paint/canvas/CanvasView.kt    | 74 +++----------------
 .../java/woowacourse/paint/canvas/Tool.kt     | 15 ++--
 .../paint/canvas/drawing/Circle.kt            | 26 +++++--
 .../paint/canvas/drawing/Drawing.kt           |  9 ++-
 .../woowacourse/paint/canvas/drawing/Line.kt  | 33 +++++++--
 .../paint/canvas/drawing/Rectangle.kt         | 27 +++++--
 6 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
index 72b97682..dda49f02 100644
--- a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
@@ -3,7 +3,6 @@ package woowacourse.paint.canvas
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Paint
-import android.graphics.Path
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffXfermode
 import android.util.AttributeSet
@@ -26,9 +25,6 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
             null
         }
     }
-    private val path = Path()
-
-    private var startPoint: Point = Point(0f, 0f)
     private val drawings = mutableListOf<Drawing>()
 
     private val drawingsCanceled = mutableListOf<Drawing>()
@@ -44,72 +40,21 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
 
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
-        drawings.forEach { line ->
-            canvas.drawPath(line.path, line.paint)
+        drawings.forEach { drawing ->
+            drawing.onDraw(canvas)
         }
-        canvas.drawPath(path, paint)
     }
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
-        when (tool) {
-            Tool.PEN, Tool.ERASER -> drawLine(event)
-            Tool.RECTANGLE, Tool.CIRCLE -> drawShape(event)
-        }
-        return true
-    }
-
-    private fun drawLine(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)
-        }
-    }
-
-    private fun drawDot(x: Float, y: Float) {
-        startPoint = Point(x, y)
-        path.moveTo(startPoint.x, startPoint.y)
-        path.lineTo(x, y)
-        invalidate()
-    }
-
-    private fun drawLine(x: Float, y: Float) {
-        path.moveTo(startPoint.x, startPoint.y)
-        path.lineTo(x, y)
-        startPoint = Point(x, y)
-        invalidate()
-    }
-
-    private fun addDrawing() {
-        if (path.isEmpty) return
-        drawings.add(tool.draw(path, paint))
-        path.reset()
-    }
-
-    private fun drawShape(event: MotionEvent) {
-        val x = event.x
-        val y = event.y
-
         when (event.action) {
-            MotionEvent.ACTION_DOWN -> startPoint = Point(x, y)
-            MotionEvent.ACTION_MOVE -> drawPreview(x, y)
-            MotionEvent.ACTION_UP -> addDrawing()
-            else -> super.onTouchEvent(event)
-        }
-    }
-
-    private fun drawPreview(x: Float, y: Float) {
-        path.reset()
-        when (tool) {
-            Tool.RECTANGLE -> path.addRect(startPoint.x, startPoint.y, x, y, Path.Direction.CW)
-            Tool.CIRCLE -> path.addOval(startPoint.x, startPoint.y, x, y, Path.Direction.CW)
-            else -> return
+            MotionEvent.ACTION_DOWN -> {
+                drawingsCanceled.clear()
+                drawings.add(tool.draw(paint, ::invalidate))
+                drawings.last().onTouchEvent(event)
+            }
+            else -> drawings.last().onTouchEvent(event)
         }
-        invalidate()
+        return true
     }
 
     fun setupBrush(selectedTool: Tool) {
@@ -132,7 +77,6 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
     fun eraseAll() {
         drawings.clear()
         drawingsCanceled.clear()
-        path.reset()
         invalidate()
     }
 
diff --git a/app/src/main/java/woowacourse/paint/canvas/Tool.kt b/app/src/main/java/woowacourse/paint/canvas/Tool.kt
index 19a84509..d1998f67 100644
--- a/app/src/main/java/woowacourse/paint/canvas/Tool.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/Tool.kt
@@ -1,7 +1,6 @@
 package woowacourse.paint.canvas
 
 import android.graphics.Paint
-import android.graphics.Path
 import woowacourse.paint.canvas.drawing.Circle
 import woowacourse.paint.canvas.drawing.Drawing
 import woowacourse.paint.canvas.drawing.Line
@@ -9,17 +8,21 @@ import woowacourse.paint.canvas.drawing.Rectangle
 
 enum class Tool {
     PEN {
-        override fun draw(path: Path, paint: Paint): Drawing = Line.of(path, paint)
+        override fun draw(paint: Paint, invalidate: () -> Unit): Drawing =
+            Line.of(paint, invalidate)
     },
     RECTANGLE {
-        override fun draw(path: Path, paint: Paint): Drawing = Rectangle.of(path, paint)
+        override fun draw(paint: Paint, invalidate: () -> Unit): Drawing =
+            Rectangle.of(paint, invalidate)
     },
     CIRCLE {
-        override fun draw(path: Path, paint: Paint): Drawing = Circle.of(path, paint)
+        override fun draw(paint: Paint, invalidate: () -> Unit): Drawing =
+            Circle.of(paint, invalidate)
     },
     ERASER {
-        override fun draw(path: Path, paint: Paint): Drawing = Line.of(path, paint)
+        override fun draw(paint: Paint, invalidate: () -> Unit): Drawing =
+            Line.of(paint, invalidate)
     }, ;
 
-    abstract fun draw(path: Path, paint: Paint): Drawing
+    abstract fun draw(paint: Paint, invalidate: () -> Unit): Drawing
 }
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt
index 5b989a0f..60f6dc1b 100644
--- a/app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt
@@ -3,16 +3,30 @@ package woowacourse.paint.canvas.drawing
 import android.graphics.Paint
 import android.graphics.Path
 import android.view.MotionEvent
+import woowacourse.paint.canvas.Point
 
-class Circle private constructor(path: Path, paint: Paint) : Drawing(path, paint) {
-    override fun onDraw() {
-        TODO("Not yet implemented")
-    }
+class Circle private constructor(paint: Paint, private val invalidate: () -> Unit) :
+    Drawing(paint) {
+    private lateinit var startPoint: Point
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
-        TODO("Not yet implemented")
+        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()
+            }
+
+            else -> return true
+        }
+        return true
     }
+
     companion object {
-        fun of(path: Path, paint: Paint) = Circle(Path(path), Paint(paint))
+        fun of(paint: Paint, invalidate: () -> Unit) = Circle(Paint(paint), invalidate)
     }
 }
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Drawing.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Drawing.kt
index 6097d000..bb7e495f 100644
--- a/app/src/main/java/woowacourse/paint/canvas/drawing/Drawing.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Drawing.kt
@@ -1,10 +1,15 @@
 package woowacourse.paint.canvas.drawing
 
+import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.Path
 import android.view.MotionEvent
 
-abstract class Drawing(val path: Path, val paint: Paint) {
-    abstract fun onDraw()
+abstract class Drawing(val paint: Paint) {
+    val path = Path()
+    fun onDraw(canvas: Canvas) {
+        canvas.drawPath(path, paint)
+    }
+
     abstract fun onTouchEvent(event: MotionEvent): Boolean
 }
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt
index 5cedbed4..4c2795d9 100644
--- a/app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt
@@ -1,18 +1,37 @@
 package woowacourse.paint.canvas.drawing
 
 import android.graphics.Paint
-import android.graphics.Path
 import android.view.MotionEvent
+import woowacourse.paint.canvas.Point
 
-class Line private constructor(path: Path, paint: Paint) : Drawing(path, paint) {
-    override fun onDraw() {
-        TODO("Not yet implemented")
-    }
+class Line private constructor(paint: Paint, val invalidate: () -> Unit) : Drawing(paint) {
+    private lateinit var startPoint: Point
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
-        TODO("Not yet implemented")
+        val x = event.x
+        val y = event.y
+
+        when (event.action) {
+            MotionEvent.ACTION_DOWN -> {
+                startPoint = Point(x, y)
+                path.moveTo(startPoint.x, startPoint.y)
+                path.lineTo(x, y)
+                invalidate()
+            }
+
+            MotionEvent.ACTION_MOVE -> {
+                path.moveTo(startPoint.x, startPoint.y)
+                path.lineTo(x, y)
+                startPoint = Point(x, y)
+                invalidate()
+            }
+
+            else -> return true
+        }
+        return true
     }
+
     companion object {
-        fun of(path: Path, paint: Paint) = Line(Path(path), Paint(paint))
+        fun of(paint: Paint, invalidate: () -> Unit) = Line(Paint(paint), invalidate)
     }
 }
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt
index e0670e52..a9729088 100644
--- a/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt
@@ -3,16 +3,31 @@ package woowacourse.paint.canvas.drawing
 import android.graphics.Paint
 import android.graphics.Path
 import android.view.MotionEvent
+import woowacourse.paint.canvas.Point
 
-class Rectangle private constructor(path: Path, paint: Paint) : Drawing(path, paint) {
-    override fun onDraw() {
-        TODO("Not yet implemented")
-    }
+class Rectangle private constructor(paint: Paint, private val invalidate: () -> Unit) :
+    Drawing(paint) {
+    private lateinit var startPoint: Point
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
-        TODO("Not yet implemented")
+        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()
+            }
+
+            else -> return true
+        }
+        return true
     }
+
     companion object {
-        fun of(path: Path, paint: Paint) = Rectangle(Path(path), Paint(paint))
+        fun of(paint: Paint, invalidate: () -> Unit) =
+            Rectangle(Paint(paint), invalidate)
     }
 }

From ee553e0e0d55c84229375185807901912e56de23 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Wed, 11 Oct 2023 12:44:51 +0900
Subject: [PATCH 18/28] =?UTF-8?q?refactor:=20undo,=20redo=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=A4=84=20=EC=88=98=20=EC=A4=84=EC=9D=B4=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/woowacourse/paint/canvas/CanvasView.kt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
index dda49f02..846fca5b 100644
--- a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
@@ -52,6 +52,7 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
                 drawings.add(tool.draw(paint, ::invalidate))
                 drawings.last().onTouchEvent(event)
             }
+
             else -> drawings.last().onTouchEvent(event)
         }
         return true
@@ -81,16 +82,14 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
     }
 
     fun undo() {
-        val drawing = drawings.removeLastOrNull()
-        if (drawing != null) {
+        drawings.removeLastOrNull()?.let { drawing ->
             drawingsCanceled.add(drawing)
             invalidate()
         }
     }
 
     fun redo() {
-        val drawing = drawingsCanceled.removeLastOrNull()
-        if (drawing != null) {
+        drawingsCanceled.removeLastOrNull()?.let { drawing ->
             drawings.add(drawing)
             invalidate()
         }

From cd6ff78434fa1b4d13135b0d225d4de1a876e32a Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Wed, 11 Oct 2023 13:21:04 +0900
Subject: [PATCH 19/28] =?UTF-8?q?design:=20=EB=8F=84=EA=B5=AC=EC=97=90=20?=
 =?UTF-8?q?=EB=94=B0=EB=A5=B8=20=EC=84=A4=EC=A0=95=20=ED=99=94=EB=A9=B4=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../woowacourse/paint/PaintChangingState.kt   |  2 +-
 .../java/woowacourse/paint/canvas/Tool.kt     | 10 +--
 app/src/main/res/layout/activity_main.xml     | 71 ++++++++-----------
 3 files changed, 35 insertions(+), 48 deletions(-)

diff --git a/app/src/main/java/woowacourse/paint/PaintChangingState.kt b/app/src/main/java/woowacourse/paint/PaintChangingState.kt
index c74a36b3..394e7c98 100644
--- a/app/src/main/java/woowacourse/paint/PaintChangingState.kt
+++ b/app/src/main/java/woowacourse/paint/PaintChangingState.kt
@@ -1,5 +1,5 @@
 package woowacourse.paint
 
 enum class PaintChangingState {
-    NOTHING, COLOR_CHANGING, WIDTH_CHANGING, TOOL_CHANGING
+    NOTHING, COLOR_CHANGING, WIDTH_CHANGING
 }
diff --git a/app/src/main/java/woowacourse/paint/canvas/Tool.kt b/app/src/main/java/woowacourse/paint/canvas/Tool.kt
index d1998f67..ce160258 100644
--- a/app/src/main/java/woowacourse/paint/canvas/Tool.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/Tool.kt
@@ -6,20 +6,20 @@ import woowacourse.paint.canvas.drawing.Drawing
 import woowacourse.paint.canvas.drawing.Line
 import woowacourse.paint.canvas.drawing.Rectangle
 
-enum class Tool {
-    PEN {
+enum class Tool(val hasWidth: Boolean, val hasColor: Boolean) {
+    PEN(true, true) {
         override fun draw(paint: Paint, invalidate: () -> Unit): Drawing =
             Line.of(paint, invalidate)
     },
-    RECTANGLE {
+    RECTANGLE(false, true) {
         override fun draw(paint: Paint, invalidate: () -> Unit): Drawing =
             Rectangle.of(paint, invalidate)
     },
-    CIRCLE {
+    CIRCLE(false, true) {
         override fun draw(paint: Paint, invalidate: () -> Unit): Drawing =
             Circle.of(paint, invalidate)
     },
-    ERASER {
+    ERASER(true, false) {
         override fun draw(paint: Paint, invalidate: () -> Unit): Drawing =
             Line.of(paint, invalidate)
     }, ;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d025a07d..aad4f8ba 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -72,8 +72,8 @@
             android:id="@+id/rs_width_changer"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="@{viewModel.paintChangingState == PaintChangingState.WIDTH_CHANGING ? View.VISIBLE : View.GONE}"
-            app:layout_constraintBottom_toTopOf="@id/rv_colors"
+            android:visibility="@{viewModel.paintChangingState == PaintChangingState.WIDTH_CHANGING &amp;&amp; viewModel.selectedTool.hasWidth ? View.VISIBLE : View.GONE}"
+            app:layout_constraintBottom_toTopOf="@id/btn_change_width"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
@@ -82,21 +82,44 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:visibility="@{viewModel.paintChangingState == PaintChangingState.COLOR_CHANGING ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.paintChangingState == PaintChangingState.COLOR_CHANGING &amp;&amp; viewModel.selectedTool.hasColor ? View.VISIBLE : View.GONE}"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintBottom_toTopOf="@id/ll_brushes"
+            app:layout_constraintBottom_toTopOf="@id/btn_change_color"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             tools:listitem="@layout/item_color_palette" />
 
+        <Button
+            android:id="@+id/btn_change_color"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.COLOR_CHANGING)}"
+            android:text="@string/main_change_color"
+            android:visibility="@{viewModel.selectedTool.hasColor ? View.VISIBLE : View.GONE}"
+            app:layout_constraintBottom_toTopOf="@id/ll_brushes"
+            app:layout_constraintEnd_toStartOf="@id/btn_change_width"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <Button
+            android:id="@+id/btn_change_width"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.WIDTH_CHANGING)}"
+            android:text="@string/main_change_thickness"
+            android:visibility="@{viewModel.selectedTool.hasWidth ? View.VISIBLE : View.GONE}"
+            app:layout_constraintBottom_toTopOf="@id/ll_brushes"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/btn_change_color" />
+
         <LinearLayout
             android:id="@+id/ll_brushes"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
             android:orientation="horizontal"
-            android:visibility="@{viewModel.paintChangingState == PaintChangingState.TOOL_CHANGING ? View.VISIBLE : View.GONE}"
-            app:layout_constraintBottom_toTopOf="@id/btn_change_brush"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
@@ -141,41 +164,5 @@
                 android:text="@string/eraser" />
         </LinearLayout>
 
-
-        <Button
-            android:id="@+id/btn_change_brush"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.TOOL_CHANGING)}"
-            android:text="@string/main_change_brush"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/btn_change_color"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <Button
-            android:id="@+id/btn_change_color"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.COLOR_CHANGING)}"
-            android:text="@string/main_change_color"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/btn_change_thickness"
-            app:layout_constraintHorizontal_chainStyle="packed"
-            app:layout_constraintStart_toEndOf="@id/btn_change_brush" />
-
-        <Button
-            android:id="@+id/btn_change_thickness"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.WIDTH_CHANGING)}"
-            android:text="@string/main_change_thickness"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/btn_change_color" />
-
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

From dd8e2019ba9f932e6cc3f7ac0185b2368ae73a86 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Wed, 11 Oct 2023 14:08:13 +0900
Subject: [PATCH 20/28] =?UTF-8?q?refactor:=20=EB=8F=84=EA=B5=AC=EC=97=90?=
 =?UTF-8?q?=20=EB=94=B0=EB=9D=BC=20=EB=B2=84=ED=8A=BC=20=EB=8F=99=EC=A0=81?=
 =?UTF-8?q?=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/woowacourse/paint/MainActivity.kt    | 28 +++++++++++-
 .../java/woowacourse/paint/MainViewModel.kt   |  6 ++-
 .../woowacourse/paint/model/ToolUiModel.kt    |  5 +++
 .../woowacourse/paint/utils/ToolMapper.kt     | 14 ++++++
 app/src/main/res/layout/activity_main.xml     | 43 +------------------
 app/src/main/res/layout/item_tool.xml         | 26 +++++++++++
 6 files changed, 76 insertions(+), 46 deletions(-)
 create mode 100644 app/src/main/java/woowacourse/paint/model/ToolUiModel.kt
 create mode 100644 app/src/main/java/woowacourse/paint/utils/ToolMapper.kt
 create mode 100644 app/src/main/res/layout/item_tool.xml

diff --git a/app/src/main/java/woowacourse/paint/MainActivity.kt b/app/src/main/java/woowacourse/paint/MainActivity.kt
index 956174e3..eceacb93 100644
--- a/app/src/main/java/woowacourse/paint/MainActivity.kt
+++ b/app/src/main/java/woowacourse/paint/MainActivity.kt
@@ -4,7 +4,10 @@ import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.slider.RangeSlider
+import woowacourse.paint.canvas.Tool
 import woowacourse.paint.databinding.ActivityMainBinding
+import woowacourse.paint.databinding.ItemToolBinding
+import woowacourse.paint.utils.toUiModel
 
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
@@ -13,6 +16,7 @@ class MainActivity : AppCompatActivity() {
     private val adapter = ColorsAdapter { model ->
         viewModel.pickColor(model)
     }
+    private val toolButtons = mutableListOf<ItemToolBinding>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -20,6 +24,7 @@ class MainActivity : AppCompatActivity() {
         setupViewModel()
         setupToolbar()
         setupCanvas()
+        setupTools()
         setupColors()
         setupWidthSlider()
     }
@@ -41,8 +46,15 @@ class MainActivity : AppCompatActivity() {
                 adapter.submitList(colors)
             }
         }
-        viewModel.selectedTool.observe(this) { brush ->
-            canvasView.setupBrush(brush)
+        viewModel.selectedTool.observe(this) { tool ->
+            canvasView.setupBrush(tool)
+            changeSelectedTool(tool)
+        }
+    }
+
+    private fun changeSelectedTool(tool: Tool) {
+        toolButtons.forEach { button ->
+            button.root.isSelected = button.tool == tool
         }
     }
 
@@ -59,6 +71,18 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun setupTools() {
+        viewModel.tools.forEach { toolAssigned ->
+            val toolButtonBinding = ItemToolBinding.inflate(layoutInflater, binding.llBrushes, true)
+            with(toolButtonBinding) {
+                onClick = viewModel::pickTool
+                tool = toolAssigned
+                name = getString(toolAssigned.toUiModel().name)
+            }
+            toolButtons.add(toolButtonBinding)
+        }
+    }
+
     private fun setupCanvas() {
         binding.cvCanvas.initPaint(
             viewModel.width.value ?: MainViewModel.DEFAULT_WIDTH,
diff --git a/app/src/main/java/woowacourse/paint/MainViewModel.kt b/app/src/main/java/woowacourse/paint/MainViewModel.kt
index 55b8f7f6..f4267733 100644
--- a/app/src/main/java/woowacourse/paint/MainViewModel.kt
+++ b/app/src/main/java/woowacourse/paint/MainViewModel.kt
@@ -4,8 +4,8 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
-import woowacourse.paint.canvas.Tool
 import woowacourse.paint.canvas.PaletteColor
+import woowacourse.paint.canvas.Tool
 import woowacourse.paint.model.ColorUiModel
 
 class MainViewModel : ViewModel() {
@@ -19,6 +19,8 @@ class MainViewModel : ViewModel() {
     val colors: LiveData<List<ColorUiModel>>
         get() = _colors
 
+    val tools = Tool.values().toList()
+
     private var _selectedTool = MutableLiveData(Tool.PEN)
     val selectedTool: LiveData<Tool>
         get() = _selectedTool
@@ -40,7 +42,7 @@ class MainViewModel : ViewModel() {
         _paintChangingState.value = state
     }
 
-    fun pickBrush(tool: Tool) {
+    fun pickTool(tool: Tool) {
         _selectedTool.value = tool
     }
 
diff --git a/app/src/main/java/woowacourse/paint/model/ToolUiModel.kt b/app/src/main/java/woowacourse/paint/model/ToolUiModel.kt
new file mode 100644
index 00000000..a20b5bfa
--- /dev/null
+++ b/app/src/main/java/woowacourse/paint/model/ToolUiModel.kt
@@ -0,0 +1,5 @@
+package woowacourse.paint.model
+
+import androidx.annotation.StringRes
+
+data class ToolUiModel(@StringRes val name: Int)
diff --git a/app/src/main/java/woowacourse/paint/utils/ToolMapper.kt b/app/src/main/java/woowacourse/paint/utils/ToolMapper.kt
new file mode 100644
index 00000000..278c740c
--- /dev/null
+++ b/app/src/main/java/woowacourse/paint/utils/ToolMapper.kt
@@ -0,0 +1,14 @@
+package woowacourse.paint.utils
+
+import woowacourse.paint.R
+import woowacourse.paint.canvas.Tool
+import woowacourse.paint.model.ToolUiModel
+
+fun Tool.toUiModel(): ToolUiModel {
+    return when (this) {
+        Tool.PEN -> ToolUiModel(R.string.pen)
+        Tool.RECTANGLE -> ToolUiModel(R.string.rectangle)
+        Tool.CIRCLE -> ToolUiModel(R.string.circle)
+        Tool.ERASER -> ToolUiModel(R.string.eraser)
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index aad4f8ba..d41c204c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -121,48 +121,7 @@
             android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent">
-
-            <Button
-                android:id="@+id/btn_pen"
-                isSelected="@{viewModel.selectedTool == Tool.PEN}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:backgroundTint="@color/brush_selected"
-                android:onClick="@{() -> viewModel.pickBrush(Tool.PEN)}"
-                android:text="@string/pen" />
-
-            <Button
-                android:id="@+id/btn_rectangle"
-                isSelected="@{viewModel.selectedTool == Tool.RECTANGLE}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:backgroundTint="@color/brush_selected"
-                android:onClick="@{() -> viewModel.pickBrush(Tool.RECTANGLE)}"
-                android:text="@string/rectangle" />
-
-            <Button
-                android:id="@+id/btn_circle"
-                isSelected="@{viewModel.selectedTool == Tool.CIRCLE}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:backgroundTint="@color/brush_selected"
-                android:onClick="@{() -> viewModel.pickBrush(Tool.CIRCLE)}"
-                android:text="@string/circle" />
-
-            <Button
-                android:id="@+id/btn_eraser"
-                isSelected="@{viewModel.selectedTool == Tool.ERASER}"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="5dp"
-                android:backgroundTint="@color/brush_selected"
-                android:onClick="@{() -> viewModel.pickBrush(Tool.ERASER)}"
-                android:text="@string/eraser" />
-        </LinearLayout>
+            app:layout_constraintStart_toStartOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/item_tool.xml b/app/src/main/res/layout/item_tool.xml
new file mode 100644
index 00000000..06b61429
--- /dev/null
+++ b/app/src/main/res/layout/item_tool.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <data>
+        <variable
+            name="tool"
+            type="woowacourse.paint.canvas.Tool" />
+
+        <variable
+            name="name"
+            type="String" />
+
+        <variable
+            name="onClick"
+            type="kotlin.jvm.functions.Function1" />
+    </data>
+
+    <Button xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/btn_pen"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="5dp"
+        android:backgroundTint="@color/brush_selected"
+        android:onClick="@{() -> onClick.invoke(tool)}"
+        android:text="@{name}" />
+</layout>

From 26e18fe98142c9433b09cafcb5d28e95a7b37810 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Wed, 11 Oct 2023 14:10:11 +0900
Subject: [PATCH 21/28] =?UTF-8?q?refactor:=20brushes=20->=20tools=EB=A1=9C?=
 =?UTF-8?q?=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/woowacourse/paint/MainActivity.kt  |  4 ++--
 .../java/woowacourse/paint/utils/BindingAdapter.kt   | 12 ------------
 app/src/main/res/layout/activity_main.xml            |  6 +++---
 3 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 app/src/main/java/woowacourse/paint/utils/BindingAdapter.kt

diff --git a/app/src/main/java/woowacourse/paint/MainActivity.kt b/app/src/main/java/woowacourse/paint/MainActivity.kt
index eceacb93..3c379f5a 100644
--- a/app/src/main/java/woowacourse/paint/MainActivity.kt
+++ b/app/src/main/java/woowacourse/paint/MainActivity.kt
@@ -47,7 +47,7 @@ class MainActivity : AppCompatActivity() {
             }
         }
         viewModel.selectedTool.observe(this) { tool ->
-            canvasView.setupBrush(tool)
+            canvasView.setupTools(tool)
             changeSelectedTool(tool)
         }
     }
@@ -73,7 +73,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun setupTools() {
         viewModel.tools.forEach { toolAssigned ->
-            val toolButtonBinding = ItemToolBinding.inflate(layoutInflater, binding.llBrushes, true)
+            val toolButtonBinding = ItemToolBinding.inflate(layoutInflater, binding.llTools, true)
             with(toolButtonBinding) {
                 onClick = viewModel::pickTool
                 tool = toolAssigned
diff --git a/app/src/main/java/woowacourse/paint/utils/BindingAdapter.kt b/app/src/main/java/woowacourse/paint/utils/BindingAdapter.kt
deleted file mode 100644
index b23af66d..00000000
--- a/app/src/main/java/woowacourse/paint/utils/BindingAdapter.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package woowacourse.paint.utils
-
-import android.widget.Button
-import androidx.databinding.BindingAdapter
-
-object BindingAdapter {
-    @BindingAdapter("isSelected")
-    @JvmStatic
-    fun isSelected(button: Button, isSelected: Boolean) {
-        button.isSelected = isSelected
-    }
-}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d41c204c..33642d6a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -97,7 +97,7 @@
             android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.COLOR_CHANGING)}"
             android:text="@string/main_change_color"
             android:visibility="@{viewModel.selectedTool.hasColor ? View.VISIBLE : View.GONE}"
-            app:layout_constraintBottom_toTopOf="@id/ll_brushes"
+            app:layout_constraintBottom_toTopOf="@id/ll_tools"
             app:layout_constraintEnd_toStartOf="@id/btn_change_width"
             app:layout_constraintStart_toStartOf="parent" />
 
@@ -109,12 +109,12 @@
             android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.WIDTH_CHANGING)}"
             android:text="@string/main_change_thickness"
             android:visibility="@{viewModel.selectedTool.hasWidth ? View.VISIBLE : View.GONE}"
-            app:layout_constraintBottom_toTopOf="@id/ll_brushes"
+            app:layout_constraintBottom_toTopOf="@id/ll_tools"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/btn_change_color" />
 
         <LinearLayout
-            android:id="@+id/ll_brushes"
+            android:id="@+id/ll_tools"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"

From f412171fac8f81f8ac6e4ac3bcdbdefc5113e22d Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Wed, 11 Oct 2023 14:13:38 +0900
Subject: [PATCH 22/28] =?UTF-8?q?refactor:=20=ED=95=A8=EC=88=98=EB=AA=85?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/woowacourse/paint/MainActivity.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/woowacourse/paint/MainActivity.kt b/app/src/main/java/woowacourse/paint/MainActivity.kt
index 3c379f5a..e4115da9 100644
--- a/app/src/main/java/woowacourse/paint/MainActivity.kt
+++ b/app/src/main/java/woowacourse/paint/MainActivity.kt
@@ -48,11 +48,11 @@ class MainActivity : AppCompatActivity() {
         }
         viewModel.selectedTool.observe(this) { tool ->
             canvasView.setupTools(tool)
-            changeSelectedTool(tool)
+            changeButtonSelectedStatus(tool)
         }
     }
 
-    private fun changeSelectedTool(tool: Tool) {
+    private fun changeButtonSelectedStatus(tool: Tool) {
         toolButtons.forEach { button ->
             button.root.isSelected = button.tool == tool
         }

From acb317fdc51daa0ada78bf9464ba197b6dbc539b Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Wed, 11 Oct 2023 14:21:58 +0900
Subject: [PATCH 23/28] =?UTF-8?q?refactor:=20tool=20=EB=B0=94=EA=BF=80=20?=
 =?UTF-8?q?=EB=95=8C=20=EC=84=A4=EC=A0=95=EC=B0=BD=20=EB=8B=AB=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/woowacourse/paint/MainActivity.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/woowacourse/paint/MainActivity.kt b/app/src/main/java/woowacourse/paint/MainActivity.kt
index e4115da9..37a39f38 100644
--- a/app/src/main/java/woowacourse/paint/MainActivity.kt
+++ b/app/src/main/java/woowacourse/paint/MainActivity.kt
@@ -56,6 +56,7 @@ class MainActivity : AppCompatActivity() {
         toolButtons.forEach { button ->
             button.root.isSelected = button.tool == tool
         }
+        viewModel.setSettingState(PaintChangingState.NOTHING)
     }
 
     private fun setupToolbar() {

From f55275e0067a5cf7c39f538a2cdc570695e803a4 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Wed, 11 Oct 2023 14:30:07 +0900
Subject: [PATCH 24/28] =?UTF-8?q?fix:=20Rectangle=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/woowacourse/paint/canvas/CanvasView.kt  | 8 +++++++-
 .../java/woowacourse/paint/canvas/drawing/Rectangle.kt    | 7 ++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
index 846fca5b..2b91c3c4 100644
--- a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
@@ -53,12 +53,18 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
                 drawings.last().onTouchEvent(event)
             }
 
+            MotionEvent.ACTION_UP -> {
+                drawings.lastOrNull()?.let { drawing ->
+                    if (drawing.path.isEmpty) drawings.remove(drawing)
+                }
+            }
+
             else -> drawings.last().onTouchEvent(event)
         }
         return true
     }
 
-    fun setupBrush(selectedTool: Tool) {
+    fun setupTools(selectedTool: Tool) {
         tool = selectedTool
         if (tool == Tool.ERASER) {
             paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR)
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt
index a9729088..5c63a206 100644
--- a/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt
@@ -16,8 +16,13 @@ class Rectangle private constructor(paint: Paint, private val invalidate: () ->
         when (event.action) {
             MotionEvent.ACTION_DOWN -> startPoint = Point(x, y)
             MotionEvent.ACTION_MOVE -> {
+                val left = if (startPoint.x < x) startPoint.x else x
+                val top = if (startPoint.y > y) y else startPoint.y
+                val right = if (startPoint.x < x) x else startPoint.x
+                val bottom = if (startPoint.y > y) startPoint.y else y
+
                 path.reset()
-                path.addRect(startPoint.x, startPoint.y, x, y, Path.Direction.CW)
+                path.addRect(left, top, right, bottom, Path.Direction.CW)
                 invalidate()
             }
 

From b10fda72a1599442f249844e5d3f5b6c0ed8b78d Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Wed, 11 Oct 2023 14:32:43 +0900
Subject: [PATCH 25/28] =?UTF-8?q?refactor:=20=EB=8F=84=EA=B5=AC=20?=
 =?UTF-8?q?=EB=AA=A8=EC=9D=8C=20=EC=9D=BC=EC=B9=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/woowacourse/paint/MainViewModel.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/woowacourse/paint/MainViewModel.kt b/app/src/main/java/woowacourse/paint/MainViewModel.kt
index f4267733..7affd22d 100644
--- a/app/src/main/java/woowacourse/paint/MainViewModel.kt
+++ b/app/src/main/java/woowacourse/paint/MainViewModel.kt
@@ -21,7 +21,7 @@ class MainViewModel : ViewModel() {
 
     val tools = Tool.values().toList()
 
-    private var _selectedTool = MutableLiveData(Tool.PEN)
+    private var _selectedTool = MutableLiveData(tools.first())
     val selectedTool: LiveData<Tool>
         get() = _selectedTool
 

From d4a46c47c8b82c75b9170fb40590b080ffdda146 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Wed, 11 Oct 2023 15:10:57 +0900
Subject: [PATCH 26/28] =?UTF-8?q?refactor:=20tool=20->=20drawingTool?=
 =?UTF-8?q?=EB=A1=9C=20=EB=84=A4=EC=9D=B4=EB=B0=8D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/woowacourse/paint/MainActivity.kt  | 12 ++++++------
 app/src/main/java/woowacourse/paint/MainViewModel.kt | 12 ++++++------
 .../main/java/woowacourse/paint/canvas/CanvasView.kt | 12 ++++++------
 .../paint/canvas/{Tool.kt => DrawingTool.kt}         |  2 +-
 .../main/java/woowacourse/paint/utils/ToolMapper.kt  | 12 ++++++------
 app/src/main/res/layout/activity_main.xml            | 10 +++++-----
 app/src/main/res/layout/item_tool.xml                |  6 +++---
 7 files changed, 33 insertions(+), 33 deletions(-)
 rename app/src/main/java/woowacourse/paint/canvas/{Tool.kt => DrawingTool.kt} (92%)

diff --git a/app/src/main/java/woowacourse/paint/MainActivity.kt b/app/src/main/java/woowacourse/paint/MainActivity.kt
index 37a39f38..c45aa394 100644
--- a/app/src/main/java/woowacourse/paint/MainActivity.kt
+++ b/app/src/main/java/woowacourse/paint/MainActivity.kt
@@ -4,7 +4,7 @@ import android.os.Bundle
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.slider.RangeSlider
-import woowacourse.paint.canvas.Tool
+import woowacourse.paint.canvas.DrawingTool
 import woowacourse.paint.databinding.ActivityMainBinding
 import woowacourse.paint.databinding.ItemToolBinding
 import woowacourse.paint.utils.toUiModel
@@ -46,15 +46,15 @@ class MainActivity : AppCompatActivity() {
                 adapter.submitList(colors)
             }
         }
-        viewModel.selectedTool.observe(this) { tool ->
+        viewModel.selectedDrawingTool.observe(this) { tool ->
             canvasView.setupTools(tool)
             changeButtonSelectedStatus(tool)
         }
     }
 
-    private fun changeButtonSelectedStatus(tool: Tool) {
+    private fun changeButtonSelectedStatus(drawingTool: DrawingTool) {
         toolButtons.forEach { button ->
-            button.root.isSelected = button.tool == tool
+            button.root.isSelected = button.drawingTool == drawingTool
         }
         viewModel.setSettingState(PaintChangingState.NOTHING)
     }
@@ -73,11 +73,11 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun setupTools() {
-        viewModel.tools.forEach { toolAssigned ->
+        viewModel.drawingTools.forEach { toolAssigned ->
             val toolButtonBinding = ItemToolBinding.inflate(layoutInflater, binding.llTools, true)
             with(toolButtonBinding) {
                 onClick = viewModel::pickTool
-                tool = toolAssigned
+                drawingTool = toolAssigned
                 name = getString(toolAssigned.toUiModel().name)
             }
             toolButtons.add(toolButtonBinding)
diff --git a/app/src/main/java/woowacourse/paint/MainViewModel.kt b/app/src/main/java/woowacourse/paint/MainViewModel.kt
index 7affd22d..c79af3df 100644
--- a/app/src/main/java/woowacourse/paint/MainViewModel.kt
+++ b/app/src/main/java/woowacourse/paint/MainViewModel.kt
@@ -4,8 +4,8 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
+import woowacourse.paint.canvas.DrawingTool
 import woowacourse.paint.canvas.PaletteColor
-import woowacourse.paint.canvas.Tool
 import woowacourse.paint.model.ColorUiModel
 
 class MainViewModel : ViewModel() {
@@ -19,10 +19,10 @@ class MainViewModel : ViewModel() {
     val colors: LiveData<List<ColorUiModel>>
         get() = _colors
 
-    val tools = Tool.values().toList()
+    val drawingTools = DrawingTool.values().toList()
 
-    private var _selectedTool = MutableLiveData(tools.first())
-    val selectedTool: LiveData<Tool>
+    private var _selectedTool = MutableLiveData(drawingTools.first())
+    val selectedDrawingTool: LiveData<DrawingTool>
         get() = _selectedTool
 
     val selectedColor: LiveData<PaletteColor>
@@ -42,8 +42,8 @@ class MainViewModel : ViewModel() {
         _paintChangingState.value = state
     }
 
-    fun pickTool(tool: Tool) {
-        _selectedTool.value = tool
+    fun pickTool(drawingTool: DrawingTool) {
+        _selectedTool.value = drawingTool
     }
 
     fun pickColor(model: ColorUiModel) {
diff --git a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
index 2b91c3c4..890ae8e9 100644
--- a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
@@ -14,12 +14,12 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
     context,
     attr,
 ) {
-    private var tool = Tool.PEN
+    private var drawingTool = DrawingTool.PEN
     private val paint = Paint().apply {
         isAntiAlias = true
         style = Paint.Style.FILL_AND_STROKE
         strokeCap = Paint.Cap.ROUND
-        xfermode = if (tool == Tool.ERASER) {
+        xfermode = if (drawingTool == DrawingTool.ERASER) {
             PorterDuffXfermode(PorterDuff.Mode.CLEAR)
         } else {
             null
@@ -49,7 +49,7 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
                 drawingsCanceled.clear()
-                drawings.add(tool.draw(paint, ::invalidate))
+                drawings.add(drawingTool.draw(paint, ::invalidate))
                 drawings.last().onTouchEvent(event)
             }
 
@@ -64,9 +64,9 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
         return true
     }
 
-    fun setupTools(selectedTool: Tool) {
-        tool = selectedTool
-        if (tool == Tool.ERASER) {
+    fun setupTools(selectedDrawingTool: DrawingTool) {
+        drawingTool = selectedDrawingTool
+        if (drawingTool == DrawingTool.ERASER) {
             paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR)
             return
         }
diff --git a/app/src/main/java/woowacourse/paint/canvas/Tool.kt b/app/src/main/java/woowacourse/paint/canvas/DrawingTool.kt
similarity index 92%
rename from app/src/main/java/woowacourse/paint/canvas/Tool.kt
rename to app/src/main/java/woowacourse/paint/canvas/DrawingTool.kt
index ce160258..a2f90f6c 100644
--- a/app/src/main/java/woowacourse/paint/canvas/Tool.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/DrawingTool.kt
@@ -6,7 +6,7 @@ import woowacourse.paint.canvas.drawing.Drawing
 import woowacourse.paint.canvas.drawing.Line
 import woowacourse.paint.canvas.drawing.Rectangle
 
-enum class Tool(val hasWidth: Boolean, val hasColor: Boolean) {
+enum class DrawingTool(val hasWidth: Boolean, val hasColor: Boolean) {
     PEN(true, true) {
         override fun draw(paint: Paint, invalidate: () -> Unit): Drawing =
             Line.of(paint, invalidate)
diff --git a/app/src/main/java/woowacourse/paint/utils/ToolMapper.kt b/app/src/main/java/woowacourse/paint/utils/ToolMapper.kt
index 278c740c..dcb707dc 100644
--- a/app/src/main/java/woowacourse/paint/utils/ToolMapper.kt
+++ b/app/src/main/java/woowacourse/paint/utils/ToolMapper.kt
@@ -1,14 +1,14 @@
 package woowacourse.paint.utils
 
 import woowacourse.paint.R
-import woowacourse.paint.canvas.Tool
+import woowacourse.paint.canvas.DrawingTool
 import woowacourse.paint.model.ToolUiModel
 
-fun Tool.toUiModel(): ToolUiModel {
+fun DrawingTool.toUiModel(): ToolUiModel {
     return when (this) {
-        Tool.PEN -> ToolUiModel(R.string.pen)
-        Tool.RECTANGLE -> ToolUiModel(R.string.rectangle)
-        Tool.CIRCLE -> ToolUiModel(R.string.circle)
-        Tool.ERASER -> ToolUiModel(R.string.eraser)
+        DrawingTool.PEN -> ToolUiModel(R.string.pen)
+        DrawingTool.RECTANGLE -> ToolUiModel(R.string.rectangle)
+        DrawingTool.CIRCLE -> ToolUiModel(R.string.circle)
+        DrawingTool.ERASER -> ToolUiModel(R.string.eraser)
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 33642d6a..5a71a222 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,7 +9,7 @@
 
         <import type="woowacourse.paint.PaintChangingState" />
 
-        <import type="woowacourse.paint.canvas.Tool" />
+        <import type="woowacourse.paint.canvas.DrawingTool" />
 
         <import type="android.view.View" />
     </data>
@@ -72,7 +72,7 @@
             android:id="@+id/rs_width_changer"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:visibility="@{viewModel.paintChangingState == PaintChangingState.WIDTH_CHANGING &amp;&amp; viewModel.selectedTool.hasWidth ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.paintChangingState == PaintChangingState.WIDTH_CHANGING &amp;&amp; viewModel.selectedDrawingTool.hasWidth ? View.VISIBLE : View.GONE}"
             app:layout_constraintBottom_toTopOf="@id/btn_change_width"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
@@ -82,7 +82,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:visibility="@{viewModel.paintChangingState == PaintChangingState.COLOR_CHANGING &amp;&amp; viewModel.selectedTool.hasColor ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.paintChangingState == PaintChangingState.COLOR_CHANGING &amp;&amp; viewModel.selectedDrawingTool.hasColor ? View.VISIBLE : View.GONE}"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toTopOf="@id/btn_change_color"
             app:layout_constraintEnd_toEndOf="parent"
@@ -96,7 +96,7 @@
             android:layout_margin="5dp"
             android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.COLOR_CHANGING)}"
             android:text="@string/main_change_color"
-            android:visibility="@{viewModel.selectedTool.hasColor ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.selectedDrawingTool.hasColor ? View.VISIBLE : View.GONE}"
             app:layout_constraintBottom_toTopOf="@id/ll_tools"
             app:layout_constraintEnd_toStartOf="@id/btn_change_width"
             app:layout_constraintStart_toStartOf="parent" />
@@ -108,7 +108,7 @@
             android:layout_margin="5dp"
             android:onClick="@{() -> viewModel.setSettingState(PaintChangingState.WIDTH_CHANGING)}"
             android:text="@string/main_change_thickness"
-            android:visibility="@{viewModel.selectedTool.hasWidth ? View.VISIBLE : View.GONE}"
+            android:visibility="@{viewModel.selectedDrawingTool.hasWidth ? View.VISIBLE : View.GONE}"
             app:layout_constraintBottom_toTopOf="@id/ll_tools"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/btn_change_color" />
diff --git a/app/src/main/res/layout/item_tool.xml b/app/src/main/res/layout/item_tool.xml
index 06b61429..2815bc66 100644
--- a/app/src/main/res/layout/item_tool.xml
+++ b/app/src/main/res/layout/item_tool.xml
@@ -3,8 +3,8 @@
 
     <data>
         <variable
-            name="tool"
-            type="woowacourse.paint.canvas.Tool" />
+            name="drawingTool"
+            type="woowacourse.paint.canvas.DrawingTool" />
 
         <variable
             name="name"
@@ -21,6 +21,6 @@
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
         android:backgroundTint="@color/brush_selected"
-        android:onClick="@{() -> onClick.invoke(tool)}"
+        android:onClick="@{() -> onClick.invoke(drawingTool)}"
         android:text="@{name}" />
 </layout>

From 1d905211d7d9d2c75971dec5076a8e3fec7fe710 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Wed, 11 Oct 2023 15:53:39 +0900
Subject: [PATCH 27/28] =?UTF-8?q?refactor:=20Drawings=20=EC=9D=BC=EA=B8=89?=
 =?UTF-8?q?=EC=BB=AC=EB=A0=89=EC=85=98=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../woowacourse/paint/canvas/CanvasView.kt    | 41 +++++-----------
 .../paint/canvas/drawing/Drawings.kt          | 48 +++++++++++++++++++
 2 files changed, 59 insertions(+), 30 deletions(-)
 create mode 100644 app/src/main/java/woowacourse/paint/canvas/drawing/Drawings.kt

diff --git a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
index 890ae8e9..c3a7de46 100644
--- a/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/CanvasView.kt
@@ -8,7 +8,7 @@ import android.graphics.PorterDuffXfermode
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.View
-import woowacourse.paint.canvas.drawing.Drawing
+import woowacourse.paint.canvas.drawing.Drawings
 
 class CanvasView(context: Context, attr: AttributeSet) : View(
     context,
@@ -25,9 +25,7 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
             null
         }
     }
-    private val drawings = mutableListOf<Drawing>()
-
-    private val drawingsCanceled = mutableListOf<Drawing>()
+    private val drawings = Drawings()
 
     init {
         setLayerType(LAYER_TYPE_HARDWARE, null)
@@ -40,28 +38,16 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
 
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
-        drawings.forEach { drawing ->
-            drawing.onDraw(canvas)
-        }
+        drawings.drawAll(canvas)
     }
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
         when (event.action) {
-            MotionEvent.ACTION_DOWN -> {
-                drawingsCanceled.clear()
-                drawings.add(drawingTool.draw(paint, ::invalidate))
-                drawings.last().onTouchEvent(event)
-            }
-
-            MotionEvent.ACTION_UP -> {
-                drawings.lastOrNull()?.let { drawing ->
-                    if (drawing.path.isEmpty) drawings.remove(drawing)
-                }
-            }
-
-            else -> drawings.last().onTouchEvent(event)
+            MotionEvent.ACTION_DOWN -> drawings.add(drawingTool.draw(paint, ::invalidate))
+            MotionEvent.ACTION_UP -> drawings.checkLastDrawingEmpty()
+            else -> super.onTouchEvent(event)
         }
-        return true
+        return drawings.onDrawingTouchEvent(event)
     }
 
     fun setupTools(selectedDrawingTool: DrawingTool) {
@@ -83,21 +69,16 @@ class CanvasView(context: Context, attr: AttributeSet) : View(
 
     fun eraseAll() {
         drawings.clear()
-        drawingsCanceled.clear()
         invalidate()
     }
 
     fun undo() {
-        drawings.removeLastOrNull()?.let { drawing ->
-            drawingsCanceled.add(drawing)
-            invalidate()
-        }
+        drawings.undo()
+        invalidate()
     }
 
     fun redo() {
-        drawingsCanceled.removeLastOrNull()?.let { drawing ->
-            drawings.add(drawing)
-            invalidate()
-        }
+        drawings.redo()
+        invalidate()
     }
 }
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Drawings.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Drawings.kt
new file mode 100644
index 00000000..5f4fe87b
--- /dev/null
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Drawings.kt
@@ -0,0 +1,48 @@
+package woowacourse.paint.canvas.drawing
+
+import android.graphics.Canvas
+import android.view.MotionEvent
+
+class Drawings(
+    private val drawings: MutableList<Drawing> = mutableListOf(),
+    private val drawingsCanceled: MutableList<Drawing> = mutableListOf(),
+) {
+
+    fun onDrawingTouchEvent(event: MotionEvent): Boolean {
+        return drawings.last().onTouchEvent(event)
+    }
+
+    fun drawAll(canvas: Canvas) {
+        drawings.forEach { drawing ->
+            drawing.onDraw(canvas)
+        }
+    }
+
+    fun add(drawing: Drawing) {
+        drawingsCanceled.clear()
+        drawings.add(drawing)
+    }
+
+    fun checkLastDrawingEmpty() {
+        drawings.lastOrNull()?.let { drawing ->
+            if (drawing.path.isEmpty) drawings.remove(drawing)
+        }
+    }
+
+    fun undo() {
+        drawings.removeLastOrNull()?.let { drawing ->
+            drawingsCanceled.add(drawing)
+        }
+    }
+
+    fun redo() {
+        drawingsCanceled.removeLastOrNull()?.let { drawing ->
+            drawings.add(drawing)
+        }
+    }
+
+    fun clear() {
+        drawings.clear()
+        drawingsCanceled.clear()
+    }
+}

From 1264668df43a051cd767a466d92c9057214bffd5 Mon Sep 17 00:00:00 2001
From: hyemdooly <hyemdooly@gmail.com>
Date: Wed, 11 Oct 2023 16:55:13 +0900
Subject: [PATCH 28/28] =?UTF-8?q?refactor:=20=ED=8C=A9=ED=86=A0=EB=A6=AC?=
 =?UTF-8?q?=20=ED=95=A8=EC=88=98=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/woowacourse/paint/MainActivity.kt    |  2 +-
 .../java/woowacourse/paint/canvas/DrawingTool.kt   |  8 ++++----
 .../woowacourse/paint/canvas/drawing/Circle.kt     |  8 ++------
 .../java/woowacourse/paint/canvas/drawing/Line.kt  |  6 +-----
 .../woowacourse/paint/canvas/drawing/Rectangle.kt  |  9 ++-------
 .../{ToolUiModel.kt => DrawingToolUiModel.kt}      |  2 +-
 .../woowacourse/paint/utils/DrawingToolMapper.kt   | 14 ++++++++++++++
 .../java/woowacourse/paint/utils/ToolMapper.kt     | 14 --------------
 8 files changed, 25 insertions(+), 38 deletions(-)
 rename app/src/main/java/woowacourse/paint/model/{ToolUiModel.kt => DrawingToolUiModel.kt} (53%)
 create mode 100644 app/src/main/java/woowacourse/paint/utils/DrawingToolMapper.kt
 delete mode 100644 app/src/main/java/woowacourse/paint/utils/ToolMapper.kt

diff --git a/app/src/main/java/woowacourse/paint/MainActivity.kt b/app/src/main/java/woowacourse/paint/MainActivity.kt
index c45aa394..0192f1b0 100644
--- a/app/src/main/java/woowacourse/paint/MainActivity.kt
+++ b/app/src/main/java/woowacourse/paint/MainActivity.kt
@@ -78,7 +78,7 @@ class MainActivity : AppCompatActivity() {
             with(toolButtonBinding) {
                 onClick = viewModel::pickTool
                 drawingTool = toolAssigned
-                name = getString(toolAssigned.toUiModel().name)
+                name = getString(toolAssigned.toUiModel().toolNameId)
             }
             toolButtons.add(toolButtonBinding)
         }
diff --git a/app/src/main/java/woowacourse/paint/canvas/DrawingTool.kt b/app/src/main/java/woowacourse/paint/canvas/DrawingTool.kt
index a2f90f6c..07303c07 100644
--- a/app/src/main/java/woowacourse/paint/canvas/DrawingTool.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/DrawingTool.kt
@@ -9,19 +9,19 @@ import woowacourse.paint.canvas.drawing.Rectangle
 enum class DrawingTool(val hasWidth: Boolean, val hasColor: Boolean) {
     PEN(true, true) {
         override fun draw(paint: Paint, invalidate: () -> Unit): Drawing =
-            Line.of(paint, invalidate)
+            Line(paint, invalidate)
     },
     RECTANGLE(false, true) {
         override fun draw(paint: Paint, invalidate: () -> Unit): Drawing =
-            Rectangle.of(paint, invalidate)
+            Rectangle(paint, invalidate)
     },
     CIRCLE(false, true) {
         override fun draw(paint: Paint, invalidate: () -> Unit): Drawing =
-            Circle.of(paint, invalidate)
+            Circle(paint, invalidate)
     },
     ERASER(true, false) {
         override fun draw(paint: Paint, invalidate: () -> Unit): Drawing =
-            Line.of(paint, invalidate)
+            Line(paint, invalidate)
     }, ;
 
     abstract fun draw(paint: Paint, invalidate: () -> Unit): Drawing
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt
index 60f6dc1b..2550a55e 100644
--- a/app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Circle.kt
@@ -5,8 +5,8 @@ import android.graphics.Path
 import android.view.MotionEvent
 import woowacourse.paint.canvas.Point
 
-class Circle private constructor(paint: Paint, private val invalidate: () -> Unit) :
-    Drawing(paint) {
+class Circle(paint: Paint, private val invalidate: () -> Unit) :
+    Drawing(Paint(paint)) {
     private lateinit var startPoint: Point
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
@@ -25,8 +25,4 @@ class Circle private constructor(paint: Paint, private val invalidate: () -> Uni
         }
         return true
     }
-
-    companion object {
-        fun of(paint: Paint, invalidate: () -> Unit) = Circle(Paint(paint), invalidate)
-    }
 }
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt
index 4c2795d9..b6b93288 100644
--- a/app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Line.kt
@@ -4,7 +4,7 @@ import android.graphics.Paint
 import android.view.MotionEvent
 import woowacourse.paint.canvas.Point
 
-class Line private constructor(paint: Paint, val invalidate: () -> Unit) : Drawing(paint) {
+class Line(paint: Paint, val invalidate: () -> Unit) : Drawing(Paint(paint)) {
     private lateinit var startPoint: Point
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
@@ -30,8 +30,4 @@ class Line private constructor(paint: Paint, val invalidate: () -> Unit) : Drawi
         }
         return true
     }
-
-    companion object {
-        fun of(paint: Paint, invalidate: () -> Unit) = Line(Paint(paint), invalidate)
-    }
 }
diff --git a/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt b/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt
index 5c63a206..35891b68 100644
--- a/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt
+++ b/app/src/main/java/woowacourse/paint/canvas/drawing/Rectangle.kt
@@ -5,8 +5,8 @@ import android.graphics.Path
 import android.view.MotionEvent
 import woowacourse.paint.canvas.Point
 
-class Rectangle private constructor(paint: Paint, private val invalidate: () -> Unit) :
-    Drawing(paint) {
+class Rectangle(paint: Paint, private val invalidate: () -> Unit) :
+    Drawing(Paint(paint)) {
     private lateinit var startPoint: Point
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
@@ -30,9 +30,4 @@ class Rectangle private constructor(paint: Paint, private val invalidate: () ->
         }
         return true
     }
-
-    companion object {
-        fun of(paint: Paint, invalidate: () -> Unit) =
-            Rectangle(Paint(paint), invalidate)
-    }
 }
diff --git a/app/src/main/java/woowacourse/paint/model/ToolUiModel.kt b/app/src/main/java/woowacourse/paint/model/DrawingToolUiModel.kt
similarity index 53%
rename from app/src/main/java/woowacourse/paint/model/ToolUiModel.kt
rename to app/src/main/java/woowacourse/paint/model/DrawingToolUiModel.kt
index a20b5bfa..96c37f44 100644
--- a/app/src/main/java/woowacourse/paint/model/ToolUiModel.kt
+++ b/app/src/main/java/woowacourse/paint/model/DrawingToolUiModel.kt
@@ -2,4 +2,4 @@ package woowacourse.paint.model
 
 import androidx.annotation.StringRes
 
-data class ToolUiModel(@StringRes val name: Int)
+data class DrawingToolUiModel(@StringRes val toolNameId: Int)
diff --git a/app/src/main/java/woowacourse/paint/utils/DrawingToolMapper.kt b/app/src/main/java/woowacourse/paint/utils/DrawingToolMapper.kt
new file mode 100644
index 00000000..c69eced5
--- /dev/null
+++ b/app/src/main/java/woowacourse/paint/utils/DrawingToolMapper.kt
@@ -0,0 +1,14 @@
+package woowacourse.paint.utils
+
+import woowacourse.paint.R
+import woowacourse.paint.canvas.DrawingTool
+import woowacourse.paint.model.DrawingToolUiModel
+
+fun DrawingTool.toUiModel(): DrawingToolUiModel {
+    return when (this) {
+        DrawingTool.PEN -> DrawingToolUiModel(R.string.pen)
+        DrawingTool.RECTANGLE -> DrawingToolUiModel(R.string.rectangle)
+        DrawingTool.CIRCLE -> DrawingToolUiModel(R.string.circle)
+        DrawingTool.ERASER -> DrawingToolUiModel(R.string.eraser)
+    }
+}
diff --git a/app/src/main/java/woowacourse/paint/utils/ToolMapper.kt b/app/src/main/java/woowacourse/paint/utils/ToolMapper.kt
deleted file mode 100644
index dcb707dc..00000000
--- a/app/src/main/java/woowacourse/paint/utils/ToolMapper.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package woowacourse.paint.utils
-
-import woowacourse.paint.R
-import woowacourse.paint.canvas.DrawingTool
-import woowacourse.paint.model.ToolUiModel
-
-fun DrawingTool.toUiModel(): ToolUiModel {
-    return when (this) {
-        DrawingTool.PEN -> ToolUiModel(R.string.pen)
-        DrawingTool.RECTANGLE -> ToolUiModel(R.string.rectangle)
-        DrawingTool.CIRCLE -> ToolUiModel(R.string.circle)
-        DrawingTool.ERASER -> ToolUiModel(R.string.eraser)
-    }
-}