gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 12:09:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix horizontal (=landscape) call design button layouting/sizing

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2023-03-09 18:17:59 +01:00 committed by Marcel Hibbe (Rebase PR Action)
parent 765a94cc87
commit a042e2da9c
2 changed files with 93 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,8 @@
android:gravity="center" android:gravity="center"
android:numColumns="2" android:numColumns="2"
android:scrollbars="vertical" android:scrollbars="vertical"
android:stretchMode="columnWidth" /> android:stretchMode="columnWidth"
tools:listitem="@layout/call_item"/>
<FrameLayout <FrameLayout
android:id="@+id/selfVideoViewWrapper" android:id="@+id/selfVideoViewWrapper"
@ -160,111 +161,113 @@
android:layout_alignTop="@id/verticalCenter" android:layout_alignTop="@id/verticalCenter"
android:layout_marginTop="-50dp" /> android:layout_marginTop="-50dp" />
<ImageButton
android:id="@+id/lower_hand_button"
android:layout_width="@dimen/min_size_clickable_area"
android:layout_height="@dimen/min_size_clickable_area"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="150dp"
android:layout_marginEnd="20dp"
android:contentDescription="@string/lower_hand"
android:background="@drawable/shape_oval"
android:backgroundTint="@color/call_buttons_background"
android:visibility="gone"
tools:visibility="visible"
app:srcCompat="@drawable/ic_baseline_do_not_touch_24" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/callControls" android:layout_width="match_parent"
android:layout_height="@dimen/call_controls_height" android:layout_height="wrap_content"
android:layout_width="450dp"
android:layout_centerHorizontal="true"
android:paddingHorizontal="@dimen/call_controls_padding_horizontal"
android:layout_alignBottom="@id/linearWrapperLayout" android:layout_alignBottom="@id/linearWrapperLayout"
android:gravity="center_vertical"
android:orientation="vertical">
<ImageButton
android:id="@+id/lower_hand_button"
android:layout_width="@dimen/min_size_clickable_area"
android:layout_height="@dimen/min_size_clickable_area"
android:layout_gravity="end"
android:layout_marginEnd="20dp"
android:background="@drawable/shape_oval"
android:backgroundTint="@color/call_buttons_background"
android:contentDescription="@string/lower_hand"
android:visibility="gone"
app:srcCompat="@drawable/ic_baseline_do_not_touch_24"
tools:visibility="visible" />
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/callControls"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/standard_half_margin"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:gravity="center" android:gravity="center"
android:minHeight="@dimen/call_controls_height"
android:orientation="horizontal" android:orientation="horizontal"
android:weightSum="6"> android:padding="@dimen/standard_half_padding"
app:alignItems="center"
app:flexWrap="wrap"
app:justifyContent="center">
<ImageButton <ImageButton
android:id="@+id/pictureInPictureButton" android:id="@+id/pictureInPictureButton"
android:layout_width="0dp" android:layout_width="@dimen/min_size_clickable_area"
android:layout_height="wrap_content" android:layout_height="@dimen/min_size_clickable_area"
android:layout_margin="@dimen/standard_half_margin"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_marginHorizontal="@dimen/call_controls_margin_horizontal"
android:layout_weight="1"
android:background="@drawable/shape_oval" android:background="@drawable/shape_oval"
android:backgroundTint="@color/call_buttons_background" android:backgroundTint="@color/call_buttons_background"
app:srcCompat="@drawable/ic_baseline_picture_in_picture_alt_24" android:contentDescription="@string/nc_call_button_content_description_pip"
android:contentDescription="@string/nc_call_button_content_description_pip" /> app:srcCompat="@drawable/ic_baseline_picture_in_picture_alt_24" />
<ImageButton <ImageButton
android:id="@+id/audioOutputButton" android:id="@+id/audioOutputButton"
android:layout_width="0dp" android:layout_width="@dimen/min_size_clickable_area"
android:layout_height="wrap_content" android:layout_height="@dimen/min_size_clickable_area"
android:layout_margin="@dimen/standard_half_margin"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_marginHorizontal="@dimen/call_controls_margin_horizontal"
android:layout_weight="1"
android:background="@drawable/shape_oval" android:background="@drawable/shape_oval"
android:backgroundTint="@color/call_buttons_background" android:backgroundTint="@color/call_buttons_background"
app:srcCompat="@drawable/ic_volume_mute_white_24dp" android:contentDescription="@string/nc_call_button_content_description_audio_output"
android:contentDescription="@string/nc_call_button_content_description_audio_output" /> app:srcCompat="@drawable/ic_volume_mute_white_24dp" />
<ImageButton <ImageButton
android:id="@+id/cameraButton" android:id="@+id/cameraButton"
android:layout_width="0dp" android:layout_width="@dimen/min_size_clickable_area"
android:layout_height="wrap_content" android:layout_height="@dimen/min_size_clickable_area"
android:layout_margin="@dimen/standard_half_margin"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_marginHorizontal="@dimen/call_controls_margin_horizontal"
android:layout_weight="1"
android:alpha="0.7" android:alpha="0.7"
android:background="@drawable/shape_oval" android:background="@drawable/shape_oval"
android:backgroundTint="@color/call_buttons_background" android:backgroundTint="@color/call_buttons_background"
app:srcCompat="@drawable/ic_videocam_white_24px" android:contentDescription="@string/nc_call_button_content_description_camera"
android:contentDescription="@string/nc_call_button_content_description_camera" /> app:srcCompat="@drawable/ic_videocam_white_24px" />
<ImageButton <ImageButton
android:id="@+id/microphoneButton" android:id="@+id/microphoneButton"
android:layout_width="0dp" android:layout_width="@dimen/min_size_clickable_area"
android:layout_height="wrap_content" android:layout_height="@dimen/min_size_clickable_area"
android:layout_margin="@dimen/standard_half_margin"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_marginHorizontal="@dimen/call_controls_margin_horizontal"
android:layout_weight="1"
android:alpha="0.7" android:alpha="0.7"
android:background="@drawable/shape_oval" android:background="@drawable/shape_oval"
android:backgroundTint="@color/call_buttons_background" android:backgroundTint="@color/call_buttons_background"
app:srcCompat="@drawable/ic_mic_off_white_24px" android:contentDescription="@string/nc_call_button_content_description_microphone"
android:contentDescription="@string/nc_call_button_content_description_microphone" /> app:srcCompat="@drawable/ic_mic_off_white_24px" />
<ImageButton <ImageButton
android:id="@+id/more_call_actions" android:id="@+id/more_call_actions"
android:layout_width="0dp" android:layout_width="@dimen/min_size_clickable_area"
android:layout_height="wrap_content" android:layout_height="@dimen/min_size_clickable_area"
android:layout_margin="@dimen/standard_half_margin"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_marginHorizontal="@dimen/call_controls_margin_horizontal"
android:layout_weight="1"
android:background="@drawable/shape_oval" android:background="@drawable/shape_oval"
android:backgroundTint="@color/call_buttons_background" android:backgroundTint="@color/call_buttons_background"
app:srcCompat="@drawable/ic_dots_horizontal_white" android:contentDescription="@string/nc_call_button_content_description_microphone"
android:contentDescription="@string/nc_call_button_content_description_microphone" /> app:srcCompat="@drawable/ic_dots_horizontal_white" />
<ImageButton <ImageButton
android:id="@+id/hangupButton" android:id="@+id/hangupButton"
android:layout_width="0dp" android:layout_width="@dimen/min_size_clickable_area"
android:layout_height="wrap_content" android:layout_height="@dimen/min_size_clickable_area"
android:layout_margin="@dimen/standard_half_margin"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:layout_marginHorizontal="@dimen/call_controls_margin_horizontal"
android:layout_weight="1"
android:background="@drawable/shape_oval" android:background="@drawable/shape_oval"
android:backgroundTint="@color/nc_darkRed" android:backgroundTint="@color/nc_darkRed"
app:srcCompat="@drawable/ic_call_end_white_24px" android:contentDescription="@string/nc_call_button_content_description_hangup"
android:contentDescription="@string/nc_call_button_content_description_hangup" /> app:srcCompat="@drawable/ic_call_end_white_24px" />
</com.google.android.flexbox.FlexboxLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

2
app/src/main/res/values/dimens.xml
View File

@ -69,8 +69,6 @@
<dimen name="call_self_video_short_side_length">80dp</dimen> <dimen name="call_self_video_short_side_length">80dp</dimen>
<dimen name="call_grid_item_min_height">180dp</dimen> <dimen name="call_grid_item_min_height">180dp</dimen>
<dimen name="call_controls_height">110dp</dimen> <dimen name="call_controls_height">110dp</dimen>
<dimen name="call_controls_padding_horizontal">10dp</dimen>
<dimen name="call_controls_margin_horizontal">10dp</dimen>
<dimen name="call_participant_progress_bar_size">48dp</dimen> <dimen name="call_participant_progress_bar_size">48dp</dimen>
<dimen name="call_self_participant_progress_bar_size">48dp</dimen> <dimen name="call_self_participant_progress_bar_size">48dp</dimen>
<dimen name="zero">0dp</dimen> <dimen name="zero">0dp</dimen>