Skip to content

Commit 5ef942a

Browse files
committed
Add RTL support to RemoveJitsiWidgetView
Signed-off-by: Byeongsu Park <[email protected]>
1 parent a6f7302 commit 5ef942a

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

changelog.d/8210.bugfix

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add RTL support to RemoveJitsiWidgetView

vector/src/main/java/im/vector/app/features/call/conference/RemoveJitsiWidgetView.kt

+5-3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import im.vector.app.R
2929
import im.vector.app.databinding.ViewRemoveJitsiWidgetBinding
3030
import im.vector.app.features.home.room.detail.RoomDetailViewState
3131
import org.matrix.android.sdk.api.session.room.model.Membership
32+
import kotlin.math.absoluteValue
3233

3334
@SuppressLint("ClickableViewAccessibility") class RemoveJitsiWidgetView @JvmOverloads constructor(
3435
context: Context,
@@ -55,7 +56,7 @@ import org.matrix.android.sdk.api.session.room.model.Membership
5556
return@setOnTouchListener when (event.action) {
5657
MotionEvent.ACTION_DOWN -> {
5758
if (currentState == State.Idle) {
58-
val initialX = views.removeJitsiSlidingContainer.x - event.rawX
59+
val initialX = event.rawX
5960
updateState(State.Sliding(initialX, 0f, false))
6061
}
6162
true
@@ -73,8 +74,9 @@ import org.matrix.android.sdk.api.session.room.model.Membership
7374
}
7475
MotionEvent.ACTION_MOVE -> {
7576
if (currentState is State.Sliding) {
76-
val translationX = (currentState.initialX + event.rawX).coerceAtLeast(0f)
77-
val hasReachedActivationThreshold = translationX >= views.root.width / 4
77+
val deltaX = event.rawX - currentState.initialX
78+
val translationX = if (!isRtl) deltaX.coerceAtLeast(0f) else deltaX.coerceAtMost(0f)
79+
val hasReachedActivationThreshold = translationX.absoluteValue >= views.root.width / 4
7880
updateState(State.Sliding(currentState.initialX, translationX, hasReachedActivationThreshold))
7981
}
8082
true

0 commit comments

Comments
 (0)