jarno/element-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

replacing chained ifs with when

Browse source
This commit is contained in:
Adam Brown 2021-11-17 13:27:22 +00:00
parent 2ad121e96e
commit e895dbd923
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
vector/src/main/java/im/vector/app/features/home/room/detail/composer/voice/DraggableStateProcessor.kt
View file

@ -22,7 +22,6 @@ import im.vector.app.R
import im.vector.app.core.utils.DimensionConverter
import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.DraggingState
import im.vector.app.features.home.room.detail.composer.voice.VoiceMessageRecorderView.RecordingUiState
import kotlin.math.abs
class DraggableStateProcessor(
resources: Resources,
@ -53,8 +52,8 @@ class DraggableStateProcessor(
fun process(event: MotionEvent, recordingState: RecordingUiState): RecordingUiState {
val currentX = event.rawX
val currentY = event.rawY
val distanceX = abs(firstX - currentX)
val distanceY = abs(firstY - currentY)
val distanceX = firstX - currentX
val distanceY = firstY - currentY
return nextRecordingState(recordingState, currentX, currentY, distanceX, distanceY).also {
lastX = currentX
lastY = currentY
@ -67,12 +66,10 @@ class DraggableStateProcessor(
return when (recordingState) {
RecordingUiState.Started -> {
// Determine if cancelling or locking for the first move action.
if (((currentX < firstX && rtlXMultiplier == 1) || (currentX > firstX && rtlXMultiplier == -1)) && distanceX > distanceY && distanceX > lastDistanceX) {
DraggingState.Cancelling(distanceX)
} else if (currentY < firstY && distanceY > distanceX && distanceY > lastDistanceY) {
DraggingState.Locking(distanceY)
} else {
recordingState
when {
(isSlidingToCancel(currentX)) && distanceX > distanceY && distanceX > lastDistanceX -> DraggingState.Cancelling(distanceX)
isSlidingToLock(currentY) && distanceY > distanceX && distanceY > lastDistanceY -> DraggingState.Locking(distanceY)
else -> recordingState
}
}
is DraggingState.Cancelling -> {
@ -85,12 +82,10 @@ class DraggableStateProcessor(
}
is DraggingState.Locking -> {
// Check if locking conditions met, also check if it should be initial state
if (distanceY < minimumMove && distanceY < lastDistanceY) {
RecordingUiState.Started
} else if (shouldLockRecording(distanceY)) {
RecordingUiState.Locked
} else {
DraggingState.Locking(distanceY)
when {
distanceY < minimumMove && distanceY < lastDistanceY -> RecordingUiState.Started
shouldLockRecording(distanceY) -> RecordingUiState.Locked
else -> DraggingState.Locking(distanceY)
}
}
else -> {
@ -99,6 +94,10 @@ class DraggableStateProcessor(
}
}
private fun isSlidingToLock(currentY: Float) = currentY < firstY
private fun isSlidingToCancel(currentX: Float) = (currentX < firstX && rtlXMultiplier == 1) || (currentX > firstX && rtlXMultiplier == -1)
private fun shouldCancelRecording(distanceX: Float): Boolean {
return distanceX >= distanceToCancel
}