From 577986001a409c064567d6621e0fbdd7e48ec41e Mon Sep 17 00:00:00 2001 From: Dannie Date: Sat, 11 Mar 2023 16:16:26 +0900 Subject: [PATCH] Add RTL support to RemoveJitsiWidgetView Signed-off-by: Byeongsu Park --- changelog.d/8210.bugfix | 1 + .../app/features/call/conference/RemoveJitsiWidgetView.kt | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 changelog.d/8210.bugfix diff --git a/changelog.d/8210.bugfix b/changelog.d/8210.bugfix new file mode 100644 index 0000000000..97a1351ae5 --- /dev/null +++ b/changelog.d/8210.bugfix @@ -0,0 +1 @@ +Add RTL support to RemoveJitsiWidgetView diff --git a/vector/src/main/java/im/vector/app/features/call/conference/RemoveJitsiWidgetView.kt b/vector/src/main/java/im/vector/app/features/call/conference/RemoveJitsiWidgetView.kt index e2574d973c..656c0029eb 100644 --- a/vector/src/main/java/im/vector/app/features/call/conference/RemoveJitsiWidgetView.kt +++ b/vector/src/main/java/im/vector/app/features/call/conference/RemoveJitsiWidgetView.kt @@ -29,6 +29,7 @@ import im.vector.app.R import im.vector.app.databinding.ViewRemoveJitsiWidgetBinding import im.vector.app.features.home.room.detail.RoomDetailViewState import org.matrix.android.sdk.api.session.room.model.Membership +import kotlin.math.absoluteValue @SuppressLint("ClickableViewAccessibility") class RemoveJitsiWidgetView @JvmOverloads constructor( context: Context, @@ -55,7 +56,7 @@ import org.matrix.android.sdk.api.session.room.model.Membership return@setOnTouchListener when (event.action) { MotionEvent.ACTION_DOWN -> { if (currentState == State.Idle) { - val initialX = views.removeJitsiSlidingContainer.x - event.rawX + val initialX = event.rawX updateState(State.Sliding(initialX, 0f, false)) } true @@ -73,8 +74,9 @@ import org.matrix.android.sdk.api.session.room.model.Membership } MotionEvent.ACTION_MOVE -> { if (currentState is State.Sliding) { - val translationX = (currentState.initialX + event.rawX).coerceAtLeast(0f) - val hasReachedActivationThreshold = translationX >= views.root.width / 4 + val deltaX = event.rawX - currentState.initialX + val translationX = if (!isRtl) deltaX.coerceAtLeast(0f) else deltaX.coerceAtMost(0f) + val hasReachedActivationThreshold = translationX.absoluteValue >= views.root.width / 4 updateState(State.Sliding(currentState.initialX, translationX, hasReachedActivationThreshold)) } true