mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-20 21:18:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve accessibility by using labelFor item in XML layouts, fixed & uniformized margins in settings

Browse source
This commit is contained in:
Sylvain Berfini 2025-07-15 11:25:12 +02:00
parent d6b43c474b
commit dfa87e4088
42 changed files with 290 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/res/layout-land/call_actions_bottom_sheet.xml
View file

@ -207,6 +207,7 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:text="@string/call_action_transfer"
android:labelFor="@id/transfer"
app:layout_constraintEnd_toStartOf="@id/new_call_label"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/transfer"/>
@ -219,6 +220,7 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:text="@string/call_action_start_new_call"
android:labelFor="@id/new_call"
app:layout_constraintEnd_toStartOf="@id/calls_list_label"
app:layout_constraintStart_toEndOf="@id/transfer_label"
app:layout_constraintTop_toBottomOf="@id/new_call"/>
@ -231,6 +233,7 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:text="@string/call_action_go_to_calls_list"
android:labelFor="@id/calls_list"
app:layout_constraintEnd_toStartOf="@id/numpad_label"
app:layout_constraintStart_toEndOf="@id/new_call_label"
app:layout_constraintTop_toBottomOf="@id/calls_list"/>
@ -244,6 +247,7 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:text="@string/call_action_show_dialer"
android:labelFor="@id/numpad"
app:layout_constraintEnd_toStartOf="@id/chat_label"
app:layout_constraintStart_toEndOf="@id/calls_list_label"
app:layout_constraintTop_toBottomOf="@id/numpad" />
@ -256,6 +260,7 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:text="@string/call_action_show_messages"
android:labelFor="@id/chat"
android:enabled="@{!viewModel.operationInProgress}"
app:layout_constraintEnd_toStartOf="@id/pause_call_label"
app:layout_constraintStart_toEndOf="@id/numpad_label"
@ -271,6 +276,7 @@
android:enabled="@{viewModel.canBePaused}"
android:selected="@{viewModel.isPaused}"
android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}"
android:labelFor="@id/pause_call"
app:layout_constraintEnd_toStartOf="@id/record_call_label"
app:layout_constraintStart_toEndOf="@id/chat_label"
app:layout_constraintTop_toBottomOf="@id/pause_call" />
@ -284,6 +290,7 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:text="@string/call_action_record_call"
android:labelFor="@id/record_call"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/pause_call_label"
app:layout_constraintTop_toBottomOf="@id/record_call" />

7
app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml
View file

@ -188,6 +188,7 @@
android:paddingBottom="15dp"
android:text="@string/conference_action_screen_sharing"
android:enabled="false"
android:labelFor="@id/screen_sharing"
app:layout_constraintTop_toBottomOf="@id/screen_sharing"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/participants_label"/>
@ -200,6 +201,7 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:ellipsize="middle"
android:labelFor="@id/participants"
android:text="@{viewModel.conferenceModel.participantsLabel, default=@string/conference_action_show_participants}"
app:layout_constraintTop_toBottomOf="@id/participants"
app:layout_constraintStart_toEndOf="@id/screen_sharing_label"
@ -213,6 +215,7 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:text="@string/call_action_go_to_calls_list"
android:labelFor="@id/calls_list"
app:layout_constraintTop_toBottomOf="@id/calls_list"
app:layout_constraintStart_toEndOf="@id/participants_label"
app:layout_constraintEnd_toStartOf="@id/layout_label" />
@ -225,6 +228,7 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:text="@string/call_action_change_layout"
android:labelFor="@id/layout"
app:layout_constraintTop_toBottomOf="@id/layout"
app:layout_constraintStart_toEndOf="@id/calls_list_label"
app:layout_constraintEnd_toStartOf="@id/chat_label" />
@ -237,6 +241,7 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:text="@string/call_action_show_messages"
android:labelFor="@id/chat"
android:enabled="@{viewModel.conferenceModel.isConversationAvailable}"
app:layout_constraintTop_toBottomOf="@id/chat"
app:layout_constraintStart_toEndOf="@id/layout_label"
@ -251,6 +256,7 @@
android:enabled="@{viewModel.canBePaused}"
android:selected="@{viewModel.isPaused}"
android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}"
android:labelFor="@id/pause_call"
app:layout_constraintTop_toBottomOf="@id/pause_call"
app:layout_constraintStart_toEndOf="@id/chat_label"
app:layout_constraintEnd_toStartOf="@id/record_call_label" />
@ -262,6 +268,7 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:text="@string/call_action_record_call"
android:labelFor="@id/record_call"
android:enabled="false"
app:layout_constraintTop_toBottomOf="@id/record_call"
app:layout_constraintStart_toEndOf="@id/pause_call_label"

4
app/src/main/res/layout-land/contact_new_or_edit_fragment.xml
View file

@ -166,6 +166,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/contact_editor_first_name"
android:labelFor="@id/first_name"
app:layout_constraintStart_toStartOf="@id/first_name"
app:layout_constraintTop_toTopOf="parent"/>
@ -199,6 +200,7 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="@string/contact_editor_last_name"
android:labelFor="@id/last_name"
app:layout_constraintStart_toStartOf="@id/last_name"
app:layout_constraintTop_toBottomOf="@id/first_name"/>
@ -232,6 +234,7 @@
android:layout_marginTop="30dp"
android:layout_marginEnd="16dp"
android:text="@string/contact_editor_company"
android:labelFor="@id/company"
app:layout_constraintStart_toStartOf="@id/company"
app:layout_constraintTop_toBottomOf="@id/last_name"/>
@ -265,6 +268,7 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="@string/contact_editor_job_title"
android:labelFor="@id/job_title"
app:layout_constraintStart_toStartOf="@id/job_title"
app:layout_constraintTop_toBottomOf="@id/company"/>

2
app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml
View file

@ -138,6 +138,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:labelFor="@id/sip_identity"
android:text="@{@string/username + `*`, default=`Username*`}"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintTop_toBottomOf="@id/title"
@ -172,6 +173,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:labelFor="@id/password"
android:text="@{@string/password + `*`, default=`Password*`}"
app:layout_constraintWidth_max="@dimen/text_input_max_width"
app:layout_constraintTop_toBottomOf="@id/sip_identity"

3
app/src/main/res/layout-sw600dp/assistant_register_fragment.xml
View file

@ -153,6 +153,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:labelFor="@id/username"
android:text="@{@string/username + `*`}"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintTop_toBottomOf="@id/title"
@ -202,6 +203,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:labelFor="@id/phone_number"
android:text="@{@string/phone_number + `*`}"
app:layout_constraintTop_toBottomOf="@id/username_error"
app:layout_constraintBottom_toTopOf="@id/phone_number"
@ -292,6 +294,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:labelFor="@id/password"
android:text="@{@string/password + `*`}"
app:layout_constraintTop_toBottomOf="@id/phone_number_error"
app:layout_constraintBottom_toTopOf="@id/password"

23
app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml
View file

