mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed call actions bar size & margins

Browse source
This commit is contained in:
Sylvain Berfini 2024-12-02 10:56:13 +01:00
parent badbbde183
commit 5a1487a691
6 changed files with 47 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/layout-land/call_incoming_fragment.xml
View file

@ -118,7 +118,7 @@
android:id="@+id/bottom_bar"
layout="@layout/call_incoming_actions"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="@dimen/call_main_actions_menu_height"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>

5
app/src/main/res/layout/call_actions_generic.xml
View file

@ -12,7 +12,6 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/call_main_actions_menu_height"
android:paddingBottom="5dp"
android:background="@drawable/shape_call_bottom_sheet_background">
<ImageView
@ -42,6 +41,7 @@
android:contentDescription="@string/content_description_hang_up_call"
android:background="@drawable/squircle_red_button_background"
app:tint="@color/white"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
@ -60,6 +60,7 @@
app:tint="@color/in_call_button_tint_color"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/hang_up"
app:layout_constraintEnd_toStartOf="@id/toggle_mute_mic" />
@ -76,6 +77,7 @@
android:background="@drawable/in_call_button_background_red"
android:contentDescription="@string/content_description_toggle_microphone"
app:tint="@color/in_call_button_tint_color"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/toggle_video"
app:layout_constraintEnd_toStartOf="@id/change_audio_output" />
@ -91,6 +93,7 @@
android:background="@drawable/in_call_button_background_red"
android:contentDescription="@string/content_description_change_output_audio_device"
app:tint="@color/in_call_button_tint_color"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/toggle_mute_mic"
app:layout_constraintEnd_toEndOf="parent" />

19
app/src/main/res/layout/call_ended_actions.xml
View file

@ -12,9 +12,22 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/call_main_actions_menu_height"
android:paddingBottom="5dp"
android:background="@drawable/shape_call_bottom_sheet_background">
<ImageView
android:onClick="@{() -> viewModel.toggleExpandActionsMenu()}"
android:id="@+id/call_actions_handle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="11dp"
android:src="@drawable/animated_caret_to_handle"
android:visibility="invisible"
android:contentDescription="@string/content_description_toggle_bottom_sheet"
app:tint="@color/white"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/hang_up"
android:layout_width="wrap_content"
@ -28,6 +41,7 @@
android:contentDescription="@null"
android:background="@drawable/shape_squircle_red_disabled_background"
app:tint="@color/gray_400"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
@ -45,6 +59,7 @@
app:tint="@color/gray_400"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/hang_up"
app:layout_constraintEnd_toStartOf="@id/toggle_mute_mic" />
@ -59,6 +74,7 @@
android:contentDescription="@null"
android:background="@drawable/shape_round_in_call_disabled_button_background"
app:tint="@color/gray_400"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/toggle_video"
app:layout_constraintEnd_toStartOf="@id/change_audio_output" />
@ -73,6 +89,7 @@
android:contentDescription="@null"
android:background="@drawable/shape_round_in_call_disabled_button_background"
app:tint="@color/gray_400"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/toggle_mute_mic"
app:layout_constraintEnd_toEndOf="parent" />

9
app/src/main/res/layout/call_incoming_actions.xml
View file

@ -11,10 +11,8 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_call_bottom_sheet_background"
android:paddingTop="15dp"
android:paddingBottom="15dp">
android:layout_height="@dimen/call_main_actions_menu_height"
android:background="@drawable/shape_call_bottom_sheet_background">
<ImageView
android:id="@+id/hang_up"
@ -30,6 +28,7 @@
android:src="@drawable/phone_disconnect"
android:contentDescription="@string/content_description_hang_up_call"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/answer_call"
app:layout_constraintStart_toStartOf="parent"
@ -48,6 +47,7 @@
android:src="@drawable/phone"
android:visibility="@{viewModel.isVideoEnabled ? View.GONE : View.VISIBLE}"
android:contentDescription="@string/content_description_answer_audio_call"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/answer_video_call"
app:layout_constraintStart_toEndOf="@id/hang_up"
@ -66,6 +66,7 @@
android:src="@drawable/video_camera"
android:visibility="@{viewModel.isVideoEnabled ? View.VISIBLE : View.GONE, default=gone}"
android:contentDescription="@string/content_description_answer_video_call"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/answer_call"

2
app/src/main/res/layout/call_incoming_fragment.xml
View file

@ -97,7 +97,7 @@
android:id="@+id/bottom_bar"
layout="@layout/call_incoming_actions"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="@dimen/call_main_actions_menu_height"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>

19
app/src/main/res/layout/call_outgoing_actions.xml
View file

@ -12,9 +12,22 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="@dimen/call_main_actions_menu_height"
android:paddingBottom="5dp"
android:background="@drawable/shape_call_bottom_sheet_background">
<ImageView
android:onClick="@{() -> viewModel.toggleExpandActionsMenu()}"
android:id="@+id/call_actions_handle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="11dp"
android:src="@drawable/animated_caret_to_handle"
android:enabled="false"
android:contentDescription="@string/content_description_toggle_bottom_sheet"
app:tint="@color/gray_400"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:onClick="@{() -> viewModel.hangUp()}"
android:id="@+id/hang_up"
@ -29,6 +42,7 @@
android:contentDescription="@string/content_description_hang_up_call"
android:background="@drawable/squircle_red_button_background"
app:tint="@color/white"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
@ -45,6 +59,7 @@
app:tint="@color/gray_400"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/hang_up"
app:layout_constraintEnd_toStartOf="@id/toggle_mute_mic" />
@ -61,6 +76,7 @@
android:background="@drawable/in_call_button_background_red"
app:tint="@color/in_call_button_tint_color"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
app:layout_constraintStart_toEndOf="@id/toggle_video"
app:layout_constraintEnd_toStartOf="@id/change_audio_output" />
@ -76,6 +92,7 @@
android:src="@{viewModel.isHeadsetEnabled ? @drawable/headset : viewModel.isBluetoothEnabled ? @drawable/bluetooth : viewModel.isSpeakerEnabled ? @drawable/speaker_high : @drawable/speaker_slash, default=@drawable/speaker_slash}"
android:background="@drawable/in_call_button_background_red"
app:tint="@color/in_call_button_tint_color"
app:layout_constraintTop_toBottomOf="@id/call_actions_handle"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/toggle_mute_mic"
app:layout_constraintEnd_toEndOf="parent" />