mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 11:28:06 +00:00
Improved in-call buttons size + toast above video
This commit is contained in:
parent
627a0d6f9e
commit
7c4b6d5b20
5 changed files with 55 additions and 51 deletions
|
|
@ -92,21 +92,6 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
||||
<include
|
||||
android:onClick="@{() -> viewModel.forceShowZrtpSasDialog()}"
|
||||
android:id="@+id/blue_toast"
|
||||
android:visibility="gone"
|
||||
layout="@layout/toast_blue"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="15dp"
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginEnd="15dp"
|
||||
app:layout_constraintWidth_max="@dimen/toast_max_width"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@id/background"/>
|
||||
|
||||
<io.getstream.avatarview.AvatarView
|
||||
android:id="@+id/avatar"
|
||||
android:layout_width="@dimen/avatar_in_call_size"
|
||||
|
|
@ -174,6 +159,21 @@
|
|||
app:layout_constraintHeight_max="200dp"
|
||||
app:layout_constraintWidth_max="200dp" />
|
||||
|
||||
<include
|
||||
android:onClick="@{() -> viewModel.forceShowZrtpSasDialog()}"
|
||||
android:id="@+id/blue_toast"
|
||||
android:visibility="gone"
|
||||
layout="@layout/toast_blue"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="15dp"
|
||||
android:layout_marginStart="15dp"
|
||||
android:layout_marginEnd="15dp"
|
||||
app:layout_constraintWidth_max="@dimen/toast_max_width"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@id/background"/>
|
||||
|
||||
<include
|
||||
android:id="@+id/bottom_bar"
|
||||
layout="@layout/voip_call_extra_actions"
|
||||
|
|
|
|||
|
|
@ -28,9 +28,9 @@
|
|||
<ImageView
|
||||
android:id="@+id/transfer"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="56dp"
|
||||
android:layout_marginTop="30dp"
|
||||
android:padding="10dp"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginTop="@dimen/voip_extra_button_top_margin"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
android:src="@drawable/transfer"
|
||||
app:tint="@color/white"
|
||||
|
|
@ -42,9 +42,9 @@
|
|||
<ImageView
|
||||
android:id="@+id/new_call"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="56dp"
|
||||
android:layout_marginTop="30dp"
|
||||
android:padding="13dp"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginTop="@dimen/voip_extra_button_top_margin"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
android:src="@drawable/new_call"
|
||||
app:tint="@color/white"
|
||||
|
|
@ -56,9 +56,9 @@
|
|||
<ImageView
|
||||
android:id="@+id/calls_list"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="56dp"
|
||||
android:layout_marginTop="30dp"
|
||||
android:padding="13dp"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginTop="@dimen/voip_extra_button_top_margin"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
android:src="@drawable/calls_list"
|
||||
app:tint="@color/white"
|
||||
|
|
@ -70,9 +70,9 @@
|
|||
<ImageView
|
||||
android:id="@+id/dialer"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="56dp"
|
||||
android:layout_marginTop="30dp"
|
||||
android:padding="13dp"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginTop="@dimen/voip_extra_button_top_margin"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
android:src="@drawable/dialer"
|
||||
app:tint="@color/white"
|
||||
|
|
@ -84,9 +84,9 @@
|
|||
<ImageView
|
||||
android:id="@+id/chat"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="56dp"
|
||||
android:layout_marginTop="30dp"
|
||||
android:padding="13dp"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginTop="@dimen/voip_extra_button_top_margin"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
android:src="@drawable/chat"
|
||||
app:tint="@color/white"
|
||||
|
|
@ -98,9 +98,9 @@
|
|||
<ImageView
|
||||
android:id="@+id/pause_call"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="56dp"
|
||||
android:layout_marginTop="30dp"
|
||||
android:padding="13dp"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginTop="@dimen/voip_extra_button_top_margin"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
android:src="@drawable/pause_call"
|
||||
app:tint="@color/white"
|
||||
|
|
@ -112,9 +112,9 @@
|
|||
<ImageView
|
||||
android:id="@+id/record_call"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="56dp"
|
||||
android:layout_marginTop="30dp"
|
||||
android:padding="13dp"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginTop="@dimen/voip_extra_button_top_margin"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
android:src="@drawable/record_call"
|
||||
app:tint="@color/white"
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
android:onClick="@{() -> viewModel.hangUp()}"
|
||||
android:id="@+id/hang_up"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginStart="30dp"
|
||||
android:paddingStart="30dp"
|
||||
android:paddingEnd="30dp"
|
||||
|
|
@ -51,10 +51,10 @@
|
|||
<ImageView
|
||||
android:onClick="@{() -> viewModel.toggleVideo()}"
|
||||
android:id="@+id/toggle_video"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="@dimen/voip_button_size"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:padding="15dp"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:src="@{viewModel.isVideoEnabled() ? @drawable/camera_enabled : @drawable/camera_disabled, default=@drawable/camera_enabled}"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
app:tint="@color/white"
|
||||
|
|
@ -64,10 +64,10 @@
|
|||
<ImageView
|
||||
android:onClick="@{() -> viewModel.toggleMuteMicrophone()}"
|
||||
android:id="@+id/toggle_mute_mic"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="@dimen/voip_button_size"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:padding="15dp"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:src="@{viewModel.isMicrophoneMuted ? @drawable/microphone_muted : @drawable/microphone, default=@drawable/microphone}"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
app:tint="@color/white"
|
||||
|
|
@ -77,10 +77,10 @@
|
|||
<ImageView
|
||||
android:onClick="@{() -> viewModel.changeAudioOutputDevice()}"
|
||||
android:id="@+id/change_audio_output"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="@dimen/voip_button_size"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginEnd="30dp"
|
||||
android:padding="15dp"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:src="@drawable/speaker"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
app:tint="@color/white"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
<ImageView
|
||||
android:id="@+id/hang_up"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:background="@drawable/shape_hang_up_button_background"
|
||||
android:onClick="@{() -> viewModel.hangUp()}"
|
||||
android:paddingStart="30dp"
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
<ImageView
|
||||
android:id="@+id/answer_call"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:background="@drawable/shape_answer_button_background"
|
||||
android:onClick="@{() -> viewModel.answer()}"
|
||||
android:paddingStart="30dp"
|
||||
|
|
|
|||
|
|
@ -19,10 +19,14 @@
|
|||
|
||||
<dimen name="top_search_bar_height">55dp</dimen>
|
||||
|
||||
<dimen name="in_call_main_actions_menu_height">116dp</dimen>
|
||||
<dimen name="in_call_extra_actions_menu_height">237dp</dimen>
|
||||
<dimen name="in_call_all_actions_menu_height">353dp</dimen> <!-- sum of above two -->
|
||||
<dimen name="in_call_main_actions_menu_height">110dp</dimen>
|
||||
<dimen name="in_call_extra_actions_menu_height">235dp</dimen>
|
||||
<dimen name="in_call_all_actions_menu_height">345dp</dimen> <!-- sum of above two -->
|
||||
<dimen name="in_call_round_corners_texture_view_radius">20dp</dimen>
|
||||
|
||||
<dimen name="toast_max_width">360dp</dimen>
|
||||
|
||||
<dimen name="voip_button_size">55dp</dimen>
|
||||
<dimen name="voip_button_icon_padding">15dp</dimen>
|
||||
<dimen name="voip_extra_button_top_margin">30dp</dimen>
|
||||
</resources>
|
||||
Loading…
Add table
Reference in a new issue