@ -68,13 +68,14 @@
app:layout_constraintStart_toEndOf="@id/back"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/username_label"
style="@style/header_style"
android:id="@+id/username_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:labelFor="@id/username"
android:text="@{@string/username + `*`}"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintTop_toBottomOf="@id/title"
@ -103,13 +104,14 @@
app:layout_constraintEnd_toEndOf="@id/title"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/password_label"
style="@style/header_style"
android:id="@+id/password_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:labelFor="@id/password"
android:text="@{@string/password + `*`}"
app:layout_constraintTop_toBottomOf="@id/username"
app:layout_constraintBottom_toTopOf="@id/password"
@ -151,13 +153,14 @@
app:layout_constraintBottom_toBottomOf="@id/password" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/domain_label"
style="@style/header_style"
android:id="@+id/domain_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:labelFor="@id/domain"
android:text="@{@string/sip_address_domain + `*`, default=`Domain*`}"
app:layout_constraintTop_toBottomOf="@id/password"
app:layout_constraintBottom_toTopOf="@id/domain"
@ -185,13 +188,14 @@
app:layout_constraintEnd_toEndOf="@id/title"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/display_name_label"
style="@style/header_style"
android:id="@+id/display_name_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:labelFor="@id/display_name"
android:text="@string/sip_address_display_name"
app:layout_constraintTop_toBottomOf="@id/domain"
app:layout_constraintBottom_toTopOf="@id/display_name"
@ -219,13 +223,14 @@
app:layout_constraintEnd_toEndOf="@id/title"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/transport_label"
style="@style/header_style"
android:id="@+id/transport_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:labelFor="@id/transport"
android:text="@string/assistant_sip_account_transport_protocol"
app:layout_constraintTop_toBottomOf="@id/display_name"
app:layout_constraintBottom_toTopOf="@id/transport"
@ -262,9 +267,9 @@
app:layout_constraintEnd_toEndOf="@id/transport"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/primary_button_label_style"
android:onClick="@{() -> viewModel.login()}"
android:enabled="@{viewModel.loginEnabled &amp;&amp; !viewModel.registrationInProgress, default=false}"
style="@style/primary_button_label_style"
android:id="@+id/login"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -306,13 +311,14 @@
android:visibility="@{viewModel.expandAdvancedSettings ? View.VISIBLE : View.GONE, default=gone}" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/authentication_id_label"
style="@style/header_style"
android:id="@+id/authentication_id_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:labelFor="@id/authentication_id"
android:text="@string/authentication_id"
app:layout_constraintTop_toBottomOf="@id/advanced_settings"
app:layout_constraintStart_toStartOf="@id/authentication_id"/>
@ -338,13 +344,14 @@
app:layout_constraintEnd_toEndOf="@id/advanced_settings"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/outbound_proxy_label"
style="@style/header_style"
android:id="@+id/outbound_proxy_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:labelFor="@id/outbound_proxy"
android:text="@string/account_settings_sip_proxy_url_title"
app:layout_constraintTop_toBottomOf="@id/authentication_id"
app:layout_constraintStart_toStartOf="@id/outbound_proxy"/>

30
app/src/main/res/layout/account_advanced_settings.xml
View file

@ -19,7 +19,7 @@
android:background="@drawable/shape_squircle_white_background">
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/transport_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -29,6 +29,7 @@
android:text="@string/assistant_sip_account_transport_protocol"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/transport_spinner"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -67,7 +68,7 @@
app:layout_constraintEnd_toEndOf="@id/transport_spinner"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/sip_proxy_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -77,6 +78,7 @@
android:text="@string/account_settings_sip_proxy_url_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/sip_proxy"
app:layout_constraintTop_toBottomOf="@id/transport_spinner"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -121,6 +123,7 @@
android:text="@string/account_settings_outbound_proxy_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/outbound_proxy_switch"
app:layout_constraintTop_toTopOf="@id/outbound_proxy_switch"
app:layout_constraintBottom_toBottomOf="@id/outbound_proxy_switch"
app:layout_constraintStart_toStartOf="parent"
@ -135,7 +138,7 @@
android:layout_marginEnd="16dp"
android:checked="@={viewModel.avpfEnabled}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/outbound_proxy_title" />
app:layout_constraintTop_toBottomOf="@id/outbound_proxy_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
@ -147,6 +150,7 @@
android:text="@string/account_settings_avpf_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/avpf_switch"
app:layout_constraintTop_toTopOf="@id/avpf_switch"
app:layout_constraintBottom_toBottomOf="@id/avpf_switch"
app:layout_constraintStart_toStartOf="parent"
@ -173,6 +177,7 @@
android:text="@string/account_settings_bundle_mode_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/bundle_mode_switch"
app:layout_constraintTop_toTopOf="@id/bundle_mode_switch"
app:layout_constraintBottom_toBottomOf="@id/bundle_mode_switch"
app:layout_constraintStart_toStartOf="parent"
@ -201,13 +206,14 @@
android:maxLines="2"
android:text="@string/account_settings_cpim_in_basic_conversations_title"
android:visibility="@{viewModel.imEncryptionMandatory ? View.GONE : View.VISIBLE}"
android:labelFor="@id/cpim_basic_chat_room_switch"
app:layout_constraintBottom_toBottomOf="@id/cpim_basic_chat_room_switch"
app:layout_constraintEnd_toStartOf="@id/cpim_basic_chat_room_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/cpim_basic_chat_room_switch"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/expire_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -217,6 +223,7 @@
android:text="@string/account_settings_expire_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/expire"
app:layout_constraintTop_toBottomOf="@id/cpim_basic_chat_room_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -241,7 +248,7 @@
app:layout_constraintTop_toBottomOf="@id/expire_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/conference_factory_uri_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -251,6 +258,7 @@
android:text="@string/account_settings_conference_factory_uri_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/conference_factory_uri"
app:layout_constraintTop_toBottomOf="@id/expire"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -276,7 +284,7 @@
app:layout_constraintTop_toBottomOf="@id/conference_factory_uri_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/audio_video_conference_factory_uri_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -286,6 +294,7 @@
android:text="@string/account_settings_audio_video_conference_factory_uri_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/audio_video_conference_factory_uri"
app:layout_constraintTop_toBottomOf="@id/conference_factory_uri"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -310,7 +319,7 @@
app:layout_constraintTop_toBottomOf="@id/audio_video_conference_factory_uri_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/ccmp_server_url_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -320,6 +329,7 @@
android:text="@string/account_settings_ccmp_server_url_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/ccmp_server_url"
app:layout_constraintTop_toBottomOf="@id/audio_video_conference_factory_uri"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -344,7 +354,7 @@
app:layout_constraintTop_toBottomOf="@id/ccmp_server_url_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/lime_server_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -354,6 +364,7 @@
android:text="@string/account_settings_lime_server_url_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/lime_server"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintVertical_bias="0"
app:layout_constraintTop_toBottomOf="@id/ccmp_server_url"
@ -383,7 +394,7 @@
app:layout_constraintBottom_toTopOf="@id/lime_algo_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/lime_algo_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -393,6 +404,7 @@
android:text="@string/assistant_sip_account_lime_algorithm"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/lime_algo_list"
android:visibility="@{viewModel.showDeveloperSettings ? View.VISIBLE : View.GONE, default=gone}"
app:layout_constraintTop_toBottomOf="@id/lime_server"
app:layout_constraintBottom_toTopOf="@id/lime_algo_list"

13
app/src/main/res/layout/account_nat_policy_settings.xml
View file

@ -17,7 +17,7 @@
android:background="@drawable/shape_squircle_white_background">
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/stun_server_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -27,6 +27,7 @@
android:text="@string/account_settings_stun_server_url_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/stun_server"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -69,6 +70,7 @@
android:text="@string/account_settings_enable_ice_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/ice_switch"
app:layout_constraintTop_toTopOf="@id/ice_switch"
app:layout_constraintBottom_toBottomOf="@id/ice_switch"
app:layout_constraintStart_toStartOf="parent"
@ -95,13 +97,14 @@
android:text="@string/account_settings_enable_turn_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/turn_switch"
app:layout_constraintTop_toTopOf="@id/turn_switch"
app:layout_constraintBottom_toBottomOf="@id/turn_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/turn_switch"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/turn_username_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -111,7 +114,8 @@
android:text="@string/account_settings_turn_username_title"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toBottomOf="@id/turn_title"
android:labelFor="@id/turn_username"
app:layout_constraintTop_toBottomOf="@id/turn_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -134,7 +138,7 @@
app:layout_constraintTop_toBottomOf="@id/turn_username_title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/turn_password_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -144,6 +148,7 @@
android:text="@string/account_settings_turn_password_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/turn_password"
app:layout_constraintTop_toBottomOf="@id/turn_username"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>

20
app/src/main/res/layout/account_profile_fragment.xml
View file

@ -209,8 +209,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="20dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/sip_address"
android:visibility="@{!viewModel.hideSipAddresses || viewModel.showDeviceId ? View.VISIBLE : View.GONE, default=gone}"
app:layout_constraintStart_toStartOf="@id/details_background"
@ -248,8 +246,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="20dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/device_id"
android:visibility="@{viewModel.showDeviceId ? View.VISIBLE : View.GONE, default=gone}"
app:layout_constraintStart_toStartOf="@id/details_background"
@ -279,15 +275,14 @@
app:layout_constraintBottom_toBottomOf="@id/device_id_label"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/display_name_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginTop="20dp"
android:text="@string/sip_address_display_name"
android:labelFor="@id/display_name"
app:layout_constraintStart_toStartOf="@id/details_background"
app:layout_constraintTop_toBottomOf="@id/device_id"/>
@ -297,7 +292,6 @@
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="5dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@={viewModel.displayName, default=`John Doe`}"
@ -312,15 +306,14 @@
app:layout_constraintEnd_toEndOf="@id/details_background"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/prefix_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginTop="20dp"
android:text="@string/manage_account_international_prefix"
android:labelFor="@id/prefix"
app:layout_constraintStart_toStartOf="@id/details_background"
app:layout_constraintTop_toBottomOf="@id/display_name"/>
@ -343,7 +336,6 @@
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="5dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:textSize="14sp"

