Skip to content

Implement Rectangle tool support #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hassan-kareem wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Implement Rectangle tool support #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 48 additions & 17 deletions app/src/main/java/com/shezik/drawanywhere/DrawController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ import kotlinx.coroutines.flow.asStateFlow
import java.util.UUID

enum class PenType {
Pen, StrokeEraser, /*PixelEraser*/ // TODO
Pen,
Rectangle, // NEW TOOL
StrokeEraser, /*PixelEraser*/ // TODO
}

data class PenConfig(
Expand All @@ -46,17 +48,23 @@ data class PathWrapper(
private var cachedPathInvalid: MutableState<Boolean> = mutableStateOf(true),
val color: Color,
val width: Float,
val alpha: Float
val alpha: Float,
val smooth: Boolean = true
) {
val cachedPath: Path get() =
if ((_cachedPath.value == null) or cachedPathInvalid.value)
rebuildPath().value
else
_cachedPath.value!!
val cachedPath: Path
get() =
if ((_cachedPath.value == null) || cachedPathInvalid.value)
rebuildPath().value
else
_cachedPath.value!!

@Suppress("UNCHECKED_CAST")
private fun rebuildPath(): MutableState<Path> { // TODO: Find a way to append points to the cached path instead of complete recalculation
_cachedPath.value = pointsToPath(points)
private fun rebuildPath(): MutableState<Path> {
_cachedPath.value = if (smooth) {
pointsToPath(points)
} else {
pointsToPolyline(points)
}
cachedPathInvalid.value = false
return _cachedPath as MutableState<Path>
}
Expand Down Expand Up @@ -109,7 +117,26 @@ class DrawController {
}

_pathList.lastOrNull()?.let { latestPath ->
latestPath.points.add(newPoint)
if (penConfig.penType == PenType.Rectangle) {
// Rectangle: build polygon from start point and current point
val start = latestPath.points.firstOrNull() ?: return

val sx = start.x
val sy = start.y
val ex = newPoint.x
val ey = newPoint.y

latestPath.points.clear()
latestPath.points.add(start) // top-left
latestPath.points.add(Offset(ex, sy)) // top-right
latestPath.points.add(Offset(ex, ey)) // bottom-right
latestPath.points.add(Offset(sx, ey)) // bottom-left
latestPath.points.add(start) // close polygon
} else {
// Freehand pen
latestPath.points.add(newPoint)
}

latestPath.invalidatePath()
}
}
Expand All @@ -123,12 +150,15 @@ class DrawController {
return
}

_pathList.add(PathWrapper(
points = mutableStateListOf(newPoint),
color = penConfig.color,
width = penConfig.width,
alpha = penConfig.alpha
))
_pathList.add(
PathWrapper(
points = mutableStateListOf(newPoint),
color = penConfig.color,
width = penConfig.width,
alpha = penConfig.alpha,
smooth = penConfig.penType != PenType.Rectangle
)
)
}

fun finishPath() {
Expand All @@ -143,7 +173,8 @@ class DrawController {
}

redoStack.clear()
addToUndoStack(DrawAction.AddPath(latestPath)) // Shallow copy, we aren't touching its cachedPath. Undo/redo methods below depend on shallow copying.
// Shallow copy, we aren't touching its cachedPath. Undo/redo methods below depend on shallow copying.
addToUndoStack(DrawAction.AddPath(latestPath))
updateUndoRedoState()
updateClearPathsState()
}
Expand Down
44 changes: 25 additions & 19 deletions app/src/main/java/com/shezik/drawanywhere/DrawToolbar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import androidx.compose.material.icons.automirrored.filled.Redo
import androidx.compose.material.icons.automirrored.filled.Undo
import androidx.compose.material.icons.filled.*
import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material.icons.outlined.CropSquare
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
Expand Down Expand Up @@ -582,7 +583,8 @@ private fun PenTypeSelector(
)

val penTypes = listOf(
PenType.Pen to stringResource(R.string.pen),
PenType.Rectangle to stringResource(R.string.rectangle),
PenType.Pen to stringResource(R.string.pen),
PenType.StrokeEraser to stringResource(R.string.stroke_eraser)
)

Expand Down Expand Up @@ -992,25 +994,29 @@ private fun createAllToolbarButtons(
),

ToolbarButton(
id = "tool_controls",
icon = when (uiState.currentPenType) {
PenType.Pen -> Icons.Default.Edit
PenType.StrokeEraser -> InkEraser24Px
},
contentDescription = stringResource(R.string.tool_controls),
popupPages = listOf(
{ PenTypeSelector(
currentPenType = uiState.currentPenType,
onPenTypeSwitch = onPenTypeSwitch
) },

{ PenControls(
penConfig = uiState.currentPenConfig,
onStrokeWidthChange = onStrokeWidthChange,
onAlphaChange = onAlphaChange
) }
id = "tool_controls",
icon = when (uiState.currentPenType) {
PenType.Rectangle -> Icons.Outlined.CropSquare
PenType.Pen -> Icons.Default.Edit
PenType.StrokeEraser -> InkEraser24Px
},
contentDescription = stringResource(R.string.tool_controls),
popupPages = listOf(
{
PenTypeSelector(
currentPenType = uiState.currentPenType,
onPenTypeSwitch = onPenTypeSwitch
)
),
},
{
PenControls(
penConfig = uiState.currentPenConfig,
onStrokeWidthChange = onStrokeWidthChange,
onAlphaChange = onAlphaChange
)
}
)
),

ToolbarButton(
id = "color_picker",
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/com/shezik/drawanywhere/DrawUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,14 @@ fun pointsToPath(points: List<Offset>) = Path().apply {
quadraticTo(start.x, start.y, mid.x, mid.y)
}
lineTo(points.last().x, points.last().y)
}

fun pointsToPolyline(points: List<Offset>) = Path().apply {
if (points.isEmpty())
return@apply

moveTo(points.first().x, points.first().y)
points.drop(1).forEach { point ->
lineTo(point.x, point.y)
}
}
1 change: 1 addition & 0 deletions app/src/main/java/com/shezik/drawanywhere/DrawViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ data class UiState(

fun defaultPenConfigs(): Map<PenType, PenConfig> = mapOf(
PenType.Pen to PenConfig(penType = PenType.Pen),
PenType.Rectangle to PenConfig(penType = PenType.Rectangle),
PenType.StrokeEraser to PenConfig(penType = PenType.StrokeEraser, width = 50f)
)

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<string name="expand_toolbar">Expand toolbar</string>
<string name="tools">Tools</string>
<string name="pen">Pen</string>
<string name="rectangle">Rectangle</string>
<string name="stroke_eraser">Stroke Eraser</string>
<string name="color">Color</string>
<string name="width">Width</string>
Expand Down