gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-04 11:34:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

show audio button also for videocalls

Browse Source 
use layout weight

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-02-01 11:53:05 +01:00
parent 9c0fa9acc2
commit 78b29082bf
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

@ -519,7 +519,6 @@ public class CallActivity extends CallBaseActivity {
}
if (isVoiceOnlyCall) {
binding.audioOutputButton.setVisibility(View.VISIBLE);
binding.switchSelfVideoButton.setVisibility(View.GONE);
binding.cameraButton.setVisibility(View.GONE);
binding.selfVideoRenderer.setVisibility(View.GONE);
@ -536,7 +535,6 @@ public class CallActivity extends CallBaseActivity {
params.setMargins(0, 0, 0, 0);
binding.gridview.setLayoutParams(params);
binding.audioOutputButton.setVisibility(View.GONE);
if (cameraEnumerator.getDeviceNames().length < 2) {
binding.switchSelfVideoButton.setVisibility(View.GONE);
}

31
app/src/main/res/layout/call_activity.xml
View File

@ -140,59 +140,66 @@
android:animateLayoutChanges="true"
android:background="@android:color/transparent"
android:gravity="center"
android:orientation="horizontal">
android:orientation="horizontal"
android:weightSum="5">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/pictureInPictureButton"
android:layout_width="60dp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="20dp"
android:layout_marginEnd="10dp"
android:elevation="10dp"
app:backgroundImage="@color/call_buttons_background"
app:placeholderImage="@drawable/ic_baseline_picture_in_picture_alt_24"
app:roundAsCircle="true" />
app:roundAsCircle="true"
android:layout_weight="1"/>
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/audioOutputButton"
android:layout_width="60dp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
app:backgroundImage="@color/call_buttons_background"
app:placeholderImage="@drawable/ic_volume_mute_white_24dp"
app:roundAsCircle="true" />
app:roundAsCircle="true"
android:layout_weight="1"/>
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/cameraButton"
android:layout_width="60dp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:alpha="0.7"
app:backgroundImage="@color/call_buttons_background"
app:placeholderImage="@drawable/ic_videocam_white_24px"
app:roundAsCircle="true" />
app:roundAsCircle="true"
android:layout_weight="1"/>
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/microphoneButton"
android:layout_width="60dp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:alpha="0.7"
app:backgroundImage="@color/call_buttons_background"
app:placeholderImage="@drawable/ic_mic_off_white_24px"
app:roundAsCircle="true" />
app:roundAsCircle="true"
android:layout_weight="1"/>
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/hangupButton"
android:layout_width="60dp"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginEnd="20dp"
app:backgroundImage="@color/nc_darkRed"
app:placeholderImage="@drawable/ic_call_end_white_24px"
app:roundAsCircle="true" />
app:roundAsCircle="true"
android:layout_weight="1"/>
</LinearLayout>
<LinearLayout