TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-26 14:56:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
ryanzhao
2023-02-22 16:33:39 +11:00
parent 39b798055c
commit cfb8e34e1a
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -356,6 +356,8 @@ class WebRtcCallActivity : PassphraseRequiredActionBarActivity() {
binding.localFloatingRenderer.isVisible = isEnabled && !viewModel.videoViewSwapped
binding.localRenderer.isVisible = isEnabled && viewModel.videoViewSwapped
binding.enableCameraButton.isSelected = isEnabled
binding.videocamOffIcon.isVisible = !binding.localFloatingRenderer.isVisible
binding.swapViewIcon.bringToFront()
}
}
@@ -374,15 +376,17 @@ class WebRtcCallActivity : PassphraseRequiredActionBarActivity() {
}
binding.remoteRenderer.isVisible = isEnabled && !viewModel.videoViewSwapped
binding.remoteFloatingRenderer.isVisible = isEnabled && viewModel.videoViewSwapped
binding.videocamOffIcon.isVisible = !binding.remoteFloatingRenderer.isVisible
binding.swapViewIcon.bringToFront()
}
}
launch {
viewModel.videoViewSwappedState.collect{ isSwapped ->
binding.remoteRenderer.isVisible = !isSwapped
binding.remoteFloatingRenderer.isVisible = isSwapped
binding.localFloatingRenderer.isVisible = !isSwapped
binding.localRenderer.isVisible = isSwapped
binding.remoteRenderer.isVisible = !isSwapped && viewModel.remoteVideoEnabled
binding.remoteFloatingRenderer.isVisible = isSwapped && viewModel.remoteVideoEnabled
binding.localFloatingRenderer.isVisible = !isSwapped && viewModel.videoEnabled
binding.localRenderer.isVisible = isSwapped && viewModel.videoEnabled
}
}
}

9
app/src/main/java/org/thoughtcrime/securesms/webrtc/CallViewModel.kt
View File

@@ -46,6 +46,11 @@ class CallViewModel @Inject constructor(private val callManager: CallManager): V
val videoEnabled: Boolean
get() = _videoEnabled
private var _remoteVideoEnabled: Boolean = false
val remoteVideoEnabled: Boolean
get() = _remoteVideoEnabled
private var _videoViewSwapped: Boolean = false
val videoViewSwapped: Boolean
@@ -76,7 +81,9 @@ class CallViewModel @Inject constructor(private val callManager: CallManager): V
.onEach { _videoEnabled = it }
val remoteVideoEnabledState
get() = callManager.remoteVideoEvents.map { it.isEnabled }
get() = callManager.remoteVideoEvents
.map { it.isEnabled }
.onEach { _remoteVideoEnabled = it }
val videoViewSwappedState
get() = callManager.videoViewSwappedEvents

2
app/src/main/res/layout/activity_webrtc.xml
View File

@@ -127,6 +127,7 @@
android:layout_height="0dp"
android:layout_width="0dp">
<ImageView
android:id="@+id/videocam_off_icon"
android:src="@drawable/ic_baseline_videocam_off_24"
android:layout_width="32dp"
android:layout_height="32dp"
@@ -151,6 +152,7 @@
tools:visibility="visible"
android:visibility="gone" />
<ImageView
android:id="@+id/swap_view_icon"
android:src="@drawable/ic_baseline_screen_rotation_alt_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"