filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove jitsi widget: change threshold + wording

Browse Source
This commit is contained in:
ganfra 2021-08-12 18:50:58 +02:00
parent 27abf2f8d1
commit 452647fb00
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,7 @@ import androidx.core.content.ContextCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.core.widget.ImageViewCompat import androidx.core.widget.ImageViewCompat
import im.vector.app.R import im.vector.app.R
import im.vector.app.core.utils.DimensionConverter
import im.vector.app.databinding.ViewRemoveJitsiWidgetBinding import im.vector.app.databinding.ViewRemoveJitsiWidgetBinding
import im.vector.app.features.home.room.detail.RoomDetailViewState import im.vector.app.features.home.room.detail.RoomDetailViewState
import org.matrix.android.sdk.api.session.room.model.Membership 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() object Progress : State()
} }
private val dimensionConverter = DimensionConverter(context.resources)
private val views: ViewRemoveJitsiWidgetBinding private val views: ViewRemoveJitsiWidgetBinding
private var state: State = State.Unmount private var state: State = State.Unmount
var onCompleteSliding: (() -> Unit)? = null var onCompleteSliding: (() -> Unit)? = null
@ -74,7 +76,7 @@ import org.matrix.android.sdk.api.session.room.model.Membership
MotionEvent.ACTION_MOVE -> { MotionEvent.ACTION_MOVE -> {
if (currentState is State.Sliding) { if (currentState is State.Sliding) {
val translationX = (currentState.initialX + event.rawX).coerceAtLeast(0f) 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)) updateState(State.Sliding(currentState.initialX, translationX, hasReachedActivationThreshold))
} }
true true

2
vector/src/main/res/values/strings.xml
View File

@ -3303,7 +3303,7 @@
<string name="call_transfer_transfer_to_title">Transfer to %1$s</string> <string name="call_transfer_transfer_to_title">Transfer to %1$s</string>
<string name="call_transfer_unknown_person">Unknown person</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> <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 --> <!-- Note to translators: the translation MUST contain the string "${app_name}", which will be replaced by the application name -->