18
app/src/main/res/layout/account_settings_fragment.xml
View file

@ -96,6 +96,7 @@
android:text="@{viewModel.pushNotificationsAvailable ? @string/account_settings_push_notification_title : @string/account_settings_push_notification_not_available_title, default=@string/account_settings_push_notification_title}"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/push_notifications_switch"
android:visibility="@{viewModel.isDomainInPushNotificationCompatibleList ? View.VISIBLE : View.GONE}"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/push_notifications_switch"
@ -107,7 +108,7 @@
android:id="@+id/im_encryption_mandatory_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="16dp"
android:checked="@={viewModel.imEncryptionMandatory}"
android:visibility="@{viewModel.imEncryptionMandatoryAvailable ? View.VISIBLE : View.GONE}"
@ -124,6 +125,7 @@
android:text="@string/account_settings_im_encryption_mandatory_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/im_encryption_mandatory_switch"
android:visibility="@{viewModel.imEncryptionMandatoryAvailable ? View.VISIBLE : View.GONE}"
app:layout_constraintTop_toTopOf="@id/im_encryption_mandatory_switch"
app:layout_constraintBottom_toBottomOf="@id/im_encryption_mandatory_switch"
@ -131,7 +133,7 @@
app:layout_constraintEnd_toStartOf="@id/im_encryption_mandatory_switch"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/voicemail_uri_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -141,6 +143,7 @@
android:text="@string/account_settings_voicemail_uri_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/voicemail_uri"
app:layout_constraintTop_toBottomOf="@id/im_encryption_mandatory_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -164,7 +167,7 @@
app:layout_constraintTop_toBottomOf="@id/voicemail_uri_title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/mwi_uri_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -174,6 +177,7 @@
android:text="@string/account_settings_mwi_uri_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/mwi_uri"
app:layout_constraintTop_toBottomOf="@id/voicemail_uri"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -206,6 +210,7 @@
android:text="@string/account_settings_apply_international_prefix_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/apply_international_switch"
app:layout_constraintTop_toTopOf="@id/apply_international_switch"
app:layout_constraintBottom_toBottomOf="@id/apply_international_switch"
app:layout_constraintStart_toStartOf="parent"
@ -216,7 +221,7 @@
android:id="@+id/apply_international_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="16dp"
android:checked="@={viewModel.applyPrefix}"
app:layout_constraintTop_toBottomOf="@id/mwi_uri"
@ -233,6 +238,7 @@
android:text="@string/account_settings_replace_plus_by_00_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/replace_plus_by_00_switch"
app:layout_constraintTop_toTopOf="@id/replace_plus_by_00_switch"
app:layout_constraintBottom_toBottomOf="@id/replace_plus_by_00_switch"
app:layout_constraintStart_toStartOf="parent"
@ -243,7 +249,7 @@
android:id="@+id/replace_plus_by_00_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="20dp"
android:checked="@={viewModel.replacePlusBy00}"
@ -262,7 +268,7 @@
android:padding="5dp"
android:layout_marginStart="26dp"
android:layout_marginEnd="26dp"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="10dp"
android:text="@string/account_settings_nat_policy_title"
android:drawableEnd="@{viewModel.expandNatPolicySettings ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"

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

@ -87,6 +87,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginEnd="16dp"
android:labelFor="@id/sip_identity"
android:text="@{@string/username + `*`, default=`Username*`}"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintStart_toStartOf="@id/sip_identity"/>
@ -118,6 +119,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:labelFor="@id/password"
android:text="@{@string/password + `*`, default=`Password*`}"
app:layout_constraintWidth_max="@dimen/text_input_max_width"
app:layout_constraintTop_toBottomOf="@id/sip_identity"

3
app/src/main/res/layout/assistant_register_fragment.xml
View file

@ -115,6 +115,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="48dp"
android:layout_marginEnd="16dp"
android:labelFor="@id/username"
android:text="@{@string/username + `*`}"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintStart_toStartOf="@id/username"/>
@ -160,6 +161,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:labelFor="@id/phone_number"
android:text="@{@string/phone_number + `*`}"
app:layout_constraintTop_toBottomOf="@id/username_error"
app:layout_constraintStart_toStartOf="@id/prefix"/>
@ -247,6 +249,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:labelFor="@id/password"
android:text="@{@string/password + `*`}"
app:layout_constraintTop_toBottomOf="@id/phone_number_error"
app:layout_constraintStart_toStartOf="@id/password"/>

23
app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml
View file

@ -48,13 +48,14 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/username_label"
style="@style/header_style"
android:id="@+id/username_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="38dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:labelFor="@id/username"
android:text="@{@string/username + `*`}"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintStart_toStartOf="@id/username"/>
@ -80,13 +81,14 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/password_label"
style="@style/header_style"
android:id="@+id/password_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:labelFor="@id/password"
android:text="@{@string/password + `*`}"
app:layout_constraintTop_toBottomOf="@id/username"
app:layout_constraintStart_toStartOf="@id/password"/>
@ -126,13 +128,14 @@
app:layout_constraintBottom_toBottomOf="@id/password" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/domain_label"
style="@style/header_style"
android:id="@+id/domain_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:labelFor="@id/domain"
android:text="@{@string/sip_address_domain + `*`, default=`Domain*`}"
app:layout_constraintTop_toBottomOf="@id/password"
app:layout_constraintStart_toStartOf="@id/domain"/>
@ -158,13 +161,14 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/display_name_label"
style="@style/header_style"
android:id="@+id/display_name_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:labelFor="@id/display_name"
android:text="@string/sip_address_display_name"
app:layout_constraintTop_toBottomOf="@id/domain"
app:layout_constraintStart_toStartOf="@id/display_name"/>
@ -190,13 +194,14 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/transport_label"
style="@style/header_style"
android:id="@+id/transport_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:labelFor="@id/transport"
android:text="@string/assistant_sip_account_transport_protocol"
app:layout_constraintTop_toBottomOf="@id/display_name"
app:layout_constraintStart_toStartOf="@id/transport"/>
@ -255,13 +260,14 @@
android:visibility="@{viewModel.expandAdvancedSettings ? View.VISIBLE : View.GONE, default=gone}" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/authentication_id_label"
style="@style/header_style"
android:id="@+id/authentication_id_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:labelFor="@id/authentication_id"
android:text="@string/authentication_id"
app:layout_constraintTop_toBottomOf="@id/advanced_settings"
app:layout_constraintStart_toStartOf="@id/authentication_id"/>
@ -287,13 +293,14 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/outbound_proxy_label"
style="@style/header_style"
android:id="@+id/outbound_proxy_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:labelFor="@id/outbound_proxy"
android:text="@string/account_settings_sip_proxy_url_title"
app:layout_constraintTop_toBottomOf="@id/authentication_id"
app:layout_constraintStart_toStartOf="@id/outbound_proxy"/>
@ -319,9 +326,9 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/primary_button_label_style"
android:onClick="@{() -> viewModel.login()}"
android:enabled="@{viewModel.loginEnabled &amp;&amp; !viewModel.registrationInProgress, default=false}"
style="@style/primary_button_label_style"
android:id="@+id/login"
android:layout_width="0dp"
android:layout_height="wrap_content"

11
app/src/main/res/layout/call_actions_bottom_sheet.xml
View file

