mirror of
https://github.com/nextcloud/talk-android.git
synced 2024-11-26 23:25:20 +03:00
Add raise hand icon to participant in call screen
introduce linear layout for name/audio-off/raise-hand to avoid gaps Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
parent
48f531459c
commit
7e3161e7f8
3 changed files with 47 additions and 27 deletions
|
@ -143,11 +143,17 @@ public class ParticipantsAdapter extends BaseAdapter {
|
|||
if (!participantDisplayItem.isAudioEnabled()) {
|
||||
audioOffView.setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
audioOffView.setVisibility(View.INVISIBLE);
|
||||
audioOffView.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
ImageView raisedHandView = convertView.findViewById(R.id.raised_hand);
|
||||
if (participantDisplayItem.getRaisedHand() != null && participantDisplayItem.getRaisedHand().getState()) {
|
||||
raisedHandView.setVisibility(View.VISIBLE);
|
||||
} else {
|
||||
raisedHandView.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
return convertView;
|
||||
|
||||
}
|
||||
|
||||
private boolean hasVideoStream(ParticipantDisplayItem participantDisplayItem, MediaStream mediaStream) {
|
||||
|
|
|
@ -20,6 +20,6 @@
|
|||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#000000"
|
||||
android:fillColor="#FFFFFF"
|
||||
android:pathData="M3 16V5.75C3 5.06 3.56 4.5 4.25 4.5S5.5 5.06 5.5 5.75V12H6.5V2.75C6.5 2.06 7.06 1.5 7.75 1.5C8.44 1.5 9 2.06 9 2.75V12H10V1.25C10 .56 10.56 0 11.25 0S12.5 .56 12.5 1.25V12H13.5V3.25C13.5 2.56 14.06 2 14.75 2S16 2.56 16 3.25V15H16.75L18.16 11.47C18.38 10.92 18.84 10.5 19.4 10.31L20.19 10.05C21 9.79 21.74 10.58 21.43 11.37L18.4 19C17.19 22 14.26 24 11 24C6.58 24 3 20.42 3 16Z" />
|
||||
</vector>
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
-->
|
||||
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/relative_layout"
|
||||
android:layout_width="match_parent"
|
||||
|
@ -44,32 +43,47 @@
|
|||
android:layout_height="match_parent"
|
||||
android:visibility="invisible" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/peer_nick_text_view"
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:ellipsize="end"
|
||||
android:maxEms="8"
|
||||
android:maxLines="1"
|
||||
android:textAlignment="viewStart"
|
||||
android:textColor="@color/white"
|
||||
tools:text="Bill Murray 12345678901234567890" />
|
||||
android:orientation="horizontal"
|
||||
android:layout_alignParentBottom="true">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/remote_audio_off"
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:layout_toEndOf="@id/peer_nick_text_view"
|
||||
android:contentDescription="@string/nc_remote_audio_off"
|
||||
android:src="@drawable/ic_mic_off_white_24px"
|
||||
android:visibility="invisible"
|
||||
tools:visibility="visible" />
|
||||
<TextView
|
||||
android:id="@+id/peer_nick_text_view"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:ellipsize="end"
|
||||
android:maxEms="8"
|
||||
android:maxLines="1"
|
||||
android:textAlignment="viewStart"
|
||||
android:textColor="@color/white"
|
||||
tools:text="Bill Murray 12345678901234567890" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/remote_audio_off"
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:contentDescription="@string/nc_remote_audio_off"
|
||||
android:src="@drawable/ic_mic_off_white_24px"
|
||||
android:visibility="invisible"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/raised_hand"
|
||||
android:layout_width="16dp"
|
||||
android:layout_height="16dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginBottom="6dp"
|
||||
android:contentDescription="@string/nc_remote_audio_off"
|
||||
android:src="@drawable/ic_hand_back_left"
|
||||
android:visibility="invisible"
|
||||
tools:visibility="visible" />
|
||||
</LinearLayout>
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/participant_progress_bar"
|
||||
|
|
Loading…
Reference in a new issue