TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Showing floating video inset only when there is at least one video stream active, hiding it when both are inactive

Browse Source
This commit is contained in:
ThomasSession 2024-07-08 09:39:34 +10:00
parent 1bc35723fa
commit f9e9bc86d2
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/org/thoughtcrime/securesms/calls/WebRtcCallActivity.kt
View File

@ -247,6 +247,12 @@ class WebRtcCallActivity : PassphraseRequiredActionBarActivity(), SensorEventLis
}
}
/**
* We need to track the device's orientation so we can calculate whether or not to rotate the video streams
* This works a lot better than using `OrientationEventListener > onOrientationChanged'
* which gives us a rotation angle that doesn't take into account pitch vs roll, so tipping the device from front to back would
* trigger the video rotation logic, while we really only want it when the device is in portrait or landscape.
*/
override fun onSensorChanged(event: SensorEvent) {
if (event.sensor.type == Sensor.TYPE_ROTATION_VECTOR) {
// Get the quaternion from the rotation vector sensor
@ -268,7 +274,6 @@ class WebRtcCallActivity : PassphraseRequiredActionBarActivity(), SensorEventLis
if (currentOrientation != lastOrientation) {
lastOrientation = currentOrientation
Log.d("", "*********** orientation: $currentOrientation")
viewModel.deviceOrientation = currentOrientation
}
}
@ -422,12 +427,22 @@ class WebRtcCallActivity : PassphraseRequiredActionBarActivity(), SensorEventLis
}
}
// handle video windows
// handle video state
launch {
viewModel.videoState.collect { state ->
binding.floatingRenderer.removeAllViews()
binding.fullscreenRenderer.removeAllViews()
// the floating video inset (empty or not) should be shown
// the moment we have either of the video streams
if(!state.userVideoEnabled && !state.remoteVideoEnabled){
binding.floatingRendererContainer.isVisible = false
binding.swapViewIcon.isVisible = false
} else {
binding.floatingRendererContainer.isVisible = true
binding.swapViewIcon.isVisible = true
}
// handle fullscreen video window
if(state.showFullscreenVideo()){
viewModel.fullscreenRenderer?.let { surfaceView ->

4
app/src/main/java/org/thoughtcrime/securesms/webrtc/CallManager.kt
View File

@ -628,9 +628,7 @@ class CallManager(
_videoState.value = _videoState.value.copy(swapped = videoSwapped)
handleMirroring()
//todo TOM received rotated video shouldn't be full scale
//todo TOM make sure the swap icon is visible
//todo TOM Should we show the 'no video' inset straight away?
//todo TOM floating inset loses its rounded corners when the second surfaceview is added
//todo TOM ios rotates the controls in landscape ( just the buttons though, not the whole ui??)
if (!videoSwapped) {