Skip to content

#65: Smart layout switching #82

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
shubertm wants to merge 10 commits into
base: main
Choose a base branch
from
Open

#65: Smart layout switching #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d587e28
Layout switching
shubertm Aug 20, 2023
2dbf88d
Merge remote-tracking branch 'origin/main' into smart-layout
shubertm Aug 20, 2023
4f5ff76
Fix plain layout
shubertm Aug 21, 2023
d76872f
Fix rotation jumps
shubertm Sep 10, 2023
6f13139
Fix switch button
shubertm Sep 12, 2023
32ecb6e
Fix switching layout
shubertm Sep 17, 2023
41dd933
Fix switching layout
shubertm Sep 17, 2023
008bfe5
Merge main
shubertm Sep 17, 2023
fe528da
Fix switching layout
shubertm Sep 19, 2023
0d60b19
Fix manual switch backward rotate + smart switch stopping rotate
shubertm Sep 28, 2023
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
12 changes: 5 additions & 7 deletions app/src/main/java/space/taran/arkretouch/presentation/drawing/EditCanvas.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import android.graphics.Matrix
import android.graphics.PointF
import android.view.MotionEvent
import androidx.compose.foundation.Canvas
import androidx.compose.foundation.gestures.awaitFirstDown
import androidx.compose.foundation.gestures.calculatePan
import androidx.compose.foundation.gestures.calculateZoom
import androidx.compose.foundation.gestures.forEachGesture
Expand Down Expand Up @@ -91,7 +90,6 @@ fun EditCanvas(viewModel: EditViewModel) {
.pointerInput(Any()) {
forEachGesture {
awaitPointerEventScope {
awaitFirstDown()
do {
val event = awaitPointerEvent()
when (true) {
Expand Down Expand Up @@ -146,7 +144,7 @@ fun BackgroundCanvas(modifier: Modifier, editManager: EditManager) {
} ?: run {
val rect = Rect(
Offset.Zero,
imageSize.toSize()
boundRectSize.toSize()
)
canvas.nativeCanvas.setMatrix(matrix)
canvas.drawRect(rect, backgroundPaint)
Expand Down Expand Up @@ -285,13 +283,11 @@ fun DrawCanvas(modifier: Modifier, viewModel: EditViewModel) {
eventX,
eventY
)

editManager.isEyeDropperMode.value -> handleEyeDropEvent(
event.action,
event.x,
event.y
)

else -> handleDrawEvent(event.action, mappedX, mappedY)
}
editManager.invalidatorTick.value++
Expand All @@ -303,7 +299,9 @@ fun DrawCanvas(modifier: Modifier, viewModel: EditViewModel) {
drawIntoCanvas { canvas ->
editManager.apply {
var matrix = this.matrix
if (isRotateMode.value || isResizeMode.value || isBlurMode.value)
if (
isRotateMode.value || isResizeMode.value || isBlurMode.value
)
matrix = editMatrix
if (isCropMode.value) matrix = Matrix()
canvas.nativeCanvas.setMatrix(matrix)
Expand All @@ -318,7 +316,7 @@ fun DrawCanvas(modifier: Modifier, viewModel: EditViewModel) {
}
val rect = Rect(
Offset.Zero,
imageSize.toSize()
boundRectSize.toSize()
)
canvas.drawRect(
rect,
Expand Down
Loading