mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 19:38:08 +00:00
Improved layout for landscape foldables
This commit is contained in:
Sylvain Berfini
parent
c3101e92b4
commit
82ae513d17
4 changed files with 230 additions and 6 deletions
208
app/src/main/res/layout-land/voip_call_extra_actions.xml
Normal file
208
app/src/main/res/layout-land/voip_call_extra_actions.xml
Normal file
|
|
@ -0,0 +1,208 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:bind="http://schemas.android.com/tools"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<data>
|
||||
<import type="android.view.View" />
|
||||
<variable
|
||||
name="viewModel"
|
||||
type="org.linphone.ui.voip.viewmodel.CurrentCallViewModel" />
|
||||
</data>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/in_call_all_actions_menu_height"
|
||||
android:background="@color/in_call_black"
|
||||
app:behavior_hideable="false"
|
||||
app:behavior_peekHeight="@dimen/in_call_main_actions_menu_height"
|
||||
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
|
||||
|
||||
<include
|
||||
android:id="@+id/main_actions"
|
||||
layout="@layout/voip_call_main_actions"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/in_call_main_actions_menu_height"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
bind:showExpandToggle="@{true}"
|
||||
bind:viewModel="@{viewModel}" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/transfer"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginTop="@dimen/voip_extra_button_top_margin"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:src="@drawable/transfer"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="@id/transfer_label"
|
||||
app:layout_constraintStart_toStartOf="@id/transfer_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/main_actions"
|
||||
app:tint="@color/white" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/new_call"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginTop="@dimen/voip_extra_button_top_margin"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:src="@drawable/phone_plus"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="@id/new_call_label"
|
||||
app:layout_constraintStart_toStartOf="@id/new_call_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/main_actions"
|
||||
app:tint="@color/white" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/calls_list"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginTop="@dimen/voip_extra_button_top_margin"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:src="@drawable/calls_list"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="@id/calls_list_label"
|
||||
app:layout_constraintStart_toStartOf="@id/calls_list_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/main_actions"
|
||||
app:tint="@color/white" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/dialer"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginTop="@dimen/voip_extra_button_top_margin"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:src="@drawable/dialer"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="@id/dialer_label"
|
||||
app:layout_constraintStart_toStartOf="@id/dialer_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/main_actions"
|
||||
app:tint="@color/white" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/chat"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginTop="@dimen/voip_extra_button_top_margin"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:src="@drawable/chat_dots"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="@id/chat_label"
|
||||
app:layout_constraintStart_toStartOf="@id/chat_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/main_actions"
|
||||
app:tint="@color/white" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/pause_call"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginTop="@dimen/voip_extra_button_top_margin"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:src="@drawable/pause_call"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="@id/pause_call_label"
|
||||
app:layout_constraintStart_toStartOf="@id/pause_call_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/main_actions"
|
||||
app:tint="@color/white" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/record_call"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginTop="@dimen/voip_extra_button_top_margin"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
android:src="@drawable/record"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="@id/record_call_label"
|
||||
app:layout_constraintStart_toStartOf="@id/record_call_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/main_actions"
|
||||
app:tint="@color/white" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/transfer_label"
|
||||
style="@style/in_call_extra_action_label_style"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="15dp"
|
||||
android:text="@string/voip_action_call_transfer"
|
||||
app:layout_constraintEnd_toStartOf="@id/new_call_label"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/transfer"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/new_call_label"
|
||||
style="@style/in_call_extra_action_label_style"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="15dp"
|
||||
android:text="@string/voip_action_start_new_call"
|
||||
app:layout_constraintEnd_toStartOf="@id/calls_list_label"
|
||||
app:layout_constraintStart_toEndOf="@id/transfer_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/new_call"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/calls_list_label"
|
||||
style="@style/in_call_extra_action_label_style"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="15dp"
|
||||
android:text="@string/voip_action_go_to_calls_list"
|
||||
app:layout_constraintEnd_toStartOf="@id/dialer_label"
|
||||
app:layout_constraintStart_toEndOf="@id/new_call_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/calls_list"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/dialer_label"
|
||||
style="@style/in_call_extra_action_label_style"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="15dp"
|
||||
android:text="@string/voip_action_show_dialer"
|
||||
app:layout_constraintEnd_toStartOf="@id/chat_label"
|
||||
app:layout_constraintStart_toEndOf="@id/calls_list_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/chat" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/chat_label"
|
||||
style="@style/in_call_extra_action_label_style"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="15dp"
|
||||
android:text="@string/voip_action_show_messages"
|
||||
app:layout_constraintEnd_toStartOf="@id/pause_call_label"
|
||||
app:layout_constraintStart_toEndOf="@id/dialer_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/chat" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/pause_call_label"
|
||||
style="@style/in_call_extra_action_label_style"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="15dp"
|
||||
android:text="@string/voip_action_pause_call"
|
||||
app:layout_constraintEnd_toStartOf="@id/record_call_label"
|
||||
app:layout_constraintStart_toEndOf="@id/chat_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/pause_call" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/record_call_label"
|
||||
style="@style/in_call_extra_action_label_style"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="15dp"
|
||||
android:text="@string/voip_action_record_call"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/pause_call_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/record_call" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</layout>
|
||||
|
|
@ -49,8 +49,9 @@
|
|||
|
||||
<io.getstream.avatarview.AvatarView
|
||||
android:id="@+id/avatar"
|
||||
android:layout_width="@dimen/avatar_in_call_size"
|
||||
android:layout_height="@dimen/avatar_in_call_size"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:background="@drawable/shape_circle_light_blue_background"
|
||||
contactAvatar="@{viewModel.contact}"
|
||||
app:avatarViewInitialsBackgroundColor="@color/blue_light"
|
||||
|
|
@ -61,10 +62,13 @@
|
|||
app:avatarViewShape="circle"
|
||||
app:avatarViewBorderWidth="0dp"
|
||||
app:avatarViewBorderColor="@color/blue_trusted"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintWidth_max="@dimen/avatar_in_call_size"
|
||||
app:layout_constraintHeight_max="@dimen/avatar_in_call_size"
|
||||
app:layout_constraintVertical_chainStyle="packed"
|
||||
app:layout_constraintEnd_toEndOf="@id/background"
|
||||
app:layout_constraintStart_toStartOf="@id/background"
|
||||
app:layout_constraintTop_toBottomOf="@id/call_direction_label"
|
||||
app:layout_constraintTop_toTopOf="@id/background"
|
||||
app:layout_constraintBottom_toTopOf="@id/name"/>
|
||||
|
||||
<ImageView
|
||||
|
|
@ -95,6 +99,7 @@
|
|||
android:id="@+id/address"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:text="@{viewModel.displayedAddress, default=`sip:johndoe@sip.linphone.org`}"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="14sp"
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
android:id="@+id/hang_up"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginStart="30dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:paddingStart="30dp"
|
||||
android:paddingEnd="30dp"
|
||||
android:paddingTop="15dp"
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
android:background="@drawable/squircle_red_button_background"
|
||||
app:tint="@color/white"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
app:layout_constraintStart_toStartOf="parent"/>
|
||||
|
||||
<ImageView
|
||||
android:onClick="@{() -> viewModel.toggleVideo()}"
|
||||
|
|
@ -56,7 +56,10 @@
|
|||
android:src="@{viewModel.isVideoEnabled() ? @drawable/video_camera : @drawable/video_camera_slash, default=@drawable/video_camera}"
|
||||
android:background="@drawable/in_call_button_background"
|
||||
app:tint="@color/white"
|
||||
app:layout_constraintHorizontal_bias="1"
|
||||
app:layout_constraintHorizontal_chainStyle="packed"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/hang_up"
|
||||
app:layout_constraintEnd_toStartOf="@id/toggle_mute_mic" />
|
||||
|
||||
<ImageView
|
||||
|
|
@ -70,6 +73,7 @@
|
|||
android:background="@drawable/in_call_button_background"
|
||||
app:tint="@color/white"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/toggle_video"
|
||||
app:layout_constraintEnd_toStartOf="@id/change_audio_output" />
|
||||
|
||||
<ImageView
|
||||
|
|
@ -77,12 +81,13 @@
|
|||
android:id="@+id/change_audio_output"
|
||||
android:layout_width="@dimen/voip_button_size"
|
||||
android:layout_height="@dimen/voip_button_size"
|
||||
android:layout_marginEnd="30dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:padding="@dimen/voip_button_icon_padding"
|
||||
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"
|
||||
app:tint="@color/white"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/toggle_mute_mic"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
|
|||
6
app/src/main/res/values-land/dimen.xml
Normal file
6
app/src/main/res/values-land/dimen.xml
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<dimen name="in_call_main_actions_menu_height">110dp</dimen>
|
||||
<dimen name="in_call_extra_actions_menu_height">125dp</dimen>
|
||||
<dimen name="in_call_all_actions_menu_height">235dp</dimen> <!-- sum of above two -->
|
||||
</resources>
|
||||
Loading…
Add table
Reference in a new issue