@ -104,7 +104,7 @@
app:layout_constraintEnd_toEndOf="@id/calls_list"/>
<ImageView
android:id="@+id/layout"
android:id="@+id/numpad"
android:onClick="@{() -> viewModel.showNumpad()}"
android:enabled="@{!viewModel.isPaused &amp;&amp; !viewModel.isPausedByRemote}"
android:layout_width="0dp"
@ -206,6 +206,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/call_action_transfer"
android:labelFor="@id/transfer"
app:layout_constraintTop_toBottomOf="@id/transfer"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/new_call_label"/>
@ -217,6 +218,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/call_action_start_new_call"
android:labelFor="@id/new_call"
app:layout_constraintTop_toBottomOf="@id/new_call"
app:layout_constraintStart_toEndOf="@id/transfer_label"
app:layout_constraintEnd_toStartOf="@id/calls_list_label" />
@ -228,6 +230,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/call_action_go_to_calls_list"
android:labelFor="@id/calls_list"
app:layout_constraintTop_toBottomOf="@id/calls_list"
app:layout_constraintStart_toEndOf="@id/new_call_label"
app:layout_constraintEnd_toStartOf="@id/layout_label" />
@ -240,7 +243,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/call_action_show_dialer"
app:layout_constraintTop_toBottomOf="@id/layout"
android:labelFor="@id/numpad"
app:layout_constraintTop_toBottomOf="@id/numpad"
app:layout_constraintStart_toEndOf="@id/calls_list_label"
app:layout_constraintEnd_toEndOf="parent" />
@ -252,6 +256,7 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:text="@string/call_action_show_messages"
android:labelFor="@id/chat"
android:enabled="@{!viewModel.operationInProgress}"
app:layout_constraintTop_toBottomOf="@id/chat"
app:layout_constraintStart_toStartOf="@id/transfer_label"
@ -267,6 +272,7 @@
android:enabled="@{viewModel.canBePaused}"
android:selected="@{viewModel.isPaused}"
android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}"
android:labelFor="@id/pause_call"
app:layout_constraintTop_toBottomOf="@id/pause_call"
app:layout_constraintStart_toStartOf="@id/new_call_label"
app:layout_constraintEnd_toEndOf="@id/new_call_label" />
@ -280,6 +286,7 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:text="@string/call_action_record_call"
android:labelFor="@id/record_call"
app:layout_constraintTop_toBottomOf="@id/record_call"
app:layout_constraintStart_toStartOf="@id/calls_list_label"
app:layout_constraintEnd_toEndOf="@id/calls_list_label" />

7
app/src/main/res/layout/call_conference_actions_bottom_sheet.xml
View file

@ -187,6 +187,7 @@
android:layout_height="wrap_content"
android:text="@string/conference_action_screen_sharing"
android:enabled="false"
android:labelFor="@id/screen_sharing"
app:layout_constraintTop_toBottomOf="@id/screen_sharing"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/participants_label"/>
@ -198,6 +199,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="middle"
android:labelFor="@id/participants"
android:text="@{viewModel.conferenceModel.participantsLabel, default=@string/conference_action_show_participants}"
app:layout_constraintTop_toBottomOf="@id/participants"
app:layout_constraintStart_toEndOf="@id/screen_sharing_label"
@ -210,6 +212,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/call_action_go_to_calls_list"
android:labelFor="@id/calls_list"
app:layout_constraintTop_toBottomOf="@id/calls_list"
app:layout_constraintStart_toEndOf="@id/participants_label"
app:layout_constraintEnd_toStartOf="@id/layout_label" />
@ -221,6 +224,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/call_action_change_layout"
android:labelFor="@id/layout"
app:layout_constraintTop_toBottomOf="@id/layout"
app:layout_constraintStart_toEndOf="@id/calls_list_label"
app:layout_constraintEnd_toEndOf="parent" />
@ -233,6 +237,7 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:text="@string/call_action_show_messages"
android:labelFor="@id/chat"
android:enabled="@{viewModel.conferenceModel.isConversationAvailable}"
app:layout_constraintTop_toBottomOf="@id/chat"
app:layout_constraintStart_toStartOf="@id/screen_sharing_label"
@ -247,6 +252,7 @@
android:enabled="@{viewModel.canBePaused}"
android:selected="@{viewModel.isPaused}"
android:text="@{viewModel.isPaused ? @string/call_action_resume_call : @string/call_action_pause_call, default=@string/call_action_pause_call}"
android:labelFor="@id/pause_call"
app:layout_constraintTop_toBottomOf="@id/pause_call"
app:layout_constraintStart_toStartOf="@id/participants_label"
app:layout_constraintEnd_toEndOf="@id/participants_label" />
@ -258,6 +264,7 @@
android:layout_height="wrap_content"
android:paddingBottom="15dp"
android:text="@string/call_action_record_call"
android:labelFor="@id/record_call"
android:enabled="false"
app:layout_constraintTop_toBottomOf="@id/record_call"
app:layout_constraintStart_toStartOf="@id/calls_list_label"

1
app/src/main/res/layout/chat_bubble_single_media_content.xml
View file

@ -111,6 +111,7 @@
android:textSize="16sp"
android:textAlignment="center"
android:textColor="?attr/color_main1_500"
android:labelFor="@id/transfer_progress"
app:layout_constraintTop_toTopOf="@id/transfer_progress"
app:layout_constraintBottom_toBottomOf="@id/transfer_progress"
app:layout_constraintStart_toStartOf="@id/transfer_progress"

3
app/src/main/res/layout/chat_info_fragment.xml
View file

@ -223,6 +223,7 @@
android:textAlignment="center"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/mute"
android:visibility="@{viewModel.isReadOnly ? View.GONE : View.VISIBLE}"
app:layout_constraintEnd_toStartOf="@id/call_label"
app:layout_constraintStart_toStartOf="parent"
@ -256,6 +257,7 @@
android:textAlignment="center"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/call"
android:visibility="@{viewModel.isReadOnly ? View.GONE : View.VISIBLE}"
app:layout_constraintEnd_toEndOf="@id/call"
app:layout_constraintStart_toStartOf="@id/call"
@ -290,6 +292,7 @@
android:textAlignment="center"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/meeting"
android:visibility="@{viewModel.isReadOnly ? View.GONE : View.VISIBLE}"
app:layout_constraintStart_toEndOf="@id/call_label"
app:layout_constraintEnd_toEndOf="parent"

3
app/src/main/res/layout/contact_fragment.xml
View file

@ -167,6 +167,7 @@
android:layout_marginTop="8dp"
android:text="@string/contact_call_action"
android:textSize="14sp"
android:labelFor="@id/call"
app:layout_constraintTop_toBottomOf="@id/call"
app:layout_constraintStart_toStartOf="@id/call"
app:layout_constraintEnd_toEndOf="@id/call"/>
@ -199,6 +200,7 @@
android:layout_marginTop="8dp"
android:text="@string/contact_message_action"
android:textSize="14sp"
android:labelFor="@id/chat"
app:layout_constraintTop_toBottomOf="@id/chat"
app:layout_constraintStart_toStartOf="@id/chat"
app:layout_constraintEnd_toEndOf="@id/chat"/>
@ -231,6 +233,7 @@
android:layout_marginTop="8dp"
android:text="@string/contact_video_call_action"
android:textSize="14sp"
android:labelFor="@id/video_call"
app:layout_constraintTop_toBottomOf="@id/video_call"
app:layout_constraintStart_toStartOf="@id/video_call"
app:layout_constraintEnd_toEndOf="@id/video_call"/>

4
app/src/main/res/layout/contact_new_or_edit_fragment.xml
View file

@ -156,6 +156,7 @@
android:layout_marginTop="30dp"
android:layout_marginEnd="16dp"
android:text="@string/contact_editor_first_name"
android:labelFor="@id/first_name"
app:layout_constraintStart_toStartOf="@id/first_name"
app:layout_constraintTop_toBottomOf="@id/avatar_barrier"/>
@ -189,6 +190,7 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="@string/contact_editor_last_name"
android:labelFor="@id/last_name"
app:layout_constraintStart_toStartOf="@id/last_name"
app:layout_constraintTop_toBottomOf="@id/first_name"/>
@ -268,6 +270,7 @@
android:layout_marginTop="30dp"
android:layout_marginEnd="16dp"
android:text="@string/contact_editor_company"
android:labelFor="@id/company"
app:layout_constraintStart_toStartOf="@id/company"
app:layout_constraintTop_toBottomOf="@id/phone_numbers"/>
@ -301,6 +304,7 @@
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="@string/contact_editor_job_title"
android:labelFor="@id/job_title"
app:layout_constraintStart_toStartOf="@id/job_title"
app:layout_constraintTop_toBottomOf="@id/company"/>

