refactor: tool -> drawingTool로 네이밍 변경

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)

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) {

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
  }

app/src/main/java/woowacourse/paint/canvas/Tool.kt → 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)

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)
  }
 }

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" />

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>