mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-09 22:04:24 +01:00
set icon with call name as fallback for pip group calls when own video is disabled
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
parent
ee6543d766
commit
0d2014aa27
@ -1367,8 +1367,13 @@ class CallActivity : CallBaseActivity() {
|
|||||||
}
|
}
|
||||||
if (enable) {
|
if (enable) {
|
||||||
binding!!.selfVideoRenderer.visibility = View.VISIBLE
|
binding!!.selfVideoRenderer.visibility = View.VISIBLE
|
||||||
|
binding!!.pipSelfVideoRenderer.visibility = View.VISIBLE
|
||||||
|
|
||||||
|
initSelfVideoViewForNormalMode()
|
||||||
} else {
|
} else {
|
||||||
binding!!.selfVideoRenderer.visibility = View.INVISIBLE
|
binding!!.selfVideoRenderer.visibility = View.INVISIBLE
|
||||||
|
binding!!.pipSelfVideoRenderer.visibility = View.INVISIBLE
|
||||||
|
|
||||||
binding!!.selfVideoRenderer.clearImage()
|
binding!!.selfVideoRenderer.clearImage()
|
||||||
binding!!.selfVideoRenderer.release()
|
binding!!.selfVideoRenderer.release()
|
||||||
|
|
||||||
@ -3233,6 +3238,7 @@ class CallActivity : CallBaseActivity() {
|
|||||||
|
|
||||||
binding!!.selfVideoRenderer.release()
|
binding!!.selfVideoRenderer.release()
|
||||||
if (participantDisplayItems!!.size > 1) {
|
if (participantDisplayItems!!.size > 1) {
|
||||||
|
binding!!.pipCallConversationNameTextView.text = conversationName
|
||||||
binding!!.pipSelfVideoOverlay.visibility = View.VISIBLE
|
binding!!.pipSelfVideoOverlay.visibility = View.VISIBLE
|
||||||
initSelfVideoViewForPipMode()
|
initSelfVideoViewForPipMode()
|
||||||
} else {
|
} else {
|
||||||
|
@ -182,9 +182,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_marginStart="50dp"
|
android:layout_marginStart="50dp"
|
||||||
android:layout_marginBottom="50dp">
|
android:layout_marginBottom="50dp"/>
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
|
|
||||||
<com.google.android.flexbox.FlexboxLayout
|
<com.google.android.flexbox.FlexboxLayout
|
||||||
android:id="@+id/flexboxLayout"
|
android:id="@+id/flexboxLayout"
|
||||||
@ -228,8 +226,6 @@
|
|||||||
|
|
||||||
</com.google.android.flexbox.FlexboxLayout>
|
</com.google.android.flexbox.FlexboxLayout>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<com.google.android.flexbox.FlexboxLayout
|
<com.google.android.flexbox.FlexboxLayout
|
||||||
@ -330,7 +326,7 @@
|
|||||||
</com.google.android.flexbox.FlexboxLayout>
|
</com.google.android.flexbox.FlexboxLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<RelativeLayout
|
||||||
android:id="@+id/pipSelfVideoOverlay"
|
android:id="@+id/pipSelfVideoOverlay"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
@ -339,13 +335,37 @@
|
|||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:visibility="gone">
|
android:visibility="gone">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/pipCallConversationNameTextView"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_marginStart="5dp"
|
||||||
|
android:layout_marginTop="40dp"
|
||||||
|
android:layout_marginEnd="5dp"
|
||||||
|
android:layout_marginBottom="-30dp"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:maxLines="3"
|
||||||
|
android:textAlignment="center"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="16sp"
|
||||||
|
tools:text="our group call" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="80dp"
|
||||||
|
android:layout_height="80dp"
|
||||||
|
android:layout_centerInParent="true"
|
||||||
|
app:srcCompat="@drawable/ic_circular_group"
|
||||||
|
tools:ignore="ContentDescription" />
|
||||||
|
|
||||||
<org.webrtc.SurfaceViewRenderer
|
<org.webrtc.SurfaceViewRenderer
|
||||||
android:id="@+id/pipSelfVideoRenderer"
|
android:id="@+id/pipSelfVideoRenderer"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:clickable="false"
|
android:clickable="false"
|
||||||
tools:visibility="visible" />
|
tools:visibility="gone" />
|
||||||
</LinearLayout>
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
Loading…
Reference in New Issue
Block a user