Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Applied a max width to conference waiting room buttons (mostly for landscape)

Browse source
This commit is contained in:
Sylvain Berfini 2022-07-08 14:04:59 +02:00
parent f9ece220eb
commit 1fbac6e4d5
3 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/src/main/res/layout-land/conference_waiting_room_fragment.xml
View file

@ -70,7 +70,7 @@
android:text="@string/conference_waiting_room_video_disabled" android:text="@string/conference_waiting_room_video_disabled"
android:visibility="@{viewModel.isVideoEnabled ? View.GONE : View.VISIBLE}" /> android:visibility="@{viewModel.isVideoEnabled ? View.GONE : View.VISIBLE}" />
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/conference_controls" android:id="@+id/conference_controls"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -79,6 +79,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:id="@+id/cancel"
style="@style/big_orange_button_font" style="@style/big_orange_button_font"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -92,9 +93,16 @@
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingRight="20dp" android:paddingRight="20dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:text="@string/conference_waiting_room_cancel_call" /> android:text="@string/conference_waiting_room_cancel_call"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/start"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintWidth_max="@dimen/conference_waiting_room_buttons_max_width"/>
<TextView <TextView
android:id="@+id/start"
style="@style/big_orange_button_bold_font" style="@style/big_orange_button_bold_font"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -109,9 +117,14 @@
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingRight="20dp" android:paddingRight="20dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:text="@string/conference_waiting_room_start_call" /> android:text="@string/conference_waiting_room_start_call"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/cancel"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="@dimen/conference_waiting_room_buttons_max_width" />
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"

21
app/src/main/res/layout/conference_waiting_room_fragment.xml
View file

@ -74,7 +74,7 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/conference_controls" android:id="@+id/conference_controls"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -83,6 +83,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:id="@+id/cancel"
style="@style/big_orange_button_font" style="@style/big_orange_button_font"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -96,9 +97,15 @@
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingRight="20dp" android:paddingRight="20dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:text="@string/conference_waiting_room_cancel_call" /> android:text="@string/conference_waiting_room_cancel_call"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/start"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="@dimen/conference_waiting_room_buttons_max_width"/>
<TextView <TextView
android:id="@+id/start"
style="@style/big_orange_button_bold_font" style="@style/big_orange_button_bold_font"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -113,9 +120,15 @@
android:paddingTop="8dp" android:paddingTop="8dp"
android:paddingRight="20dp" android:paddingRight="20dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:text="@string/conference_waiting_room_start_call" /> android:text="@string/conference_waiting_room_start_call"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/cancel"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintWidth_max="@dimen/conference_waiting_room_buttons_max_width" />
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"

1
app/src/main/res/values/dimen.xml
View file

@ -75,4 +75,5 @@
<dimen name="voip_conference_header_folded_top_margin">30dp</dimen> <dimen name="voip_conference_header_folded_top_margin">30dp</dimen>
<dimen name="chat_message_content_preview_max_width">120dp</dimen> <dimen name="chat_message_content_preview_max_width">120dp</dimen>
<dimen name="voip_conference_active_speaker_dots_margin">5dp</dimen> <dimen name="voip_conference_active_speaker_dots_margin">5dp</dimen>
<dimen name="conference_waiting_room_buttons_max_width">250dp</dimen>
</resources> </resources>