gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-22 21:19:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixup to calls

Browse Source
This commit is contained in:
Mario Danic 2019-12-19 16:27:55 +01:00
parent 89ca324b30
commit 0ab30c439e
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/nextcloud/talk/controllers/CallController.kt
View File

@ -1982,12 +1982,9 @@ class CallController(args: Bundle) : BaseController() {
val relativeLayout = val relativeLayout =
remoteRenderersLayout!!.findViewWithTag<RelativeLayout>("$session+$videoStreamType") remoteRenderersLayout!!.findViewWithTag<RelativeLayout>("$session+$videoStreamType")
val surfaceViewRenderer = relativeLayout.findViewById<SurfaceViewRenderer>(R.id.surface_view) val surfaceViewRenderer = relativeLayout.findViewById<SurfaceViewRenderer>(R.id.surface_view)
val imageView = relativeLayout.findViewById<SimpleDraweeView>(R.id.avatarImageView) val imageView = relativeLayout.findViewById(R.id.avatarImageView) as ImageView
if (mediaStream != null if (!(mediaStream?.videoTracks == null || mediaStream.videoTracks.size <= 0 || !enable)
&& mediaStream.videoTracks != null
&& mediaStream.videoTracks.size > 0
&& enable
) { ) {
val videoTrack = mediaStream.videoTracks[0] val videoTrack = mediaStream.videoTracks[0]

25
app/src/main/res/layout/call_item.xml
View File

@ -19,13 +19,24 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/relative_layout" android:id="@+id/relative_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<ImageView
android:id="@+id/avatarImageView"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerInParent="true" />
<org.webrtc.SurfaceViewRenderer
android:id="@+id/surface_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="invisible" />
<ImageView <ImageView
android:id="@+id/remote_audio_off" android:id="@+id/remote_audio_off"
android:layout_width="16dp" android:layout_width="16dp"
@ -58,16 +69,4 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:textColor="@android:color/white" /> android:textColor="@android:color/white" />
<ImageView
android:id="@+id/avatarImageView"
android:layout_width="80dp"
android:layout_height="80dp"
android:layout_centerInParent="true" />
<org.webrtc.SurfaceViewRenderer
android:id="@+id/surface_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="invisible" />
</RelativeLayout> </RelativeLayout>