From 452647fb00deb9460634c6c1f72cbeb20903a3cf Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Thu, 12 Aug 2021 18:50:58 +0200
Subject: [PATCH] Remove jitsi widget: change threshold + wording

---
 .../app/features/call/conference/RemoveJitsiWidgetView.kt     | 4 +++-
 vector/src/main/res/values/strings.xml                        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 cb26d5416b..852b54fdcc 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
@@ -26,6 +26,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.core.widget.ImageViewCompat
 import im.vector.app.R
+import im.vector.app.core.utils.DimensionConverter
 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
@@ -43,6 +44,7 @@ import org.matrix.android.sdk.api.session.room.model.Membership
         object Progress : State()
     }
 
+    private val dimensionConverter = DimensionConverter(context.resources)
     private val views: ViewRemoveJitsiWidgetBinding
     private var state: State = State.Unmount
     var onCompleteSliding: (() -> Unit)? = null
@@ -74,7 +76,7 @@ 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 = views.removeJitsiSlidingContainer.width + translationX >= views.removeJitsiHangupContainer.x
+                        val hasReachedActivationThreshold = translationX >= views.root.width / 4
                         updateState(State.Sliding(currentState.initialX, translationX, hasReachedActivationThreshold))
                     }
                     true
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 107884b28b..474e35806d 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3303,7 +3303,7 @@
     <string name="call_transfer_transfer_to_title">Transfer to %1$s</string>
     <string name="call_transfer_unknown_person">Unknown person</string>
 
-    <string name="call_slide_to_end_conference">Slide to end the call for everyone</string>
+    <string name="call_slide_to_end_conference">Slide to end the call</string>
 
     <string name="re_authentication_activity_title">Re-Authentication Needed</string>
     <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->