1
app/src/main/res/layout/dialog_set_or_edit_group_subject.xml
View file

@ -44,6 +44,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:paddingTop="@dimen/dialog_top_bottom_margin"
android:labelFor="@id/subject"
android:text="@{viewModel.isGroupConversation ? viewModel.isEdit ? @string/conversation_dialog_edit_subject : @string/conversation_dialog_set_subject : @string/history_group_call_start_dialog_set_subject, default=@string/history_group_call_start_dialog_set_subject}"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@id/subject"

3
app/src/main/res/layout/history_fragment.xml
View file

@ -177,6 +177,7 @@
android:layout_marginTop="8dp"
android:text="@string/contact_call_action"
android:textSize="14sp"
android:labelFor="@id/call"
android:visibility="@{viewModel.isConferenceCallLog ? View.GONE : View.VISIBLE}"
app:layout_constraintTop_toBottomOf="@id/call"
app:layout_constraintStart_toStartOf="@id/call"
@ -207,6 +208,7 @@
android:layout_marginTop="8dp"
android:text="@string/contact_message_action"
android:textSize="14sp"
android:labelFor="@id/chat"
android:visibility="@{viewModel.chatDisabled || viewModel.isConferenceCallLog ? View.GONE : View.VISIBLE}"
app:layout_constraintTop_toBottomOf="@id/chat"
app:layout_constraintStart_toStartOf="@id/chat"
@ -237,6 +239,7 @@
android:layout_marginTop="8dp"
android:text="@string/contact_video_call_action"
android:textSize="14sp"
android:labelFor="@id/video_call"
android:visibility="@{viewModel.videoCallDisabled || viewModel.isConferenceCallLog ? View.GONE : View.VISIBLE}"
app:layout_constraintTop_toBottomOf="@id/video_call"
app:layout_constraintStart_toStartOf="@id/video_call"

4
app/src/main/res/layout/meeting_edit_fragment.xml
View file

@ -166,6 +166,7 @@
android:drawableStart="@drawable/globe_hemisphere_west"
android:drawablePadding="8dp"
android:drawableTint="?attr/color_main2_600"
android:labelFor="@id/timezone_picker"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/to_time" />
@ -374,11 +375,14 @@
android:layout_marginTop="20dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="@dimen/screen_bottom_margin"
android:text="@string/meeting_schedule_send_invitations_title"
android:textColor="?attr/color_main2_600"
android:textSize="14sp"
android:checked="@={viewModel.sendInvitations}"
app:layout_constraintVertical_bias="0"
app:layout_constraintTop_toBottomOf="@id/separator_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />

27
app/src/main/res/layout/meeting_schedule_fragment.xml
View file

@ -511,25 +511,16 @@
android:layout_marginTop="20dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:textColor="@color/gray_main2_600"
android:textSize="14sp"
android:visibility="@{viewModel.chatDisabled ? View.GONE : View.VISIBLE}"
android:enabled="@{!viewModel.chatDisabled}"
android:checked="@={viewModel.sendInvitations}"
app:layout_constraintTop_toBottomOf="@id/separator_5"
app:layout_constraintStart_toStartOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/material_switch_style"
android:id="@+id/send_invitations_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:visibility="@{viewModel.chatDisabled ? View.GONE : View.VISIBLE}"
android:layout_marginBottom="@dimen/screen_bottom_margin"
android:text="@string/meeting_schedule_send_invitations_title"
app:layout_constraintStart_toEndOf="@id/send_invitations"
app:layout_constraintTop_toTopOf="@id/send_invitations"
app:layout_constraintBottom_toBottomOf="@id/send_invitations" />
android:textColor="?attr/color_main2_600"
android:textSize="14sp"
android:checked="@={viewModel.sendInvitations}"
app:layout_constraintVertical_bias="0"
app:layout_constraintTop_toBottomOf="@id/separator_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -27,6 +27,7 @@
android:text="@string/settings_advanced_enable_auto_answer_incoming_calls_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/auto_answer_incoming_calls_switch"
app:layout_constraintTop_toTopOf="@id/auto_answer_incoming_calls_switch"
app:layout_constraintBottom_toBottomOf="@id/auto_answer_incoming_calls_switch"
app:layout_constraintStart_toStartOf="parent"
@ -45,15 +46,14 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/auto_answer_incoming_calls_delay_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginTop="20dp"
android:text="@string/settings_advanced_enable_auto_answer_incoming_calls_after_delay_title"
android:labelFor="@id/auto_answer_incoming_calls_delay"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/auto_answer_incoming_calls_switch"/>
@ -89,6 +89,7 @@
android:text="@string/settings_advanced_enable_auto_answer_video_send_receive"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/auto_answer_incoming_calls_video_switch"
app:layout_constraintTop_toTopOf="@id/auto_answer_incoming_calls_video_switch"
app:layout_constraintBottom_toBottomOf="@id/auto_answer_incoming_calls_video_switch"
app:layout_constraintStart_toStartOf="parent"

3
app/src/main/res/layout/settings_advanced_calls_early_media.xml
View file

@ -27,6 +27,7 @@
android:text="@string/settings_advanced_accept_early_media_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/accept_early_media_switch"
app:layout_constraintTop_toTopOf="@id/accept_early_media_switch"
app:layout_constraintBottom_toBottomOf="@id/accept_early_media_switch"
app:layout_constraintStart_toStartOf="parent"
@ -56,6 +57,7 @@
android:maxLines="2"
android:ellipsize="end"
android:enabled="@{viewModel.acceptEarlyMedia}"
android:labelFor="@id/ring_during_early_media_switch"
app:layout_constraintTop_toTopOf="@id/ring_during_early_media_switch"
app:layout_constraintBottom_toBottomOf="@id/ring_during_early_media_switch"
app:layout_constraintStart_toStartOf="parent"
@ -85,6 +87,7 @@
android:text="@string/settings_advanced_allow_outgoing_early_media_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/allow_outgoing_early_media_switch"
app:layout_constraintTop_toTopOf="@id/allow_outgoing_early_media_switch"
app:layout_constraintBottom_toBottomOf="@id/allow_outgoing_early_media_switch"
app:layout_constraintStart_toStartOf="parent"

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

@ -68,6 +68,7 @@
android:text="@string/settings_calls_enable_fec_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/enable_fec_switch"
android:visibility="@{viewModel.videoEnabled ? View.VISIBLE : View.GONE}"
app:layout_constraintTop_toTopOf="@id/enable_fec_switch"
app:layout_constraintBottom_toBottomOf="@id/enable_fec_switch"
@ -99,6 +100,7 @@
android:text="@string/settings_advanced_use_smff_format_for_call_recordings_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/use_smff_call_recording_switch"
app:layout_constraintTop_toTopOf="@id/use_smff_call_recording_switch"
app:layout_constraintBottom_toTopOf="@id/use_smff_call_recording_subtitle"
app:layout_constraintStart_toStartOf="parent"
@ -133,15 +135,14 @@
app:layout_constraintTop_toBottomOf="@id/enable_fec_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/media_encryption_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginTop="20dp"
android:text="@string/settings_advanced_media_encryption_title"
android:labelFor="@id/media_encryption"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/use_smff_call_recording_switch"/>
@ -151,7 +152,6 @@
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:textSize="14sp"
@ -191,6 +191,7 @@
android:text="@string/settings_advanced_media_encryption_mandatory_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/media_encryption_mandatory_switch"
app:layout_constraintTop_toTopOf="@id/media_encryption_mandatory_switch"
app:layout_constraintBottom_toBottomOf="@id/media_encryption_mandatory_switch"
app:layout_constraintStart_toStartOf="parent"
@ -217,7 +218,7 @@
android:padding="5dp"
android:layout_marginStart="26dp"
android:layout_marginEnd="26dp"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:text="@string/settings_advanced_early_media_title"
android:drawableEnd="@{viewModel.expandEarlyMedia ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
android:drawableTint="?attr/color_main2_600"
@ -246,7 +247,7 @@
android:padding="5dp"
android:layout_marginStart="26dp"
android:layout_marginEnd="26dp"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:text="@string/settings_advanced_auto_answer_title"
android:drawableEnd="@{viewModel.expandAutoAnswer ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
android:drawableTint="?attr/color_main2_600"
@ -275,7 +276,7 @@
android:padding="5dp"
android:layout_marginStart="26dp"
android:layout_marginEnd="26dp"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:text="@string/settings_advanced_audio_codecs_title"
android:drawableEnd="@{viewModel.expandAudioCodecs ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
android:drawableTint="?attr/color_main2_600"
@ -309,7 +310,7 @@
android:padding="5dp"
android:layout_marginStart="26dp"
android:layout_marginEnd="26dp"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:text="@string/settings_advanced_video_codecs_title"
android:drawableEnd="@{viewModel.expandVideoCodecs ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
android:drawableTint="?attr/color_main2_600"

