mirror of
https://gitlab.linphone.org/BC/public/linphone-android.git
synced 2026-01-17 11:28:06 +00:00
Created landscape versions of meeting waiting room & conference menu
This commit is contained in:
Sylvain Berfini
parent
03299bae16
commit
f9ae9985a4
6 changed files with 456 additions and 8 deletions
|
|
@ -190,6 +190,13 @@ class ActiveConferenceCallFragment : GenericCallFragment() {
|
|||
}
|
||||
}
|
||||
|
||||
override fun onPause() {
|
||||
super.onPause()
|
||||
|
||||
bottomSheetDialog?.dismiss()
|
||||
bottomSheetDialog = null
|
||||
}
|
||||
|
||||
private fun showCallStatistics() {
|
||||
// TODO
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,245 @@
|
|||
<?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="callsListClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="participantsListClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="viewModel"
|
||||
type="org.linphone.ui.call.viewmodel.CurrentCallViewModel" />
|
||||
<variable
|
||||
name="callsViewModel"
|
||||
type="org.linphone.ui.call.viewmodel.CallsViewModel" />
|
||||
</data>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/call_all_actions_menu_height"
|
||||
android:background="@drawable/shape_call_bottom_sheet_background"
|
||||
android:visibility="@{viewModel.fullScreenMode || viewModel.pipMode ? View.INVISIBLE : View.VISIBLE}"
|
||||
app:behavior_hideable="false"
|
||||
app:behavior_peekHeight="@dimen/call_main_actions_menu_height"
|
||||
app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
|
||||
|
||||
<include
|
||||
android:id="@+id/main_actions"
|
||||
layout="@layout/call_actions_generic"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/call_main_actions_menu_height"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
bind:viewModel="@{viewModel}" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/screen_sharing"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/call_button_size"
|
||||
android:layout_marginTop="@dimen/call_extra_button_top_margin"
|
||||
android:padding="@dimen/call_button_icon_padding"
|
||||
android:src="@drawable/screencast"
|
||||
android:background="@drawable/shape_round_in_call_disabled_button_background"
|
||||
app:tint="?attr/color_grey_500"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintStart_toStartOf="@id/screen_sharing_label"
|
||||
app:layout_constraintEnd_toEndOf="@id/screen_sharing_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/main_actions" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/participants"
|
||||
android:onClick="@{participantsListClickListener}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/call_button_size"
|
||||
android:layout_marginTop="@dimen/call_extra_button_top_margin"
|
||||
android:padding="@dimen/call_button_icon_padding"
|
||||
android:background="@drawable/in_call_button_background_red"
|
||||
android:src="@drawable/users"
|
||||
app:tint="@color/in_call_button_tint_color"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintStart_toStartOf="@id/participants_label"
|
||||
app:layout_constraintEnd_toEndOf="@id/participants_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/main_actions" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/calls_list"
|
||||
android:onClick="@{callsListClickListener}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/call_button_size"
|
||||
android:layout_marginTop="@dimen/call_extra_button_top_margin"
|
||||
android:padding="@dimen/call_button_icon_padding"
|
||||
android:background="@drawable/in_call_button_background_red"
|
||||
android:src="@drawable/calls_list"
|
||||
app:tint="@color/in_call_button_tint_color"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintStart_toStartOf="@id/calls_list_label"
|
||||
app:layout_constraintEnd_toEndOf="@id/calls_list_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/main_actions" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style"
|
||||
android:id="@+id/calls_count"
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:layout_marginStart="40dp"
|
||||
android:layout_marginTop="25dp"
|
||||
android:gravity="center"
|
||||
android:background="@drawable/shape_red_round"
|
||||
android:text="@{String.valueOf(callsViewModel.callsCount), default=`1`}"
|
||||
android:textColor="?attr/color_on_main"
|
||||
android:textSize="13sp"
|
||||
android:paddingBottom="2dp"
|
||||
android:visibility="@{callsViewModel.callsCount > 1 ? View.VISIBLE : View.GONE}"
|
||||
app:layout_constraintTop_toBottomOf="@id/main_actions"
|
||||
app:layout_constraintStart_toStartOf="@id/calls_list"
|
||||
app:layout_constraintEnd_toEndOf="@id/calls_list"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/layout"
|
||||
android:onClick="@{() -> viewModel.conferenceModel.showLayoutMenu()}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/call_button_size"
|
||||
android:layout_marginTop="@dimen/call_extra_button_top_margin"
|
||||
android:padding="@dimen/call_button_icon_padding"
|
||||
android:background="@drawable/in_call_button_background_red"
|
||||
android:src="@drawable/notebook"
|
||||
app:tint="@color/in_call_button_tint_color"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintStart_toStartOf="@id/layout_label"
|
||||
app:layout_constraintEnd_toEndOf="@id/layout_label"
|
||||
app:layout_constraintTop_toBottomOf="@id/main_actions" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/chat"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/call_button_size"
|
||||
android:layout_marginTop="@dimen/call_extra_button_top_margin"
|
||||
android:padding="@dimen/call_button_icon_padding"
|
||||
android:src="@drawable/chat_teardrop_text"
|
||||
android:background="@drawable/shape_round_in_call_disabled_button_background"
|
||||
app:tint="?attr/color_grey_500"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintTop_toBottomOf="@id/main_actions"
|
||||
app:layout_constraintStart_toStartOf="@id/chat_label"
|
||||
app:layout_constraintEnd_toEndOf="@id/chat_label"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/pause_call"
|
||||
android:onClick="@{() -> viewModel.togglePause()}"
|
||||
android:enabled="@{viewModel.canBePaused}"
|
||||
android:selected="@{viewModel.isPaused}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/call_button_size"
|
||||
android:layout_marginTop="@dimen/call_extra_button_top_margin"
|
||||
android:padding="@dimen/call_button_icon_padding"
|
||||
android:src="@drawable/pause"
|
||||
android:background="@drawable/in_call_button_background_green"
|
||||
app:tint="@color/in_call_button_tint_color"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintTop_toBottomOf="@id/main_actions"
|
||||
app:layout_constraintStart_toStartOf="@id/pause_call_label"
|
||||
app:layout_constraintEnd_toEndOf="@id/pause_call_label"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/record_call"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="@dimen/call_button_size"
|
||||
android:layout_marginTop="@dimen/call_extra_button_top_margin"
|
||||
android:padding="@dimen/call_button_icon_padding"
|
||||
android:src="@drawable/record_fill"
|
||||
android:selected="@{viewModel.isRecording()}"
|
||||
android:background="@drawable/shape_round_in_call_disabled_button_background"
|
||||
app:tint="?attr/color_grey_500"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintTop_toBottomOf="@id/main_actions"
|
||||
app:layout_constraintStart_toStartOf="@id/record_call_label"
|
||||
app:layout_constraintEnd_toEndOf="@id/record_call_label" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/in_call_extra_action_label_style"
|
||||
android:id="@+id/screen_sharing_label"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="15dp"
|
||||
android:text="@string/conference_action_screen_sharing"
|
||||
app:layout_constraintTop_toBottomOf="@id/screen_sharing"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toStartOf="@id/participants_label"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/in_call_extra_action_label_style"
|
||||
android:id="@+id/participants_label"
|
||||
android:onClick="@{participantsListClickListener}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="15dp"
|
||||
android:text="@string/conference_action_show_participants"
|
||||
app:layout_constraintTop_toBottomOf="@id/participants"
|
||||
app:layout_constraintStart_toEndOf="@id/screen_sharing_label"
|
||||
app:layout_constraintEnd_toStartOf="@id/calls_list_label" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/in_call_extra_action_label_style"
|
||||
android:id="@+id/calls_list_label"
|
||||
android:onClick="@{callsListClickListener}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="15dp"
|
||||
android:text="@string/call_action_go_to_calls_list"
|
||||
app:layout_constraintTop_toBottomOf="@id/calls_list"
|
||||
app:layout_constraintStart_toEndOf="@id/participants_label"
|
||||
app:layout_constraintEnd_toStartOf="@id/layout_label" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/in_call_extra_action_label_style"
|
||||
android:id="@+id/layout_label"
|
||||
android:onClick="@{() -> viewModel.conferenceModel.showLayoutMenu()}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="15dp"
|
||||
android:text="@string/call_action_change_layout"
|
||||
app:layout_constraintTop_toBottomOf="@id/layout"
|
||||
app:layout_constraintStart_toEndOf="@id/calls_list_label"
|
||||
app:layout_constraintEnd_toStartOf="@id/chat_label" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/in_call_extra_action_label_style"
|
||||
android:id="@+id/chat_label"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="15dp"
|
||||
android:text="@string/call_action_show_messages"
|
||||
app:layout_constraintTop_toBottomOf="@id/chat"
|
||||
app:layout_constraintStart_toEndOf="@id/layout_label"
|
||||
app:layout_constraintEnd_toStartOf="@id/pause_call_label" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/in_call_extra_action_label_style"
|
||||
android:id="@+id/pause_call_label"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="15dp"
|
||||
android:text="@string/call_action_pause_call"
|
||||
app:layout_constraintTop_toBottomOf="@id/pause_call"
|
||||
app:layout_constraintStart_toEndOf="@id/chat_label"
|
||||
app:layout_constraintEnd_toStartOf="@id/record_call_label" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/in_call_extra_action_label_style"
|
||||
android:id="@+id/record_call_label"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingBottom="15dp"
|
||||
android:text="@string/call_action_record_call"
|
||||
app:layout_constraintTop_toBottomOf="@id/record_call"
|
||||
app:layout_constraintStart_toEndOf="@id/pause_call_label"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</layout>
|
||||
196
app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
Normal file
196
app/src/main/res/layout-land/meeting_waiting_room_fragment.xml
Normal file
|
|
@ -0,0 +1,196 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<data>
|
||||
<import type="android.view.View" />
|
||||
<variable
|
||||
name="backClickListener"
|
||||
type="View.OnClickListener" />
|
||||
<variable
|
||||
name="viewModel"
|
||||
type="org.linphone.ui.main.meetings.viewmodel.MeetingWaitingRoomViewModel" />
|
||||
</data>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/gray_900">
|
||||
|
||||
<androidx.constraintlayout.widget.Guideline
|
||||
android:id="@+id/half_screen"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintGuide_percent="0.50" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/back"
|
||||
android:onClick="@{backClickListener}"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="@dimen/top_bar_height"
|
||||
android:adjustViewBounds="true"
|
||||
android:padding="15dp"
|
||||
android:src="@drawable/caret_left"
|
||||
android:contentDescription="@string/content_description_go_back_icon"
|
||||
app:tint="@color/main1_500"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/main_page_title_style"
|
||||
android:id="@+id/title"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="@{viewModel.subject, default=`Meeting with John Doe`}"
|
||||
android:textColor="@color/white"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/back"
|
||||
app:layout_constraintTop_toTopOf="@id/back"
|
||||
app:layout_constraintBottom_toTopOf="@id/subtitle"/>
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style_300"
|
||||
android:id="@+id/subtitle"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:text="@{viewModel.dateTime, default=`Wed. 25 Oct. 14:00 - 15:00`}"
|
||||
android:textSize="12sp"
|
||||
android:textColor="@color/white"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/back"
|
||||
app:layout_constraintTop_toBottomOf="@id/title"
|
||||
app:layout_constraintBottom_toBottomOf="@id/back"/>
|
||||
|
||||
<View
|
||||
android:id="@+id/no_video_background"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:background="@drawable/shape_squircle_gray_600_background"
|
||||
app:layout_constraintTop_toTopOf="@id/video_preview"
|
||||
app:layout_constraintStart_toStartOf="@id/video_preview"
|
||||
app:layout_constraintEnd_toEndOf="@id/video_preview"
|
||||
app:layout_constraintBottom_toBottomOf="@id/video_preview" />
|
||||
|
||||
<com.google.android.material.imageview.ShapeableImageView
|
||||
style="@style/avatar_imageview"
|
||||
android:id="@+id/avatar"
|
||||
android:layout_width="@dimen/avatar_in_call_size"
|
||||
android:layout_height="@dimen/avatar_in_call_size"
|
||||
coilCallAvatar="@{viewModel.selfAvatar}"
|
||||
app:layout_constraintEnd_toEndOf="@id/no_video_background"
|
||||
app:layout_constraintStart_toStartOf="@id/no_video_background"
|
||||
app:layout_constraintTop_toTopOf="@id/no_video_background"
|
||||
app:layout_constraintBottom_toBottomOf="@id/no_video_background"/>
|
||||
|
||||
<org.linphone.ui.call.view.RoundCornersTextureView
|
||||
android:id="@+id/video_preview"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_margin="10dp"
|
||||
android:visibility="@{viewModel.isVideoAvailable && viewModel.isVideoEnabled ? View.VISIBLE : View.INVISIBLE}"
|
||||
app:alignTopRight="false"
|
||||
app:displayMode="occupy_all_space"
|
||||
app:layout_constraintBottom_toTopOf="@id/toggle_mute_mic"
|
||||
app:layout_constraintEnd_toEndOf="@id/half_screen"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/back" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/default_text_style_500"
|
||||
android:id="@+id/name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="12dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
android:text="@{viewModel.selfAvatar.name, default=`John Doe`}"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="20sp"
|
||||
app:layout_constraintBottom_toBottomOf="@id/no_video_background"
|
||||
app:layout_constraintStart_toStartOf="@id/no_video_background" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/switch_camera"
|
||||
android:onClick="@{() -> viewModel.switchCamera()}"
|
||||
android:layout_width="@dimen/icon_size"
|
||||
android:layout_height="@dimen/icon_size"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:visibility="@{viewModel.isVideoAvailable && viewModel.isVideoEnabled && viewModel.isSwitchCameraAvailable ? View.VISIBLE : View.GONE}"
|
||||
android:src="@drawable/camera_rotate"
|
||||
app:tint="@color/white"
|
||||
app:layout_constraintTop_toTopOf="@id/video_preview"
|
||||
app:layout_constraintEnd_toEndOf="@id/video_preview" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/toggle_video"
|
||||
android:onClick="@{() -> viewModel.toggleVideo()}"
|
||||
android:layout_width="@dimen/call_button_size"
|
||||
android:layout_height="@dimen/call_button_size"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:padding="@dimen/call_button_icon_padding"
|
||||
android:enabled="@{viewModel.isVideoAvailable}"
|
||||
android:visibility="@{viewModel.hideVideo ? View.GONE : View.VISIBLE}"
|
||||
android:src="@{viewModel.isVideoEnabled ? @drawable/video_camera : @drawable/video_camera_slash, default=@drawable/video_camera}"
|
||||
android:background="@drawable/in_call_button_background_red"
|
||||
app:tint="@color/in_call_button_tint_color"
|
||||
app:layout_constraintHorizontal_chainStyle="packed"
|
||||
app:layout_constraintBottom_toBottomOf="@id/join"
|
||||
app:layout_constraintStart_toStartOf="@id/video_preview"
|
||||
app:layout_constraintEnd_toStartOf="@id/toggle_mute_mic" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/toggle_mute_mic"
|
||||
android:onClick="@{() -> viewModel.toggleMuteMicrophone()}"
|
||||
android:layout_width="@dimen/call_button_size"
|
||||
android:layout_height="@dimen/call_button_size"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="20dp"
|
||||
android:padding="@dimen/call_button_icon_padding"
|
||||
android:src="@{viewModel.isMicrophoneMuted ? @drawable/microphone_slash : @drawable/microphone, default=@drawable/microphone}"
|
||||
android:background="@drawable/in_call_button_background_red"
|
||||
app:tint="@color/in_call_button_tint_color"
|
||||
app:layout_constraintBottom_toBottomOf="@id/join"
|
||||
app:layout_constraintStart_toEndOf="@id/toggle_video"
|
||||
app:layout_constraintEnd_toStartOf="@id/change_audio_output" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/change_audio_output"
|
||||
android:onClick="@{() -> viewModel.changeAudioOutputDevice()}"
|
||||
android:layout_width="@dimen/call_button_size"
|
||||
android:layout_height="@dimen/call_button_size"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:padding="@dimen/call_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_red"
|
||||
app:tint="@color/in_call_button_tint_color"
|
||||
app:layout_constraintBottom_toBottomOf="@id/join"
|
||||
app:layout_constraintStart_toEndOf="@id/toggle_mute_mic"
|
||||
app:layout_constraintEnd_toEndOf="@id/half_screen" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
style="@style/primary_button_label_style"
|
||||
android:id="@+id/join"
|
||||
android:onClick="@{() -> viewModel.join()}"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginBottom="@dimen/screen_bottom_margin"
|
||||
android:paddingStart="20dp"
|
||||
android:paddingEnd="20dp"
|
||||
android:text="@string/meeting_waiting_room_join"
|
||||
app:layout_constraintWidth_max="@dimen/button_max_width"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@id/half_screen"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
</layout>
|
||||
|
|
@ -191,8 +191,9 @@
|
|||
android:textSize="22sp"
|
||||
android:gravity="center"
|
||||
android:visibility="@{conferenceViewModel.participantDevices.size() > 1 ? View.GONE : View.VISIBLE}"
|
||||
app:layout_constraintVertical_chainStyle="packed"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@id/share_conference_link"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
||||
|
|
@ -216,6 +217,7 @@
|
|||
android:drawablePadding="8dp"
|
||||
app:drawableTint="@color/gray_main2_400"
|
||||
app:layout_constraintTop_toBottomOf="@id/waiting_for_others"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -129,6 +129,7 @@
|
|||
|
||||
<ImageView
|
||||
android:id="@+id/pause_call"
|
||||
android:onClick="@{() -> viewModel.togglePause()}"
|
||||
android:enabled="@{viewModel.canBePaused}"
|
||||
android:selected="@{viewModel.isPaused}"
|
||||
android:layout_width="0dp"
|
||||
|
|
@ -136,8 +137,8 @@
|
|||
android:layout_marginTop="@dimen/call_extra_button_top_margin"
|
||||
android:padding="@dimen/call_button_icon_padding"
|
||||
android:src="@drawable/pause"
|
||||
android:background="@drawable/shape_round_in_call_disabled_button_background"
|
||||
app:tint="?attr/color_grey_500"
|
||||
android:background="@drawable/in_call_button_background_green"
|
||||
app:tint="@color/in_call_button_tint_color"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintTop_toBottomOf="@id/participants_label"
|
||||
app:layout_constraintStart_toStartOf="@id/participants"
|
||||
|
|
|
|||
|
|
@ -84,12 +84,10 @@
|
|||
android:id="@+id/video_preview"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_margin="10dp"
|
||||
android:visibility="@{viewModel.isVideoAvailable && viewModel.isVideoEnabled ? View.VISIBLE : View.INVISIBLE}"
|
||||
app:alignTopRight="false"
|
||||
app:displayMode="occupy_all_space"
|
||||
app:layout_constraintWidth_percent="0.65"
|
||||
app:layout_constraintHeight_percent="0.65"
|
||||
app:layout_constraintVertical_chainStyle="packed"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/back"
|
||||
|
|
@ -146,7 +144,6 @@
|
|||
android:layout_width="@dimen/call_button_size"
|
||||
android:layout_height="@dimen/call_button_size"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="20dp"
|
||||
android:padding="@dimen/call_button_icon_padding"
|
||||
android:src="@{viewModel.isMicrophoneMuted ? @drawable/microphone_slash : @drawable/microphone, default=@drawable/microphone}"
|
||||
android:background="@drawable/in_call_button_background_red"
|
||||
|
|
@ -185,7 +182,7 @@
|
|||
android:paddingEnd="20dp"
|
||||
android:text="@string/meeting_waiting_room_join"
|
||||
app:layout_constraintWidth_max="@dimen/button_max_width"
|
||||
app:layout_constraintVertical_bias="1"
|
||||
app:layout_constraintTop_toBottomOf="@id/toggle_mute_mic"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue