diff --git a/app/src/main/res/layout-land/call_actions_bottom_sheet.xml b/app/src/main/res/layout-land/call_actions_bottom_sheet.xml index 377d5fc47..88394144c 100644 --- a/app/src/main/res/layout-land/call_actions_bottom_sheet.xml +++ b/app/src/main/res/layout-land/call_actions_bottom_sheet.xml @@ -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" /> diff --git a/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml b/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml index 0d9a2e5e0..9d02d3e61 100644 --- a/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml +++ b/app/src/main/res/layout-land/call_conference_actions_bottom_sheet.xml @@ -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" diff --git a/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml b/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml index 039c912c1..9fe2cc458 100644 --- a/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml +++ b/app/src/main/res/layout-land/contact_new_or_edit_fragment.xml @@ -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"/> diff --git a/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml index 0b3b2daa3..6a2908e4d 100644 --- a/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml +++ b/app/src/main/res/layout-sw600dp/assistant_landing_fragment.xml @@ -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" diff --git a/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml index b5658c89b..1732576b4 100644 --- a/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml +++ b/app/src/main/res/layout-sw600dp/assistant_register_fragment.xml @@ -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" diff --git a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml index b7acbf3bd..b9115a91c 100644 --- a/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml +++ b/app/src/main/res/layout-sw600dp/assistant_third_party_sip_account_login_fragment.xml @@ -68,13 +68,14 @@ app:layout_constraintStart_toEndOf="@id/back"/> @@ -338,13 +344,14 @@ app:layout_constraintEnd_toEndOf="@id/advanced_settings"/> diff --git a/app/src/main/res/layout/account_advanced_settings.xml b/app/src/main/res/layout/account_advanced_settings.xml index 0d3064b15..d25b6de59 100644 --- a/app/src/main/res/layout/account_advanced_settings.xml +++ b/app/src/main/res/layout/account_advanced_settings.xml @@ -19,7 +19,7 @@ android:background="@drawable/shape_squircle_white_background"> @@ -67,7 +68,7 @@ app:layout_constraintEnd_toEndOf="@id/transport_spinner"/> @@ -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" /> @@ -241,7 +248,7 @@ app:layout_constraintTop_toBottomOf="@id/expire_title"/> @@ -276,7 +284,7 @@ app:layout_constraintTop_toBottomOf="@id/conference_factory_uri_title"/> @@ -310,7 +319,7 @@ app:layout_constraintTop_toBottomOf="@id/audio_video_conference_factory_uri_title"/> @@ -344,7 +354,7 @@ app:layout_constraintTop_toBottomOf="@id/ccmp_server_url_title"/> @@ -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"/> @@ -134,7 +138,7 @@ app:layout_constraintTop_toBottomOf="@id/turn_username_title" /> diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml index 71e3a213f..797e06154 100644 --- a/app/src/main/res/layout/account_profile_fragment.xml +++ b/app/src/main/res/layout/account_profile_fragment.xml @@ -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"/> @@ -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"/> @@ -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" diff --git a/app/src/main/res/layout/account_settings_fragment.xml b/app/src/main/res/layout/account_settings_fragment.xml index 29a68180c..ee774ee0c 100644 --- a/app/src/main/res/layout/account_settings_fragment.xml +++ b/app/src/main/res/layout/account_settings_fragment.xml @@ -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"/> @@ -164,7 +167,7 @@ app:layout_constraintTop_toBottomOf="@id/voicemail_uri_title" /> @@ -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}" diff --git a/app/src/main/res/layout/assistant_landing_fragment.xml b/app/src/main/res/layout/assistant_landing_fragment.xml index 2d4e3a5d3..4a17dde1f 100644 --- a/app/src/main/res/layout/assistant_landing_fragment.xml +++ b/app/src/main/res/layout/assistant_landing_fragment.xml @@ -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" diff --git a/app/src/main/res/layout/assistant_register_fragment.xml b/app/src/main/res/layout/assistant_register_fragment.xml index 02deb35aa..c90c7ca69 100644 --- a/app/src/main/res/layout/assistant_register_fragment.xml +++ b/app/src/main/res/layout/assistant_register_fragment.xml @@ -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"/> diff --git a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml index e22b7a4a0..a256e2205 100644 --- a/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml +++ b/app/src/main/res/layout/assistant_third_party_sip_account_login_fragment.xml @@ -48,13 +48,14 @@ app:layout_constraintEnd_toEndOf="parent"/> @@ -80,13 +81,14 @@ app:layout_constraintEnd_toEndOf="parent"/> @@ -126,13 +128,14 @@ app:layout_constraintBottom_toBottomOf="@id/password" /> @@ -158,13 +161,14 @@ app:layout_constraintEnd_toEndOf="parent"/> @@ -190,13 +194,14 @@ app:layout_constraintEnd_toEndOf="parent"/> @@ -255,13 +260,14 @@ android:visibility="@{viewModel.expandAdvancedSettings ? View.VISIBLE : View.GONE, default=gone}" /> @@ -287,13 +293,14 @@ app:layout_constraintEnd_toEndOf="parent"/> @@ -319,9 +326,9 @@ app:layout_constraintEnd_toEndOf="parent"/> @@ -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" /> diff --git a/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml b/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml index c23e7b9df..13a30ab0c 100644 --- a/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml +++ b/app/src/main/res/layout/call_conference_actions_bottom_sheet.xml @@ -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" diff --git a/app/src/main/res/layout/chat_bubble_single_media_content.xml b/app/src/main/res/layout/chat_bubble_single_media_content.xml index 6fb6aa196..09e1aa969 100644 --- a/app/src/main/res/layout/chat_bubble_single_media_content.xml +++ b/app/src/main/res/layout/chat_bubble_single_media_content.xml @@ -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" diff --git a/app/src/main/res/layout/chat_info_fragment.xml b/app/src/main/res/layout/chat_info_fragment.xml index b7c58293f..c70f00153 100644 --- a/app/src/main/res/layout/chat_info_fragment.xml +++ b/app/src/main/res/layout/chat_info_fragment.xml @@ -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" diff --git a/app/src/main/res/layout/contact_fragment.xml b/app/src/main/res/layout/contact_fragment.xml index f8c9df179..b2fe7f28d 100644 --- a/app/src/main/res/layout/contact_fragment.xml +++ b/app/src/main/res/layout/contact_fragment.xml @@ -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"/> diff --git a/app/src/main/res/layout/contact_new_or_edit_fragment.xml b/app/src/main/res/layout/contact_new_or_edit_fragment.xml index b32845023..b9526e0e1 100644 --- a/app/src/main/res/layout/contact_new_or_edit_fragment.xml +++ b/app/src/main/res/layout/contact_new_or_edit_fragment.xml @@ -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"/> diff --git a/app/src/main/res/layout/dialog_set_or_edit_group_subject.xml b/app/src/main/res/layout/dialog_set_or_edit_group_subject.xml index d94cc901e..37ce674e2 100644 --- a/app/src/main/res/layout/dialog_set_or_edit_group_subject.xml +++ b/app/src/main/res/layout/dialog_set_or_edit_group_subject.xml @@ -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" diff --git a/app/src/main/res/layout/history_fragment.xml b/app/src/main/res/layout/history_fragment.xml index 8d98ce3b6..544dbaa08 100644 --- a/app/src/main/res/layout/history_fragment.xml +++ b/app/src/main/res/layout/history_fragment.xml @@ -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" diff --git a/app/src/main/res/layout/meeting_edit_fragment.xml b/app/src/main/res/layout/meeting_edit_fragment.xml index 3f7d7bd11..5c891ee9e 100644 --- a/app/src/main/res/layout/meeting_edit_fragment.xml +++ b/app/src/main/res/layout/meeting_edit_fragment.xml @@ -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" /> diff --git a/app/src/main/res/layout/meeting_schedule_fragment.xml b/app/src/main/res/layout/meeting_schedule_fragment.xml index 3c547d32c..76c3c1770 100644 --- a/app/src/main/res/layout/meeting_schedule_fragment.xml +++ b/app/src/main/res/layout/meeting_schedule_fragment.xml @@ -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" /> - - + 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" /> diff --git a/app/src/main/res/layout/settings_advanced_calls_auto_answer.xml b/app/src/main/res/layout/settings_advanced_calls_auto_answer.xml index f5b948fc3..f43c45000 100644 --- a/app/src/main/res/layout/settings_advanced_calls_auto_answer.xml +++ b/app/src/main/res/layout/settings_advanced_calls_auto_answer.xml @@ -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" /> @@ -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" diff --git a/app/src/main/res/layout/settings_advanced_calls_early_media.xml b/app/src/main/res/layout/settings_advanced_calls_early_media.xml index 8f264bcd4..935633c41 100644 --- a/app/src/main/res/layout/settings_advanced_calls_early_media.xml +++ b/app/src/main/res/layout/settings_advanced_calls_early_media.xml @@ -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" diff --git a/app/src/main/res/layout/settings_advanced_calls_fragment.xml b/app/src/main/res/layout/settings_advanced_calls_fragment.xml index b111607c8..5394a8419 100644 --- a/app/src/main/res/layout/settings_advanced_calls_fragment.xml +++ b/app/src/main/res/layout/settings_advanced_calls_fragment.xml @@ -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" /> @@ -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" diff --git a/app/src/main/res/layout/settings_advanced_fragment.xml b/app/src/main/res/layout/settings_advanced_fragment.xml index 73b41c6f1..4d61d7f07 100644 --- a/app/src/main/res/layout/settings_advanced_fragment.xml +++ b/app/src/main/res/layout/settings_advanced_fragment.xml @@ -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"/> @@ -176,15 +178,14 @@ app:layout_constraintEnd_toEndOf="parent"/> @@ -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"> @@ -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"/> @@ -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" diff --git a/app/src/main/res/layout/settings_calls.xml b/app/src/main/res/layout/settings_calls.xml index 1566fd8c4..3a0159b4b 100644 --- a/app/src/main/res/layout/settings_calls.xml +++ b/app/src/main/res/layout/settings_calls.xml @@ -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" diff --git a/app/src/main/res/layout/settings_chat.xml b/app/src/main/res/layout/settings_chat.xml index cf87e4e8e..f02269ef6 100644 --- a/app/src/main/res/layout/settings_chat.xml +++ b/app/src/main/res/layout/settings_chat.xml @@ -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" diff --git a/app/src/main/res/layout/settings_codec_list_cell.xml b/app/src/main/res/layout/settings_codec_list_cell.xml index 2b5942991..64423db45 100644 --- a/app/src/main/res/layout/settings_codec_list_cell.xml +++ b/app/src/main/res/layout/settings_codec_list_cell.xml @@ -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" diff --git a/app/src/main/res/layout/settings_contacts.xml b/app/src/main/res/layout/settings_contacts.xml index 01dd3e590..2230b8f32 100644 --- a/app/src/main/res/layout/settings_contacts.xml +++ b/app/src/main/res/layout/settings_contacts.xml @@ -16,7 +16,7 @@ android:background="@drawable/shape_squircle_white_background"> @@ -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" diff --git a/app/src/main/res/layout/settings_contacts_carddav.xml b/app/src/main/res/layout/settings_contacts_carddav.xml index 30fee5bb0..79e770974 100644 --- a/app/src/main/res/layout/settings_contacts_carddav.xml +++ b/app/src/main/res/layout/settings_contacts_carddav.xml @@ -75,7 +75,7 @@ android:layout_height="wrap_content"> @@ -107,7 +108,7 @@ app:layout_constraintTop_toBottomOf="@id/name_title"/> @@ -139,7 +141,7 @@ app:layout_constraintTop_toBottomOf="@id/server_url_title"/> @@ -171,7 +174,7 @@ app:layout_constraintTop_toBottomOf="@id/username_title"/> @@ -217,7 +221,7 @@ app:layout_constraintBottom_toBottomOf="@id/password" /> @@ -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" diff --git a/app/src/main/res/layout/settings_contacts_ldap.xml b/app/src/main/res/layout/settings_contacts_ldap.xml index 459b0ad1f..139a45524 100644 --- a/app/src/main/res/layout/settings_contacts_ldap.xml +++ b/app/src/main/res/layout/settings_contacts_ldap.xml @@ -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" /> @@ -134,7 +136,7 @@ app:layout_constraintTop_toBottomOf="@id/server_url_title"/> @@ -166,7 +169,7 @@ app:layout_constraintTop_toBottomOf="@id/bind_dn_title"/> @@ -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" /> @@ -272,7 +278,7 @@ app:layout_constraintTop_toBottomOf="@id/search_base_title"/> @@ -304,7 +311,7 @@ app:layout_constraintTop_toBottomOf="@id/search_filter_title"/> @@ -336,7 +344,7 @@ app:layout_constraintTop_toBottomOf="@id/max_results_title"/> @@ -368,7 +377,7 @@ app:layout_constraintTop_toBottomOf="@id/request_timeout_title"/> @@ -400,7 +410,7 @@ app:layout_constraintTop_toBottomOf="@id/request_delay_title"/> @@ -432,7 +443,7 @@ app:layout_constraintTop_toBottomOf="@id/min_chars_title"/> @@ -464,7 +476,7 @@ app:layout_constraintTop_toBottomOf="@id/name_attributes_title"/> @@ -496,7 +509,7 @@ app:layout_constraintTop_toBottomOf="@id/sip_attributes_title"/> diff --git a/app/src/main/res/layout/settings_developer_fragment.xml b/app/src/main/res/layout/settings_developer_fragment.xml index e37fea975..b5b148522 100644 --- a/app/src/main/res/layout/settings_developer_fragment.xml +++ b/app/src/main/res/layout/settings_developer_fragment.xml @@ -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" /> @@ -146,14 +147,13 @@ app:layout_constraintEnd_toEndOf="parent"/> @@ -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" /> diff --git a/app/src/main/res/layout/settings_meetings.xml b/app/src/main/res/layout/settings_meetings.xml index 50882d1de..302661e2b 100644 --- a/app/src/main/res/layout/settings_meetings.xml +++ b/app/src/main/res/layout/settings_meetings.xml @@ -17,7 +17,7 @@ android:background="@drawable/shape_squircle_white_background"> @@ -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" diff --git a/app/src/main/res/layout/settings_network.xml b/app/src/main/res/layout/settings_network.xml index a526101fc..c09bd39cf 100644 --- a/app/src/main/res/layout/settings_network.xml +++ b/app/src/main/res/layout/settings_network.xml @@ -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" diff --git a/app/src/main/res/layout/settings_security.xml b/app/src/main/res/layout/settings_security.xml index 359cbf960..8e6e4e327 100644 --- a/app/src/main/res/layout/settings_security.xml +++ b/app/src/main/res/layout/settings_security.xml @@ -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" /> @@ -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"/> @@ -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" /> @@ -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"/> @@ -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"/> @@ -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" diff --git a/app/src/main/res/layout/settings_user_interface.xml b/app/src/main/res/layout/settings_user_interface.xml index f392d2593..5f1d3c000 100644 --- a/app/src/main/res/layout/settings_user_interface.xml +++ b/app/src/main/res/layout/settings_user_interface.xml @@ -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" /> @@ -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"/> @@ -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" diff --git a/app/src/main/res/layout/start_call_fragment.xml b/app/src/main/res/layout/start_call_fragment.xml index 1651ed7a9..3c321a7b1 100644 --- a/app/src/main/res/layout/start_call_fragment.xml +++ b/app/src/main/res/layout/start_call_fragment.xml @@ -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" diff --git a/app/src/main/res/layout/start_chat_fragment.xml b/app/src/main/res/layout/start_chat_fragment.xml index 784b237ae..1f04687b3 100644 --- a/app/src/main/res/layout/start_chat_fragment.xml +++ b/app/src/main/res/layout/start_chat_fragment.xml @@ -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" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 76de999f5..a161245be 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -67,6 +67,12 @@ ?attr/color_main2_500 13sp +