42
app/src/main/res/layout/settings_advanced_fragment.xml
View file

@ -69,6 +69,7 @@
android:text="@string/settings_advanced_print_logs_crashlytics_title"
android:maxLines="3"
android:ellipsize="end"
android:labelFor="@id/crashlytics_switch"
android:visibility="@{viewModel.isCrashlyticsAvailable ? View.VISIBLE : View.GONE}"
app:layout_constraintTop_toTopOf="@id/crashlytics_switch"
app:layout_constraintBottom_toBottomOf="@id/crashlytics_switch"
@ -98,6 +99,7 @@
android:text="@string/settings_advanced_start_at_boot_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/start_at_boot_switch"
app:layout_constraintTop_toTopOf="@id/start_at_boot_switch"
app:layout_constraintBottom_toBottomOf="@id/start_at_boot_switch"
app:layout_constraintStart_toStartOf="parent"
@ -125,6 +127,7 @@
android:text="@string/settings_advanced_keep_alive_service_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/keep_alive_service_switch"
app:layout_constraintTop_toTopOf="@id/keep_alive_service_switch"
app:layout_constraintBottom_toBottomOf="@id/keep_alive_service_switch"
app:layout_constraintStart_toStartOf="parent"
@ -143,15 +146,14 @@
app:layout_constraintTop_toBottomOf="@id/start_at_boot_switch"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/device_id_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginTop="20dp"
android:text="@string/settings_advanced_device_id"
android:labelFor="@id/device_id"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/keep_alive_service_switch"/>
@ -176,15 +178,14 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/remote_provisioning_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginTop="20dp"
android:text="@string/settings_advanced_remote_provisioning_url"
android:labelFor="@id/remote_provisioning"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/device_id"/>
@ -217,7 +218,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:background="@drawable/tertiary_button_background"
android:paddingStart="12dp"
android:paddingEnd="12dp"
@ -239,7 +240,7 @@
android:padding="5dp"
android:layout_marginStart="26dp"
android:layout_marginEnd="26dp"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:text="@string/settings_advanced_audio_devices_title"
android:drawableEnd="@{viewModel.expandAudioDevices ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
android:drawableTint="?attr/color_main2_600"
@ -263,16 +264,15 @@
app:layout_constraintEnd_toEndOf="parent">
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/input_audio_device_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginTop="20dp"
android:text="@string/settings_advanced_input_audio_device_title"
android:visibility="@{viewModel.expandAudioDevices ? View.VISIBLE : View.GONE}"
android:labelFor="@id/input_audio_device"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
@ -282,7 +282,6 @@
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:textSize="14sp"
@ -314,16 +313,15 @@
app:layout_constraintEnd_toEndOf="@id/input_audio_device"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/output_audio_device_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginTop="20dp"
android:text="@string/settings_advanced_output_audio_device_title"
android:visibility="@{viewModel.expandAudioDevices ? View.VISIBLE : View.GONE}"
android:labelFor="@id/output_audio_device"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/input_audio_device"/>
@ -333,7 +331,6 @@
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:textSize="14sp"
@ -373,7 +370,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="5dp"
android:layout_margin="16dp"
android:layout_marginTop="20dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="@dimen/screen_bottom_margin"
android:text="@string/settings_advanced_go_to_android_app_settings_title"
android:drawableEnd="@drawable/arrow_square_out"
android:drawableTint="?attr/color_main2_600"

8
app/src/main/res/layout/settings_calls.xml
View file

@ -106,6 +106,7 @@
android:text="@string/settings_calls_adaptive_rate_control_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/adaptive_rate_control_switch"
app:layout_constraintTop_toTopOf="@id/adaptive_rate_control_switch"
app:layout_constraintBottom_toBottomOf="@id/adaptive_rate_control_switch"
app:layout_constraintStart_toStartOf="parent"
@ -134,6 +135,7 @@
android:text="@string/settings_calls_enable_video_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/enable_video_switch"
app:layout_constraintTop_toTopOf="@id/enable_video_switch"
app:layout_constraintBottom_toBottomOf="@id/enable_video_switch"
app:layout_constraintStart_toStartOf="parent"
@ -163,6 +165,7 @@
android:text="@string/settings_calls_vibrate_while_ringing_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/vibrate_switch"
app:layout_constraintTop_toTopOf="@id/vibrate_switch"
app:layout_constraintBottom_toBottomOf="@id/vibrate_switch"
app:layout_constraintStart_toStartOf="parent"
@ -192,6 +195,7 @@
android:text="@string/settings_calls_auto_record_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/auto_record_switch"
app:layout_constraintTop_toTopOf="@id/auto_record_switch"
app:layout_constraintBottom_toBottomOf="@id/auto_record_switch"
app:layout_constraintStart_toStartOf="parent"
@ -218,7 +222,7 @@
android:padding="5dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="@dimen/screen_bottom_margin"
android:text="@string/settings_calls_change_ringtone_title"
android:drawableEnd="@drawable/arrow_square_out"
@ -237,7 +241,7 @@
android:padding="5dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="@dimen/screen_bottom_margin"
android:text="@string/settings_advanced_calls"
android:drawableEnd="@drawable/caret_right"

3
app/src/main/res/layout/settings_chat.xml
View file

@ -27,6 +27,7 @@
android:text="@string/settings_conversations_auto_download_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/auto_download_switch"
app:layout_constraintTop_toTopOf="@id/auto_download_switch"
app:layout_constraintBottom_toBottomOf="@id/auto_download_switch"
app:layout_constraintStart_toStartOf="parent"
@ -55,6 +56,7 @@
android:text="@string/settings_conversations_auto_export_media_to_native_gallery_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/auto_export_media_to_native_gallery_switch"
app:layout_constraintTop_toTopOf="@id/auto_export_media_to_native_gallery_switch"
app:layout_constraintBottom_toBottomOf="@id/auto_export_media_to_native_gallery_switch"
app:layout_constraintStart_toStartOf="parent"
@ -84,6 +86,7 @@
android:text="@string/settings_conversations_mark_as_read_when_dismissing_notif_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/mark_as_read_dismiss_notif_switch"
app:layout_constraintTop_toTopOf="@id/mark_as_read_dismiss_notif_switch"
app:layout_constraintBottom_toBottomOf="@id/mark_as_read_dismiss_notif_switch"
app:layout_constraintStart_toStartOf="parent"

3
app/src/main/res/layout/settings_codec_list_cell.xml
View file

@ -25,6 +25,7 @@
android:text="@{model.mimeType, default=`Opus`}"
android:maxLines="1"
android:ellipsize="end"
android:labelFor="@id/codec_switch"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintTop_toTopOf="@id/codec_switch"
app:layout_constraintBottom_toTopOf="@id/codec_subtitle"
@ -54,7 +55,7 @@
android:onClick="@{() -> model.toggleEnabled()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="16dp"
android:checked="@{model.enabled}"
app:layout_constraintEnd_toEndOf="parent"

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

@ -16,7 +16,7 @@
android:background="@drawable/shape_squircle_white_background">
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/sort_contacts_by_first_name_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -26,6 +26,7 @@
android:text="@string/settings_contacts_sort_by_first_name_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/sort_contacts_by_first_name_spinner"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -36,7 +37,6 @@
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="8dp"
android:background="@drawable/edit_text_background"
android:paddingStart="@dimen/spinner_start_padding"
android:paddingEnd="@dimen/spinner_end_padding"
@ -72,6 +72,7 @@
android:text="@string/settings_contacts_hide_empty_contacts_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/hide_empty_contacts_switch"
app:layout_constraintTop_toTopOf="@id/hide_empty_contacts_switch"
app:layout_constraintBottom_toBottomOf="@id/hide_empty_contacts_switch"
app:layout_constraintStart_toStartOf="parent"

16
app/src/main/res/layout/settings_contacts_carddav.xml
View file

@ -75,7 +75,7 @@
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/name_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -85,6 +85,7 @@
android:text="@string/settings_contacts_carddav_name_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/name"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -107,7 +108,7 @@
app:layout_constraintTop_toBottomOf="@id/name_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/server_url_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -117,6 +118,7 @@
android:text="@string/settings_contacts_carddav_server_url_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/server_url"
app:layout_constraintTop_toBottomOf="@id/name"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -139,7 +141,7 @@
app:layout_constraintTop_toBottomOf="@id/server_url_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/username_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -149,6 +151,7 @@
android:text="@string/settings_contacts_carddav_username_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/username"
app:layout_constraintTop_toBottomOf="@id/server_url"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -171,7 +174,7 @@
app:layout_constraintTop_toBottomOf="@id/username_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/password_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -181,6 +184,7 @@
android:text="@string/settings_contacts_carddav_password_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/password"
app:layout_constraintTop_toBottomOf="@id/username"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -217,7 +221,7 @@
app:layout_constraintBottom_toBottomOf="@id/password" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/realm_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -227,6 +231,7 @@
android:text="@string/settings_contacts_carddav_realm_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/realm"
app:layout_constraintTop_toBottomOf="@id/password"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -261,6 +266,7 @@
android:text="@string/settings_contacts_carddav_use_as_default_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/save_new_contacts_in_this_list_switch"
android:visibility="@{viewModel.isReadOnly ? View.GONE : View.VISIBLE}"
app:layout_constraintTop_toTopOf="@id/save_new_contacts_in_this_list_switch"
app:layout_constraintBottom_toBottomOf="@id/save_new_contacts_in_this_list_switch"

38
app/src/main/res/layout/settings_contacts_ldap.xml
View file

@ -84,6 +84,7 @@
android:text="@string/settings_contacts_ldap_enabled_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/enabled_switch"
app:layout_constraintTop_toTopOf="@id/enabled_switch"
app:layout_constraintBottom_toBottomOf="@id/enabled_switch"
app:layout_constraintStart_toStartOf="parent"
@ -102,7 +103,7 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/server_url_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -112,6 +113,7 @@
android:text="@string/settings_contacts_ldap_server_url_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/server_url"
app:layout_constraintTop_toBottomOf="@id/enabled_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -134,7 +136,7 @@
app:layout_constraintTop_toBottomOf="@id/server_url_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/bind_dn_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -144,6 +146,7 @@
android:text="@string/settings_contacts_ldap_bind_dn_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/bind_dn"
app:layout_constraintTop_toBottomOf="@id/server_url"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -166,7 +169,7 @@
app:layout_constraintTop_toBottomOf="@id/bind_dn_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/password_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -176,6 +179,7 @@
android:text="@string/settings_contacts_ldap_password_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/password"
app:layout_constraintTop_toBottomOf="@id/bind_dn"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -222,6 +226,7 @@
android:text="@string/settings_contacts_ldap_use_tls_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/tls_switch"
app:layout_constraintTop_toTopOf="@id/tls_switch"
app:layout_constraintBottom_toBottomOf="@id/tls_switch"
app:layout_constraintStart_toStartOf="parent"
@ -240,7 +245,7 @@
app:layout_constraintTop_toBottomOf="@id/password" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/search_base_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -250,6 +255,7 @@
android:text="@string/settings_contacts_ldap_search_base_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/search_base"
app:layout_constraintTop_toBottomOf="@id/tls_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -272,7 +278,7 @@
app:layout_constraintTop_toBottomOf="@id/search_base_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/search_filter_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -282,6 +288,7 @@
android:text="@string/settings_contacts_ldap_search_filter_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/search_filter"
app:layout_constraintTop_toBottomOf="@id/search_base"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -304,7 +311,7 @@
app:layout_constraintTop_toBottomOf="@id/search_filter_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/max_results_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -314,6 +321,7 @@
android:text="@string/settings_contacts_ldap_max_results_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/max_results"
app:layout_constraintTop_toBottomOf="@id/search_filter"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -336,7 +344,7 @@
app:layout_constraintTop_toBottomOf="@id/max_results_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/request_timeout_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -346,6 +354,7 @@
android:text="@string/settings_contacts_ldap_request_timeout_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/request_timeout"
app:layout_constraintTop_toBottomOf="@id/max_results"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -368,7 +377,7 @@
app:layout_constraintTop_toBottomOf="@id/request_timeout_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/request_delay_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -378,6 +387,7 @@
android:text="@string/settings_contacts_ldap_request_delay_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/request_delay"
app:layout_constraintTop_toBottomOf="@id/request_timeout"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -400,7 +410,7 @@
app:layout_constraintTop_toBottomOf="@id/request_delay_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/min_chars_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -410,6 +420,7 @@
android:text="@string/settings_contacts_ldap_min_characters_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/min_chars"
app:layout_constraintTop_toBottomOf="@id/request_delay"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -432,7 +443,7 @@
app:layout_constraintTop_toBottomOf="@id/min_chars_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/name_attributes_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -442,6 +453,7 @@
android:text="@string/settings_contacts_ldap_name_attributes_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/name_attributes"
app:layout_constraintTop_toBottomOf="@id/min_chars"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -464,7 +476,7 @@
app:layout_constraintTop_toBottomOf="@id/name_attributes_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/sip_attributes_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -474,6 +486,7 @@
android:text="@string/settings_contacts_ldap_sip_attributes_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/sip_attributes"
app:layout_constraintTop_toBottomOf="@id/name_attributes"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -496,7 +509,7 @@
app:layout_constraintTop_toBottomOf="@id/sip_attributes_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/sip_domain_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -506,6 +519,7 @@
android:text="@string/settings_contacts_ldap_sip_domain_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/sip_domain"
app:layout_constraintTop_toBottomOf="@id/sip_attributes"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>

25
app/src/main/res/layout/settings_developer_fragment.xml
View file

@ -67,6 +67,7 @@
android:text="@string/settings_developer_show_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/settings_developer_switch"
app:layout_constraintTop_toTopOf="@id/settings_developer_switch"
app:layout_constraintBottom_toBottomOf="@id/settings_developer_switch"
app:layout_constraintStart_toStartOf="parent"
@ -95,6 +96,7 @@
android:text="@string/help_troubleshooting_print_logs_in_logcat"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/logcat_switch"
app:layout_constraintTop_toTopOf="@id/logcat_switch"
app:layout_constraintBottom_toBottomOf="@id/logcat_switch"
app:layout_constraintStart_toStartOf="parent"
@ -113,14 +115,13 @@
app:layout_constraintTop_toBottomOf="@id/settings_developer_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/upload_server_url_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginTop="20dp"
android:labelFor="@id/upload_server_url"
android:text="@string/settings_advanced_upload_server_url"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/logcat_switch"/>
@ -146,14 +147,13 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/logs_upload_server_url_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginTop="20dp"
android:labelFor="@id/logs_upload_server_url"
android:text="@string/settings_advanced_logs_upload_server_url"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/upload_server_url"/>
@ -189,6 +189,7 @@
android:text="@string/settings_advanced_create_e2e_encrypted_conferences_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/e2e_encrypted_conferences_switch"
app:layout_constraintTop_toTopOf="@id/e2e_encrypted_conferences_switch"
app:layout_constraintBottom_toBottomOf="@id/e2e_encrypted_conferences_switch"
app:layout_constraintStart_toStartOf="parent"
@ -217,6 +218,7 @@
android:text="@string/settings_developer_enable_vu_meters_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/enable_vu_meters_switch"
app:layout_constraintTop_toTopOf="@id/enable_vu_meters_switch"
app:layout_constraintBottom_toBottomOf="@id/enable_vu_meters_switch"
app:layout_constraintStart_toStartOf="parent"
@ -235,16 +237,15 @@
app:layout_constraintTop_toBottomOf="@id/e2e_encrypted_conferences_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/push_compatible_domains_list_label"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_marginTop="20dp"
android:text="@string/settings_developer_push_compatible_domains_list_title"
android:labelFor="@id/push_compatible_domains_list"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/enable_vu_meters_switch"/>

4
app/src/main/res/layout/settings_meetings.xml
View file

@ -17,7 +17,7 @@
android:background="@drawable/shape_squircle_white_background">
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/layout_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -27,6 +27,7 @@
android:text="@string/settings_meetings_default_layout_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/layout_spinner"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -37,7 +38,6 @@
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="8dp"
android:background="@drawable/edit_text_background"
android:paddingStart="@dimen/spinner_start_padding"
android:paddingEnd="@dimen/spinner_end_padding"

4
app/src/main/res/layout/settings_network.xml
View file

@ -27,6 +27,7 @@
android:text="@string/settings_network_use_wifi_only"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/wifi_only_switch"
app:layout_constraintTop_toTopOf="@id/wifi_only_switch"
app:layout_constraintBottom_toBottomOf="@id/wifi_only_switch"
app:layout_constraintStart_toStartOf="parent"
@ -55,6 +56,7 @@
android:text="@string/settings_network_allow_ipv6"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/ipv6_enabled_switch"
app:layout_constraintTop_toTopOf="@id/ipv6_enabled_switch"
app:layout_constraintBottom_toBottomOf="@id/ipv6_enabled_switch"
app:layout_constraintStart_toStartOf="parent"
@ -66,7 +68,7 @@
android:onClick="@{() -> viewModel.toggleIpv6()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="16dp"
android:checked="@{viewModel.allowIpv6}"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/settings_security.xml
View file

@ -31,6 +31,7 @@
android:text="@string/settings_security_enable_vfs_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/enable_vfs_switch"
app:layout_constraintTop_toTopOf="@id/enable_vfs_switch"
app:layout_constraintBottom_toTopOf="@id/enable_vfs_subtitle"
app:layout_constraintStart_toStartOf="parent"
@ -74,7 +75,7 @@
android:layout_marginEnd="16dp"
android:checked="@{viewModel.isUiSecureModeEnabled}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/enable_vfs_subtitle" />
app:layout_constraintTop_toBottomOf="@id/enable_vfs_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
@ -87,6 +88,7 @@
android:text="@string/settings_security_prevent_screenshots_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/security_ui_switch"
app:layout_constraintTop_toTopOf="@id/security_ui_switch"
app:layout_constraintBottom_toBottomOf="@id/security_ui_switch"
app:layout_constraintStart_toStartOf="parent"

31
app/src/main/res/layout/settings_tunnel.xml
View file

@ -17,13 +17,14 @@
android:background="@drawable/shape_squircle_white_background">
<androidx.appcompat.widget.AppCompatTextView
style="@style/header_style"
style="@style/settings_title_padding_style"
android:id="@+id/tunnel_host_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="20dp"
android:text="@string/settings_tunnel_main_host_label"
android:labelFor="@id/tunnel_host"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
@ -33,7 +34,6 @@
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@={viewModel.tunnelMainHost}"
@ -50,13 +50,14 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/header_style"
style="@style/settings_title_padding_style"
android:id="@+id/tunnel_port_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:text="@string/settings_tunnel_main_port_label"
android:labelFor="@id/tunnel_port"
app:layout_constraintTop_toBottomOf="@id/tunnel_host"
app:layout_constraintStart_toStartOf="parent"/>
@ -66,7 +67,6 @@
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@={viewModel.tunnelMainPort}"
@ -93,6 +93,7 @@
android:text="@string/settings_tunnel_dual_mode_label"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/tunnel_dual_mode_switch"
app:layout_constraintTop_toTopOf="@id/tunnel_dual_mode_switch"
app:layout_constraintBottom_toBottomOf="@id/tunnel_dual_mode_switch"
app:layout_constraintStart_toStartOf="parent"
@ -104,21 +105,22 @@
android:onClick="@{() -> viewModel.toggleTunnelDualMode()}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="16dp"
android:checked="@{viewModel.tunnelDualMode}"
app:layout_constraintTop_toBottomOf="@id/tunnel_port"
app:layout_constraintEnd_toEndOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/header_style"
style="@style/settings_title_padding_style"
android:id="@+id/tunnel_dual_host_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:text="@string/settings_tunnel_second_host_label"
android:visibility="@{viewModel.tunnelDualMode ? View.VISIBLE : View.GONE, default=gone}"
android:labelFor="@id/tunnel_dual_host"
app:layout_constraintTop_toBottomOf="@id/tunnel_dual_mode_switch"
app:layout_constraintStart_toStartOf="parent"/>
@ -128,7 +130,6 @@
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@={viewModel.tunnelDualHost}"
@ -146,13 +147,14 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/header_style"
style="@style/settings_title_padding_style"
android:id="@+id/tunnel_dual_port_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:text="@string/settings_tunnel_second_port_label"
android:labelFor="@id/tunnel_dual_port"
android:visibility="@{viewModel.tunnelDualMode ? View.VISIBLE : View.GONE, default=gone}"
app:layout_constraintTop_toBottomOf="@id/tunnel_dual_host"
app:layout_constraintStart_toStartOf="parent"/>
@ -163,7 +165,6 @@
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@={viewModel.tunnelDualPort}"
@ -181,13 +182,14 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/header_style"
style="@style/settings_title_padding_style"
android:id="@+id/tunnel_mode_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginTop="20dp"
android:text="@string/settings_tunnel_mode_label"
android:labelFor="@id/tunnel_mode_spinner"
app:layout_constraintTop_toBottomOf="@id/tunnel_dual_port"
app:layout_constraintStart_toStartOf="parent"/>
@ -197,7 +199,6 @@
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:textSize="14sp"

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

@ -39,6 +39,7 @@
android:text="@string/settings_user_interface_auto_show_dialpad_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/auto_show_dialpad_switch"
app:layout_constraintTop_toTopOf="@id/auto_show_dialpad_switch"
app:layout_constraintBottom_toBottomOf="@id/auto_show_dialpad_switch"
app:layout_constraintStart_toStartOf="parent"
@ -57,7 +58,7 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/theme_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -67,6 +68,7 @@
android:text="@string/settings_user_interface_theme_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/theme_spinner"
app:layout_constraintTop_toBottomOf="@id/auto_show_dialpad_switch"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -77,7 +79,6 @@
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="8dp"
android:background="@drawable/edit_text_background"
android:paddingStart="@dimen/spinner_start_padding"
android:paddingEnd="@dimen/spinner_end_padding"
@ -103,7 +104,7 @@
app:layout_constraintEnd_toEndOf="@id/theme_spinner"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/settings_title_style"
style="@style/settings_title_padding_style"
android:id="@+id/color_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -113,6 +114,7 @@
android:text="@string/settings_user_interface_color_title"
android:maxLines="2"
android:ellipsize="end"
android:labelFor="@id/color_spinner"
app:layout_constraintTop_toBottomOf="@id/theme_spinner"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -123,7 +125,6 @@
android:layout_width="0dp"
android:layout_height="50dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="8dp"
android:background="@drawable/edit_text_background"
android:paddingStart="@dimen/spinner_start_padding"
android:paddingEnd="@dimen/spinner_end_padding"

1
app/src/main/res/layout/start_call_fragment.xml
View file

@ -223,6 +223,7 @@
android:textSize="16sp"
android:maxLines="1"
android:ellipsize="end"
android:labelFor="@id/group_call_icon"
app:layout_constraintBottom_toBottomOf="@id/group_call_icon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/group_call_icon"

1
app/src/main/res/layout/start_chat_fragment.xml
View file

@ -205,6 +205,7 @@
android:textSize="16sp"
android:maxLines="1"
android:ellipsize="end"
android:labelFor="@id/group_chat_icon"
app:layout_constraintBottom_toBottomOf="@id/group_chat_icon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/group_chat_icon"

6
app/src/main/res/values/styles.xml
View file

@ -67,6 +67,12 @@
<item name="android:textColor">?attr/color_main2_500</item>
<item name="android:textSize">13sp</item>
</style>
<style name="settings_title_padding_style">
<item name="android:fontFamily">@font/noto_sans_700</item>
<item name="android:textColor">?attr/color_main2_500</item>
<item name="android:textSize">13sp</item>
<item name="android:paddingBottom">5dp</item>
</style>
<style name="settings_subtitle_style">
<item name="android:fontFamily">@font/noto_sans</item>
<item name="android:textColor">?attr/color_main2_500</item>