mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Created styles to avoid code duplication

Browse source
This commit is contained in:
Sylvain Berfini 2023-09-15 10:42:15 +02:00
parent 14dca2f984
commit c3101e92b4
42 changed files with 200 additions and 490 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/res/layout-land/calls_list_fragment.xml
View file

@ -92,12 +92,11 @@
app:layout_constraintTop_toBottomOf="@id/background" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/no_calls_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/calls_list_empty_history"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@id/background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"

9
app/src/main/res/layout-land/contacts_list_fragment.xml
View file

@ -96,19 +96,18 @@
app:layout_constraintTop_toBottomOf="@id/background" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/no_contacts_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/contacts_list_empty"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@id/background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintTop_toBottomOf="@id/no_contacts_image" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/favourites_label"
android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
@ -120,7 +119,6 @@
android:text="@string/contacts_list_favourites_title"
android:drawableEnd="@drawable/caret_up"
android:drawableTint="@color/gray_9"
android:textSize="16sp"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/background"/>
@ -138,7 +136,7 @@
app:layout_constraintTop_toBottomOf="@id/favourites_label" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/all_contacts_label"
android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
android:layout_width="0dp"
@ -147,7 +145,6 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:text="@string/contacts_list_all_contacts_title"
android:textSize="16sp"
app:layout_constraintStart_toEndOf="@id/bottom_nav_bar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/favourites_contacts_list"/>

12
app/src/main/res/layout/account_profile_device_list_cell.xml
View file

@ -18,20 +18,18 @@
android:background="@drawable/shape_squircle_gray_2_background">
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="23dp"
android:layout_marginTop="34dp"
android:text="@{model.name, default=`Pixel 6 Pro`}"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_600"
style="@style/tertiary_button_label_style"
android:id="@+id/remove"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -43,8 +41,6 @@
android:paddingBottom="6dp"
android:gravity="center"
android:text="Remove"
android:textColor="@color/tertiary_button_label_color"
android:textSize="13sp"
android:maxLines="1"
android:ellipsize="end"
android:drawableStart="@drawable/trash_simple"
@ -55,15 +51,13 @@
app:layout_constraintBottom_toBottomOf="@id/name"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/last_connection"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="23dp"
android:layout_marginTop="30dp"
android:text="Last connection:"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintTop_toBottomOf="@id/name"

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

@ -42,7 +42,7 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="@dimen/top_bar_height"
@ -131,7 +131,7 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:onClick="@{() -> viewModel.toggleDetailsExpand()}"
android:id="@+id/details"
android:layout_width="0dp"
@ -143,7 +143,6 @@
android:text="@string/manage_account_details_title"
android:drawableEnd="@{viewModel.expandDetails ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
android:drawableTint="@color/gray_9"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/add_picture_label"/>
@ -162,7 +161,7 @@
app:layout_constraintBottom_toBottomOf="@id/details_bottom_anchor"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/sip_address_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -170,7 +169,6 @@
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/sip_address"
android:textSize="13sp"
app:layout_constraintStart_toStartOf="@id/details_background"
app:layout_constraintTop_toTopOf="@id/details_background"/>
@ -192,7 +190,7 @@
app:layout_constraintBottom_toBottomOf="@id/sip_address_label"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/display_name_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -200,7 +198,6 @@
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/sip_address_display_name"
android:textSize="13sp"
app:layout_constraintStart_toStartOf="@id/details_background"
app:layout_constraintTop_toBottomOf="@id/sip_address"/>
@ -258,13 +255,12 @@
app:layout_constraintTop_toTopOf="@id/connection_background" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/connected_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="@{viewModel.accountModel.registrationState, default=@string/drawer_menu_account_connection_status_connected}"
android:textSize="13sp"
app:layout_constraintStart_toEndOf="@id/connected_switch"
app:layout_constraintTop_toTopOf="@id/connected_switch"
app:layout_constraintBottom_toBottomOf="@id/connected_switch" />
@ -305,22 +301,20 @@
app:layout_constraintBottom_toBottomOf="@id/change_mode"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/current_mode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@{viewModel.currentMode, default=@string/manage_account_secure_mode_default_title}"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toTopOf="@id/mode_background"
app:layout_constraintStart_toStartOf="@id/mode_background"
app:layout_constraintBottom_toBottomOf="@id/mode_background"/>
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{changeModeClickListener}"
style="@style/default_text_style_600"
style="@style/tertiary_button_label_style"
android:id="@+id/change_mode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -332,8 +326,6 @@
android:paddingBottom="6dp"
android:gravity="center"
android:text="@string/manage_account_change_mode"
android:textColor="@color/tertiary_button_label_color"
android:textSize="13sp"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintEnd_toEndOf="@id/mode_background"
@ -341,7 +333,7 @@
app:layout_constraintBottom_toBottomOf="@id/mode_background"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:onClick="@{() -> viewModel.toggleDevicesExpand()}"
android:id="@+id/devices"
android:layout_width="0dp"
@ -353,7 +345,6 @@
android:text="@string/manage_account_devices_title"
android:drawableEnd="@{viewModel.expandDevices ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
android:drawableTint="@color/gray_9"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/mode_background"/>
@ -380,7 +371,7 @@
app:layout_constraintTop_toBottomOf="@id/devices" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/actions"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -389,7 +380,6 @@
android:layout_marginEnd="26dp"
android:layout_marginTop="16dp"
android:text="@string/contact_details_actions_title"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/devices_list"/>

15
app/src/main/res/layout/account_profile_secure_mode_fragment.xml
View file

@ -39,16 +39,13 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/main_page_title_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="@dimen/top_bar_height"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:gravity="center_vertical"
android:text="@string/manage_account_choose_mode_title"
android:textColor="@color/primary_color"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toTopOf="parent"/>
@ -85,7 +82,6 @@
<ImageView
android:id="@+id/default_mode_tooltip"
style="@style/default_text_style_800"
android:onClick="@{defaultModeTooltipClickListener}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -218,7 +214,6 @@
<ImageView
android:id="@+id/interop_mode_tooltip"
style="@style/default_text_style_800"
android:onClick="@{interopModeTooltipClickListener}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -250,7 +245,7 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_600"
style="@style/primary_button_label_style"
android:onClick="@{continueClickListener}"
android:id="@+id/login"
android:layout_width="0dp"
@ -259,15 +254,9 @@
android:layout_marginBottom="32dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/manage_account_choose_mode_save_changes"
android:textSize="18sp"
android:textColor="@color/primary_button_label_color"
android:gravity="center"
android:background="@drawable/primary_button_background"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintVertical_bias="1"
app:layout_constraintTop_toBottomOf="@id/interop_mode_summary"

44
app/src/main/res/layout/assistant_login_fragment.xml
View file

@ -61,29 +61,25 @@
app:layout_constraintBottom_toBottomOf="@id/title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/assistant_page_title_style"
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:paddingBottom="27dp"
android:text="@string/assistant_account_login"
android:textSize="20sp"
android:textColor="@color/white"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/header_style"
android:id="@+id/username_label"
style="@style/default_text_style_700"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginEnd="16dp"
android:text="@{@string/username + `*`}"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintStart_toStartOf="@id/username"/>
@ -108,15 +104,13 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/header_style"
android:id="@+id/password_label"
style="@style/default_text_style_700"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:text="@{@string/password + `*`}"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintWidth_max="@dimen/text_input_max_width"
app:layout_constraintTop_toBottomOf="@id/username"
app:layout_constraintStart_toStartOf="@id/password"/>
@ -157,22 +151,16 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.login()}"
android:enabled="@{viewModel.loginEnabled &amp;&amp; !viewModel.registrationInProgress, default=false}"
style="@style/default_text_style_600"
style="@style/primary_button_label_style"
android:id="@+id/login"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/assistant_account_login"
android:textSize="18sp"
android:textColor="@color/primary_button_label_color"
android:gravity="center"
android:background="@drawable/primary_button_background"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintTop_toBottomOf="@id/password"
app:layout_constraintStart_toStartOf="parent"
@ -233,22 +221,16 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{qrCodeClickListener}"
style="@style/default_text_style_600"
style="@style/secondary_button_label_style"
android:id="@+id/scan_qr_code"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="22dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/assistant_scan_qr_code"
android:textSize="18sp"
android:textColor="@color/secondary_button_label_color"
android:gravity="center"
android:background="@drawable/secondary_button_background"
android:drawableStart="@drawable/qr_code"
android:drawablePadding="8dp"
app:drawableTint="@color/secondary_button_label_color"
@ -259,22 +241,16 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{thirdPartySipAccountLoginClickListener}"
style="@style/default_text_style_600"
style="@style/secondary_button_label_style"
android:id="@+id/third_party_sip_account"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/assistant_login_third_party_sip_account"
android:textSize="18sp"
android:textColor="@color/secondary_button_label_color"
android:gravity="center"
android:background="@drawable/secondary_button_background"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -298,22 +274,16 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{registerClickListener}"
style="@style/default_text_style_600"
style="@style/secondary_button_label_style"
android:id="@+id/register"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:layout_marginStart="20dp"
android:layout_marginBottom="32dp"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/assistant_account_register"
android:textSize="18sp"
android:textColor="@color/secondary_button_label_color"
android:gravity="center"
android:background="@drawable/secondary_button_background"
app:layout_constraintVertical_bias="1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/no_account_yet"

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

@ -42,14 +42,12 @@
app:layout_constraintStart_toStartOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/assistant_page_title_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:text="@string/assistant_scan_qr_code_title"
android:textSize="20sp"
android:textColor="@color/white"
android:gravity="center"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"

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

@ -47,15 +47,13 @@
app:layout_constraintBottom_toBottomOf="@id/title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/assistant_page_title_style"
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:paddingBottom="30dp"
android:text="@string/assistant_account_register"
android:textSize="20sp"
android:textColor="@color/white"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>

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

@ -66,29 +66,25 @@
app:layout_constraintBottom_toBottomOf="@id/title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/assistant_page_title_style"
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:paddingBottom="27dp"
android:text="@string/assistant_account_register"
android:textSize="20sp"
android:textColor="@color/white"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/header_style"
android:id="@+id/username_label"
style="@style/default_text_style_700"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="48dp"
android:layout_marginEnd="16dp"
android:text="@{@string/username + `*`}"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintStart_toStartOf="@id/username"/>
@ -126,15 +122,13 @@
app:layout_constraintEnd_toEndOf="@id/username"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/header_style"
android:id="@+id/phone_number_label"
style="@style/default_text_style_700"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:text="@{@string/phone_number + `*`}"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/username_error"
app:layout_constraintStart_toStartOf="@id/prefix"/>
@ -191,14 +185,11 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/password_label"
style="@style/default_text_style_700"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:text="@{@string/password + `*`}"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/phone_number_error"
app:layout_constraintStart_toStartOf="@id/password"/>
@ -238,20 +229,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.confirmPhoneNumber()}"
android:enabled="@{viewModel.createEnabled &amp;&amp; !viewModel.operationInProgress, default=false}"
style="@style/default_text_style_600"
style="@style/primary_button_label_style"
android:id="@+id/create"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/assistant_account_create"
android:textSize="18sp"
android:textColor="@color/primary_button_label_color"
android:gravity="center"
android:background="@drawable/primary_button_background"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintTop_toBottomOf="@id/password"
app:layout_constraintStart_toStartOf="parent"
@ -309,22 +294,16 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{loginClickListener}"
style="@style/default_text_style_600"
style="@style/secondary_button_label_style"
android:id="@+id/login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="34dp"
android:layout_marginStart="20dp"
android:layout_marginBottom="32dp"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/assistant_account_login"
android:textSize="18sp"
android:textColor="@color/secondary_button_label_color"
android:gravity="center"
android:background="@drawable/secondary_button_background"
app:layout_constraintVertical_bias="1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/already_an_account"

14
app/src/main/res/layout/assistant_secure_mode_fragment.xml
View file

@ -56,14 +56,12 @@
app:layout_constraintBottom_toBottomOf="@id/sub_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/assistant_page_title_style"
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:text="@string/assistant_account_secure_mode_title"
android:textSize="20sp"
android:textColor="@color/white"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"/>
@ -99,7 +97,6 @@
<ImageView
android:id="@+id/default_mode_tooltip"
style="@style/default_text_style_800"
android:onClick="@{defaultModeTooltipClickListener}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -232,7 +229,6 @@
<ImageView
android:id="@+id/interop_mode_tooltip"
style="@style/default_text_style_800"
android:onClick="@{interopModeTooltipClickListener}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -264,7 +260,7 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_600"
style="@style/primary_button_label_style"
android:onClick="@{continueClickListener}"
android:id="@+id/login"
android:layout_width="0dp"
@ -273,15 +269,9 @@
android:layout_marginBottom="32dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/assistant_secure_mode_finish_account_login"
android:textSize="18sp"
android:textColor="@color/primary_button_label_color"
android:gravity="center"
android:background="@drawable/primary_button_background"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintVertical_bias="1"
app:layout_constraintTop_toBottomOf="@id/interop_mode_summary"

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

@ -36,13 +36,12 @@
app:layout_constraintStart_toStartOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/assistant_page_title_style"
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:text="@string/assistant_login_third_party_sip_account"
android:textSize="20sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -50,15 +49,13 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/username_label"
style="@style/default_text_style_700"
style="@style/header_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="38dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@{@string/username + `*`}"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintStart_toStartOf="@id/username"/>
@ -84,15 +81,13 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/password_label"
style="@style/default_text_style_700"
style="@style/header_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:text="@{@string/password + `*`}"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/username"
app:layout_constraintStart_toStartOf="@id/password"/>
@ -131,15 +126,13 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/domain_label"
style="@style/default_text_style_700"
style="@style/header_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@{@string/sip_address_domain + `*`}"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/password"
app:layout_constraintStart_toStartOf="@id/domain"/>
@ -165,15 +158,13 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/display_name_label"
style="@style/default_text_style_700"
style="@style/header_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/sip_address_display_name"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/domain"
app:layout_constraintStart_toStartOf="@id/display_name"/>
@ -199,15 +190,13 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/transport_label"
style="@style/default_text_style_700"
style="@style/header_style"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@{@string/assistant_sip_account_transport_protocol + `*`}"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/display_name"
app:layout_constraintStart_toStartOf="@id/transport"/>
@ -238,7 +227,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.login()}"
android:enabled="@{viewModel.loginEnabled &amp;&amp; !viewModel.registrationInProgress, default=false}"
style="@style/default_text_style_600"
style="@style/primary_button_label_style"
android:id="@+id/login"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -246,15 +235,9 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="32dp"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/assistant_account_login"
android:textSize="18sp"
android:textColor="@color/primary_button_label_color"
android:gravity="center"
android:background="@drawable/primary_button_background"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintVertical_bias="1"
app:layout_constraintTop_toBottomOf="@id/transport"

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

@ -43,13 +43,12 @@
app:layout_constraintStart_toStartOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/assistant_page_title_style"
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="100dp"
android:text="@string/assistant_login_third_party_sip_account"
android:textSize="20sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -121,7 +120,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{createAccountClickListener}"
style="@style/default_text_style_600"
style="@style/secondary_button_label_style"
android:id="@+id/create_linphone_account"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -129,15 +128,9 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="20dp"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/assistant_third_party_sip_account_create_linphone_account"
android:textSize="18sp"
android:textColor="@color/secondary_button_label_color"
android:gravity="center"
android:background="@drawable/secondary_button_background"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintVertical_bias="1"
app:layout_constraintStart_toStartOf="parent"
@ -147,7 +140,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{loginClickListener}"
style="@style/default_text_style_600"
style="@style/primary_button_label_style"
android:id="@+id/continue_third_party_account_login"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -155,15 +148,9 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="32dp"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/assistant_third_party_sip_account_warning_ok"
android:textSize="18sp"
android:textColor="@color/primary_button_label_color"
android:gravity="center"
android:background="@drawable/primary_button_background"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"

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

@ -37,16 +37,13 @@
app:layout_constraintTop_toTopOf="@id/title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/main_page_title_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="@dimen/top_bar_height"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:gravity="center_vertical"
android:text="@string/call_history_title"
android:textColor="@color/primary_color"
android:textSize="16sp"
app:layout_constraintEnd_toStartOf="@id/menu"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toTopOf="parent"/>

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

@ -40,16 +40,13 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/main_page_title_style"
android:id="@+id/title"
style="@style/default_text_style_800"
android:layout_width="0dp"
android:layout_height="@dimen/top_bar_height"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:gravity="center_vertical"
android:text="@string/call_start_title"
android:textColor="@color/primary_color"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toTopOf="parent" />
@ -65,8 +62,8 @@
app:layout_constraintTop_toBottomOf="@id/title" />
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/search_bar"
style="@style/default_text_style"
android:id="@+id/search_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
@ -142,8 +139,8 @@
app:tint="@color/white" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/group_call_label"
style="@style/default_text_style_800"
android:id="@+id/group_call_label"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -175,12 +172,11 @@
app:layout_constraintVertical_chainStyle="packed" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/section_header_style"
android:id="@+id/no_contacts_nor_suggestion_label"
style="@style/default_text_style_800"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/call_start_no_suggestion_nor_contact"
android:textSize="16sp"
android:gravity="center"
android:visibility="@{viewModel.emptyContactsList &amp;&amp; viewModel.suggestionsList.size() == 0 ? View.VISIBLE : View.GONE}"
app:layout_constraintEnd_toEndOf="parent"
@ -188,8 +184,8 @@
app:layout_constraintTop_toBottomOf="@id/no_contacts_nor_suggestion_image" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/section_header_style"
android:id="@+id/all_contacts_label"
style="@style/default_text_style_800"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -197,7 +193,6 @@
android:layout_marginEnd="16dp"
android:padding="5dp"
android:text="@string/contacts_list_title"
android:textSize="16sp"
android:visibility="@{viewModel.emptyContactsList ? View.GONE : View.VISIBLE}"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintVertical_bias="0"
@ -226,8 +221,8 @@
app:constraint_referenced_ids="contacts_list, all_contacts_label, group_call_icon" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/section_header_style"
android:id="@+id/suggestions_label"
style="@style/default_text_style_800"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -235,7 +230,6 @@
android:layout_marginEnd="16dp"
android:padding="5dp"
android:text="@string/call_start_suggestions_list_title"
android:textSize="16sp"
android:visibility="@{viewModel.suggestionsList.size() == 0 ? View.GONE : View.VISIBLE}"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"

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

@ -92,12 +92,11 @@
app:layout_constraintTop_toBottomOf="@id/background" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/no_calls_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/calls_list_empty_history"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@id/background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

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

@ -53,7 +53,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> model.startCallToDevice()}"
style="@style/default_text_style_600"
style="@style/tertiary_button_label_style"
android:id="@+id/verify_device"
android:visibility="@{model.trusted ? View.GONE : View.VISIBLE}"
android:layout_width="wrap_content"
@ -68,8 +68,6 @@
android:drawableStart="@drawable/warning_circle"
android:drawablePadding="8dp"
android:text="@string/friend_make_call_check_device_trust"
android:textColor="@color/tertiary_button_label_color"
android:textSize="13sp"
android:maxLines="1"
android:ellipsize="end"
app:drawableTint="@color/tertiary_button_label_color"

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

@ -41,16 +41,13 @@
app:layout_constraintTop_toTopOf="@id/invisible_title"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/main_page_title_style"
android:id="@+id/invisible_title"
android:visibility="invisible"
android:layout_width="0dp"
android:layout_height="@dimen/top_bar_height"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:gravity="center_vertical"
android:textColor="@color/primary_color"
android:textSize="16sp"
app:layout_constraintEnd_toStartOf="@id/edit"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toTopOf="parent"/>
@ -237,7 +234,7 @@
app:layout_constraintEnd_toEndOf="@id/video_call"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:onClick="@{() -> viewModel.toggleNumbersAndAddressesExpand()}"
android:id="@+id/numbers_and_addresses_label"
android:layout_width="0dp"
@ -249,7 +246,6 @@
android:text="@string/contact_details_numbers_and_addresses_title"
android:drawableEnd="@{viewModel.expandNumbersAndAddresses ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
android:drawableTint="@color/gray_9"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/call_label"/>
@ -286,7 +282,7 @@
app:layout_constraintBottom_toBottomOf="@id/title_label"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/company_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -294,7 +290,6 @@
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/contact_details_company_name"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@id/info_background"
app:layout_constraintTop_toTopOf="@id/info_background"/>
@ -315,7 +310,7 @@
app:layout_constraintTop_toTopOf="@id/info_background"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/title_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -323,7 +318,6 @@
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:text="@string/contact_details_job_title"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="@id/info_background"
app:layout_constraintTop_toBottomOf="@id/company"/>
@ -344,7 +338,7 @@
app:layout_constraintTop_toBottomOf="@id/company"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:onClick="@{() -> viewModel.displayTrustDialog()}"
android:id="@+id/trust_label"
android:layout_width="wrap_content"
@ -353,7 +347,6 @@
android:layout_marginTop="16dp"
android:padding="5dp"
android:text="@string/contact_details_trust_title"
android:textSize="16sp"
android:drawableEnd="@drawable/question"
android:drawableTint="@color/gray_9"
android:drawablePadding="8dp"
@ -361,7 +354,7 @@
app:layout_constraintTop_toBottomOf="@id/info_background"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:onClick="@{() -> viewModel.toggleDevicesTrustExpand()}"
android:id="@+id/trust_toggle"
android:layout_width="0dp"
@ -371,7 +364,6 @@
android:padding="5dp"
android:drawableEnd="@{viewModel.expandDevicesTrust ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
android:drawableTint="@color/gray_9"
android:textSize="16sp"
app:layout_constraintStart_toEndOf="@id/trust_label"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/info_background"/>
@ -390,14 +382,13 @@
app:layout_constraintBottom_toBottomOf="@id/devices"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/trusted_devices_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:layout_marginTop="20dp"
android:textSize="14sp"
android:text="@string/contact_details_trusted_devices_count"
app:layout_constraintStart_toStartOf="@id/trust_background"
app:layout_constraintEnd_toEndOf="@id/trust_background"
@ -449,7 +440,7 @@
app:layout_constraintTop_toBottomOf="@id/trusted_devices_progress" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/actions"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -458,7 +449,6 @@
android:layout_marginEnd="26dp"
android:layout_marginTop="16dp"
android:text="@string/contact_details_actions_title"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/trust_background"/>

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

@ -17,13 +17,12 @@
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@{model.isSip ? @string/sip_address : @string/phone_number, default=@string/sip_address}"
android:textSize="13sp"
app:layout_constraintStart_toStartOf="@id/field"
app:layout_constraintTop_toTopOf="parent"/>

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

@ -36,16 +36,13 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/main_page_title_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="@dimen/top_bar_height"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:gravity="center_vertical"
android:text="@{viewModel.isEdit ? @string/contact_edit_title : @string/contact_new_title, default=@string/contact_new_title}"
android:textColor="@color/primary_color"
android:textSize="16sp"
app:layout_constraintEnd_toStartOf="@id/save"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toTopOf="parent"/>
@ -115,14 +112,13 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/first_name_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:layout_marginEnd="16dp"
android:text="@string/contact_editor_first_name"
android:textSize="13sp"
app:layout_constraintStart_toStartOf="@id/first_name"
app:layout_constraintTop_toBottomOf="@id/add_picture_label"/>
@ -149,14 +145,13 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/last_name_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="@string/contact_editor_last_name"
android:textSize="13sp"
app:layout_constraintStart_toStartOf="@id/last_name"
app:layout_constraintTop_toBottomOf="@id/first_name"/>
@ -209,14 +204,13 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/company_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:layout_marginEnd="16dp"
android:text="@string/contact_editor_company"
android:textSize="13sp"
app:layout_constraintStart_toStartOf="@id/company"
app:layout_constraintTop_toBottomOf="@id/phone_numbers"/>
@ -243,14 +237,13 @@
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/job_title_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:text="@string/contact_editor_job_title"
android:textSize="13sp"
app:layout_constraintStart_toStartOf="@id/job_title"
app:layout_constraintTop_toBottomOf="@id/company"/>

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

@ -20,14 +20,13 @@
android:background="@drawable/secondary_cell_background">
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginStart="10dp"
android:text="@{model.sip ? @string/sip_address : model.label.length() > 0 ? @string/phone_number + ` (` + model.label + `)` : @string/phone_number, default=`Phone number (Home)`}"
android:textSize="14sp"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintStart_toStartOf="parent"

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

@ -86,19 +86,18 @@
app:layout_constraintTop_toBottomOf="@id/background" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/no_contacts_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@id/background"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/no_contacts_image" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/favourites_label"
android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
onClickListener="@{() -> viewModel.toggleFavouritesVisibility()}"
@ -111,7 +110,6 @@
android:text="@string/contacts_list_favourites_title"
android:drawableEnd="@{viewModel.showFavourites ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
android:drawableTint="@color/gray_9"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/background"/>
@ -129,7 +127,7 @@
app:layout_constraintTop_toBottomOf="@id/favourites_label" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/all_contacts_label"
android:visibility="@{!viewModel.isListFiltered &amp;&amp; viewModel.favourites.size() > 0 ? View.VISIBLE : View.GONE}"
android:layout_width="0dp"
@ -139,7 +137,6 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="20dp"
android:text="@string/contacts_list_all_contacts_title"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/favourites_contacts_list"/>

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

@ -43,14 +43,13 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:paddingTop="@dimen/dialog_top_bottom_margin"
android:text="@{defaultMode ? @string/manage_account_secure_mode_default_title : @string/manage_account_secure_mode_interoperable_title, default=@string/manage_account_secure_mode_default_title}"
android:textSize="16sp"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -74,20 +73,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{dismissClickListener}"
style="@style/default_text_style_600"
style="@style/primary_button_label_style"
android:id="@+id/confirm"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/primary_button_background"
android:text="@string/dialog_close"
android:textSize="18sp"
android:textColor="@color/primary_button_label_color"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/message"

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

@ -42,14 +42,13 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:paddingTop="@dimen/dialog_top_bottom_margin"
android:text="@string/dialog_general_terms_and_privacy_policy_title"
android:textSize="16sp"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -74,20 +73,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.dismiss()}"
style="@style/default_text_style_600"
style="@style/secondary_button_label_style"
android:id="@+id/cancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/secondary_button_background"
android:text="@string/dialog_deny"
android:textSize="18sp"
android:textColor="@color/secondary_button_label_color"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/message"
@ -95,20 +88,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.acceptConditions()}"
style="@style/default_text_style_600"
style="@style/primary_button_label_style"
android:id="@+id/confirm"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/primary_button_background"
android:text="@string/dialog_accept"
android:textSize="18sp"
android:textColor="@color/primary_button_label_color"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/cancel"

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

@ -40,14 +40,13 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:paddingTop="@dimen/dialog_top_bottom_margin"
android:text="@string/dialog_confirm_phone_number_title"
android:textSize="16sp"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -71,20 +70,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.dismiss()}"
style="@style/default_text_style_600"
style="@style/secondary_button_label_style"
android:id="@+id/cancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/secondary_button_background"
android:text="@string/dialog_cancel"
android:textSize="18sp"
android:textColor="@color/secondary_button_label_color"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/message"
@ -92,20 +85,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.confirmPhoneNumber()}"
style="@style/default_text_style_600"
style="@style/primary_button_label_style"
android:id="@+id/confirm"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/primary_button_background"
android:text="@string/dialog_continue"
android:textSize="18sp"
android:textColor="@color/primary_button_label_color"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/cancel"

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

@ -41,14 +41,13 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:paddingTop="@dimen/dialog_top_bottom_margin"
android:text="@string/dialog_contact_new_or_edit_abort_confirmation_title"
android:textSize="16sp"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -72,20 +71,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.dismiss()}"
style="@style/default_text_style_600"
style="@style/secondary_button_label_style"
android:id="@+id/cancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="13dp"
android:paddingTop="13dp"
android:gravity="center"
android:background="@drawable/secondary_button_background"
android:text="@string/dialog_cancel"
android:textSize="18sp"
android:textColor="@color/secondary_button_label_color"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/message"
@ -93,20 +86,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.confirmRemoval()}"
style="@style/default_text_style_600"
style="@style/primary_button_label_style"
android:id="@+id/confirm"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/primary_button_background"
android:text="@string/dialog_ok"
android:textSize="18sp"
android:textColor="@color/primary_button_label_color"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/cancel"

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

@ -41,7 +41,7 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -49,7 +49,6 @@
android:layout_marginEnd="15dp"
android:paddingTop="@dimen/dialog_top_bottom_margin"
android:text="@string/dialog_zrtp_validate_trust_title"
android:textSize="16sp"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintStart_toStartOf="@id/dialog_background"

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

@ -40,14 +40,13 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:paddingTop="@dimen/dialog_top_bottom_margin"
android:text="@string/dialog_contact_increase_trust_level_title"
android:textSize="16sp"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -71,20 +70,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.dismiss()}"
style="@style/default_text_style_600"
style="@style/secondary_button_label_style"
android:id="@+id/cancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/secondary_button_background"
android:text="@string/dialog_cancel"
android:textSize="18sp"
android:textColor="@color/secondary_button_label_color"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/message"
@ -92,20 +85,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.confirmCall()}"
style="@style/default_text_style_600"
style="@style/primary_button_label_style"
android:id="@+id/confirm"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/primary_button_background"
android:text="@string/dialog_call"
android:textSize="18sp"
android:textColor="@color/primary_button_label_color"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/cancel"

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

@ -40,14 +40,13 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:paddingTop="@dimen/dialog_top_bottom_margin"
android:text="@string/dialog_contact_devices_trust_help_title"
android:textSize="16sp"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -71,20 +70,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{dismissClickListener}"
style="@style/default_text_style_600"
style="@style/primary_button_label_style"
android:id="@+id/confirm"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/primary_button_background"
android:text="@string/dialog_ok"
android:textSize="18sp"
android:textColor="@color/primary_button_label_color"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/message"

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

@ -19,14 +19,13 @@
android:background="@drawable/primary_cell_background">
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginStart="10dp"
android:text="@{model.sip ? @string/sip_address : model.label.length() > 0 ? @string/phone_number + ` (` + model.label + `)` : @string/phone_number, default=`Phone number (Home)`}"
android:textSize="14sp"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintStart_toStartOf="parent"

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

@ -41,14 +41,13 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:paddingTop="@dimen/dialog_top_bottom_margin"
android:text="@string/dialog_pick_phone_number_or_sip_address_title"
android:textSize="16sp"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@id/numbers_and_addresses"
app:layout_constraintStart_toStartOf="@id/dialog_background"

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

@ -41,14 +41,13 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:paddingTop="@dimen/dialog_top_bottom_margin"
android:text="@string/dialog_remove_account_title"
android:textSize="16sp"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -72,20 +71,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.dismiss()}"
style="@style/default_text_style_600"
style="@style/secondary_button_label_style"
android:id="@+id/cancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/secondary_button_background"
android:text="@string/dialog_cancel"
android:textSize="18sp"
android:textColor="@color/secondary_button_label_color"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/message"
@ -93,20 +86,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.confirmRemoval()}"
style="@style/default_text_style_600"
style="@style/primary_button_label_style"
android:id="@+id/confirm"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/primary_button_background"
android:text="@string/dialog_delete"
android:textSize="18sp"
android:textColor="@color/primary_button_label_color"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/cancel"

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

@ -41,14 +41,13 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:paddingTop="@dimen/dialog_top_bottom_margin"
android:text="@string/dialog_delete_all_call_logs_title"
android:textSize="16sp"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintBottom_toTopOf="@id/message"
app:layout_constraintStart_toStartOf="@id/dialog_background"
@ -72,20 +71,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.dismiss()}"
style="@style/default_text_style_600"
style="@style/secondary_button_label_style"
android:id="@+id/cancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/secondary_button_background"
android:text="@string/dialog_cancel"
android:textSize="18sp"
android:textColor="@color/secondary_button_label_color"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/message"
@ -93,20 +86,14 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.confirmRemoval()}"
style="@style/default_text_style_600"
style="@style/primary_button_label_style"
android:id="@+id/confirm"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:gravity="center"
android:background="@drawable/primary_button_background"
android:text="@string/dialog_delete"
android:textSize="18sp"
android:textColor="@color/primary_button_label_color"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/cancel"

24
app/src/main/res/layout/drawer_menu.xml
View file

@ -37,7 +37,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.closeDrawerMenu()}"
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/brand_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -46,8 +46,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/app_name"
android:textSize="16sp"
android:textColor="@color/gray_9"
android:gravity="center_vertical"
android:drawableEnd="@drawable/x"
android:drawablePadding="15dp"
@ -88,12 +86,11 @@
app:layout_constraintTop_toBottomOf="@id/background" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/no_account_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/drawer_menu_no_account_configured_yet"
android:textSize="16sp"
android:gravity="center"
app:layout_constraintBottom_toTopOf="@id/background"
app:layout_constraintEnd_toEndOf="parent"
@ -106,25 +103,19 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{() -> viewModel.addAccount()}"
style="@style/default_text_style_600"
style="@style/secondary_button_label_style"
android:id="@+id/add_account"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="30dp"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/drawer_menu_add_account"
android:textSize="18sp"
android:textColor="@color/secondary_button_label_color"
android:gravity="center"
android:drawableStart="@drawable/plus_circle"
android:drawablePadding="8dp"
app:drawableTint="@color/secondary_button_label_color"
android:background="@drawable/secondary_button_background"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -144,7 +135,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{settingsClickedListener}"
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/settings"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -152,7 +143,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/settings_title"
android:textSize="13sp"
android:drawableStart="@drawable/gear"
android:drawableEnd="@drawable/caret_right"
android:drawablePadding="8dp"
@ -163,7 +153,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{recordingsClickListener}"
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/recordings"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -171,7 +161,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/recordings_title"
android:textSize="13sp"
android:drawableStart="@drawable/recordings"
android:drawableEnd="@drawable/caret_right"
android:drawablePadding="8dp"
@ -182,7 +171,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{helpClickedListener}"
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/help"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -190,7 +179,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="@string/help_title"
android:textSize="13sp"
android:drawableStart="@drawable/question"
android:drawableEnd="@drawable/caret_right"
android:drawablePadding="8dp"

17
app/src/main/res/layout/help_debug_fragment.xml
View file

@ -33,22 +33,19 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/main_page_title_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="@dimen/top_bar_height"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:gravity="center_vertical"
android:text="@string/help_debug_title"
android:textColor="@color/primary_color"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toTopOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/debug_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -56,8 +53,6 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="24dp"
android:text="@string/help_advanced_debug_title"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/debug_mode_switch"/>
@ -90,7 +85,7 @@
app:layout_constraintBottom_toBottomOf="@id/debug_subtitle" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_600"
style="@style/tertiary_button_label_style"
android:onClick="@{() -> viewModel.cleanLogs()}"
android:id="@+id/clean_logs"
android:enabled="@{viewModel.debugModeEnabled}"
@ -106,15 +101,13 @@
android:paddingBottom="6dp"
android:gravity="center"
android:text="@string/help_advanced_clean_logs"
android:textColor="@color/tertiary_button_label_color"
android:textSize="13sp"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/debug_subtitle"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_600"
style="@style/tertiary_button_label_style"
android:onClick="@{() -> viewModel.shareLogs()}"
android:id="@+id/send_logs"
android:enabled="@{viewModel.debugModeEnabled}"
@ -130,8 +123,6 @@
android:paddingBottom="6dp"
android:gravity="center"
android:text="@string/help_advanced_share_logs"
android:textColor="@color/tertiary_button_label_color"
android:textSize="13sp"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintStart_toEndOf="@id/clean_logs"

37
app/src/main/res/layout/help_fragment.xml
View file

@ -50,22 +50,19 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/main_page_title_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="@dimen/top_bar_height"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:gravity="center_vertical"
android:text="@string/help_title"
android:textColor="@color/primary_color"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toTopOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/about_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -73,8 +70,6 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="32dp"
android:text="@string/help_about_title"
android:textSize="16sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
@ -93,7 +88,7 @@
app:layout_constraintBottom_toBottomOf="@id/privacy_policy_subtitle" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:onClick="@{privacyPolicyClickListener}"
android:id="@+id/privacy_policy_title"
android:layout_width="0dp"
@ -102,8 +97,6 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="24dp"
android:text="@string/help_about_privacy_policy_title"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/about_title"
app:layout_constraintStart_toEndOf="@id/privacy_policy_icon"
app:layout_constraintEnd_toEndOf="parent"/>
@ -136,7 +129,7 @@
app:layout_constraintBottom_toBottomOf="@id/version_subtitle" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:id="@+id/version_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -144,8 +137,6 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="24dp"
android:text="@string/help_about_version_title"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/privacy_policy_subtitle"
app:layout_constraintStart_toEndOf="@id/version_icon"
app:layout_constraintEnd_toStartOf="@id/check_for_update"/>
@ -165,7 +156,7 @@
app:layout_constraintEnd_toStartOf="@id/check_for_update" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_600"
style="@style/tertiary_button_label_style"
android:onClick="@{() -> viewModel.checkForUpdate()}"
android:id="@+id/check_for_update"
android:layout_width="wrap_content"
@ -178,8 +169,6 @@
android:paddingBottom="6dp"
android:gravity="center"
android:text="@string/help_about_check_for_update"
android:textColor="@color/tertiary_button_label_color"
android:textSize="13sp"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintStart_toEndOf="@id/version_title"
@ -201,7 +190,7 @@
app:layout_constraintBottom_toBottomOf="@id/open_source_licenses_subtitle" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:onClick="@{licensesClickListener}"
android:id="@+id/open_source_licenses_title"
android:layout_width="0dp"
@ -210,8 +199,6 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="24dp"
android:text="@string/help_about_open_source_licenses_title"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/version_subtitle"
app:layout_constraintStart_toEndOf="@id/open_source_licenses_icon"
app:layout_constraintEnd_toEndOf="parent"/>
@ -245,7 +232,7 @@
app:layout_constraintBottom_toBottomOf="@id/translate_title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:onClick="@{translateClickListener}"
android:id="@+id/translate_title"
android:layout_width="0dp"
@ -254,14 +241,12 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="24dp"
android:text="@string/help_about_contribute_translations_title"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/open_source_licenses_subtitle"
app:layout_constraintStart_toEndOf="@id/translate_icon"
app:layout_constraintEnd_toEndOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/advanced_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -269,8 +254,6 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="32dp"
android:text="@string/help_about_advanced_title"
android:textSize="16sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/translate_icon"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
@ -288,7 +271,7 @@
app:layout_constraintBottom_toBottomOf="@id/debug_title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/header_style"
android:onClick="@{debugClickListener}"
android:id="@+id/debug_title"
android:layout_width="0dp"
@ -297,8 +280,6 @@
android:layout_marginEnd="16dp"
android:layout_marginTop="24dp"
android:text="@string/help_debug_title"
android:textSize="13sp"
android:textColor="@color/gray_9"
app:layout_constraintTop_toBottomOf="@id/advanced_title"
app:layout_constraintStart_toEndOf="@id/debug_icon"
app:layout_constraintEnd_toEndOf="parent"/>

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

@ -30,16 +30,13 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/main_page_title_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="@dimen/top_bar_height"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:gravity="center_vertical"
android:text="@string/recordings_title"
android:textColor="@color/primary_color"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toTopOf="parent"/>

71
app/src/main/res/layout/settings_fragment.xml
View file

@ -32,16 +32,13 @@
app:layout_constraintTop_toTopOf="@id/title" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/main_page_title_style"
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="@dimen/top_bar_height"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:gravity="center_vertical"
android:text="@string/settings_title"
android:textColor="@color/primary_color"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/back"
app:layout_constraintTop_toTopOf="parent"/>
@ -61,7 +58,7 @@
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:onClick="@{() -> viewModel.toggleCallsExpand()}"
android:id="@+id/calls"
android:layout_width="0dp"
@ -73,7 +70,6 @@
android:text="@string/settings_calls_title"
android:drawableEnd="@{viewModel.expandCalls ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
android:drawableTint="@color/gray_9"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
@ -93,7 +89,7 @@
app:layout_constraintBottom_toBottomOf="@id/calls_bottom_anchor"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/settings_title_style"
android:onClick="@{() -> viewModel.toggleEchoCanceller()}"
android:id="@+id/echo_canceller_title"
android:visibility="@{viewModel.expandCalls ? View.VISIBLE : View.GONE}"
@ -102,8 +98,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_calls_echo_canceller_title"
android:textSize="13sp"
android:textColor="@color/gray_1"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintTop_toTopOf="@id/echo_canceller_switch"
@ -112,7 +106,7 @@
app:layout_constraintEnd_toStartOf="@id/echo_canceller_switch"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
style="@style/settings_subtitle_style"
android:onClick="@{() -> viewModel.toggleEchoCanceller()}"
android:id="@+id/echo_canceller_subtitle"
android:visibility="@{viewModel.expandCalls ? View.VISIBLE : View.GONE}"
@ -121,10 +115,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_calls_echo_canceller_subtitle"
android:textSize="14sp"
android:textColor="@color/gray_1"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toBottomOf="@id/echo_canceller_title"
app:layout_constraintBottom_toBottomOf="@id/echo_canceller_switch"
app:layout_constraintStart_toStartOf="@id/calls_background"
@ -143,7 +133,7 @@
app:layout_constraintTop_toTopOf="@id/calls_background" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/settings_title_style"
android:onClick="@{() -> viewModel.toggleRouteAudioToBluetooth()}"
android:id="@+id/route_audio_to_bluetooth_title"
android:visibility="@{viewModel.expandCalls ? View.VISIBLE : View.GONE}"
@ -152,8 +142,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_calls_route_audio_to_bluetooth_title"
android:textSize="13sp"
android:textColor="@color/gray_1"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toTopOf="@id/route_audio_to_bluetooth_switch"
@ -174,7 +162,7 @@
app:layout_constraintTop_toBottomOf="@id/echo_canceller_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/settings_title_style"
android:onClick="@{() -> viewModel.toggleEnableVideo()}"
android:id="@+id/enable_video_title"
android:visibility="@{viewModel.expandCalls ? View.VISIBLE : View.GONE}"
@ -183,8 +171,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_calls_enable_video_title"
android:textSize="13sp"
android:textColor="@color/gray_1"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toTopOf="@id/enable_video_switch"
@ -205,7 +191,7 @@
app:layout_constraintTop_toBottomOf="@id/route_audio_to_bluetooth_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/settings_title_style"
android:onClick="@{() -> viewModel.toggleAutoInitiateVideoCalls()}"
android:id="@+id/auto_initiate_video_title"
android:visibility="@{viewModel.expandCalls ? View.VISIBLE : View.GONE}"
@ -214,8 +200,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_calls_auto_initiate_video_title"
android:textSize="13sp"
android:textColor="@color/gray_1"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintTop_toTopOf="@id/auto_initiate_video_switch"
@ -224,7 +208,7 @@
app:layout_constraintEnd_toStartOf="@id/auto_initiate_video_switch"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
style="@style/settings_subtitle_style"
android:onClick="@{() -> viewModel.toggleAutoInitiateVideoCalls()}"
android:id="@+id/auto_initiate_video_subtitle"
android:visibility="@{viewModel.expandCalls ? View.VISIBLE : View.GONE}"
@ -233,10 +217,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_calls_auto_initiate_video_subtitle"
android:textSize="14sp"
android:textColor="@color/gray_1"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toBottomOf="@id/auto_initiate_video_title"
app:layout_constraintBottom_toBottomOf="@id/auto_initiate_video_switch"
app:layout_constraintStart_toStartOf="@id/calls_background"
@ -255,7 +235,7 @@
app:layout_constraintTop_toBottomOf="@id/enable_video_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/settings_title_style"
android:id="@+id/auto_accept_video_title"
android:onClick="@{() -> viewModel.toggleAutoAcceptVideoRequests()}"
android:visibility="@{viewModel.expandCalls ? View.VISIBLE : View.GONE}"
@ -264,8 +244,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_calls_auto_accept_video_title"
android:textSize="13sp"
android:textColor="@color/gray_1"
android:maxLines="1"
android:ellipsize="end"
app:layout_constraintTop_toTopOf="@id/auto_accept_video_switch"
@ -274,7 +252,7 @@
app:layout_constraintEnd_toStartOf="@id/auto_accept_video_switch"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style"
style="@style/settings_subtitle_style"
android:id="@+id/auto_accept_video_subtitle"
android:onClick="@{() -> viewModel.toggleAutoAcceptVideoRequests()}"
android:visibility="@{viewModel.expandCalls ? View.VISIBLE : View.GONE}"
@ -283,10 +261,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_calls_auto_accept_video_subtitle"
android:textSize="14sp"
android:textColor="@color/gray_1"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toBottomOf="@id/auto_accept_video_title"
app:layout_constraintBottom_toBottomOf="@id/auto_accept_video_switch"
app:layout_constraintStart_toStartOf="@id/calls_background"
@ -305,7 +279,7 @@
app:layout_constraintTop_toBottomOf="@id/auto_initiate_video_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/settings_title_style"
android:id="@+id/device_ringtone_title"
android:onClick="@{() -> viewModel.toggleDeviceRingtone()}"
android:visibility="@{viewModel.expandCalls ? View.VISIBLE : View.GONE}"
@ -314,8 +288,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_calls_use_device_ringtone_title"
android:textSize="13sp"
android:textColor="@color/gray_1"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toTopOf="@id/device_ringtone_switch"
@ -336,7 +308,7 @@
app:layout_constraintTop_toBottomOf="@id/auto_accept_video_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/settings_title_style"
android:onClick="@{() -> viewModel.toggleVibrateOnIncomingCalls()}"
android:id="@+id/vibrate_title"
android:visibility="@{viewModel.expandCalls &amp;&amp; viewModel.isVibrationAvailable ? View.VISIBLE : View.GONE}"
@ -345,8 +317,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_calls_vibrate_while_ringing_title"
android:textSize="13sp"
android:textColor="@color/gray_1"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toTopOf="@id/vibrate_switch"
@ -367,7 +337,7 @@
app:layout_constraintTop_toBottomOf="@id/device_ringtone_switch" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/settings_title_style"
android:onClick="@{() -> viewModel.toggleAutoRecordCall()}"
android:id="@+id/auto_record_title"
android:visibility="@{viewModel.expandCalls ? View.VISIBLE : View.GONE}"
@ -376,8 +346,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_calls_auto_record_title"
android:textSize="13sp"
android:textColor="@color/gray_1"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toTopOf="@id/auto_record_switch"
@ -407,7 +375,7 @@
app:layout_constraintTop_toBottomOf="@id/auto_record_switch"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:onClick="@{() -> viewModel.toggleNetworkExpand()}"
android:id="@+id/network"
android:layout_width="0dp"
@ -419,7 +387,6 @@
android:text="@string/settings_network_title"
android:drawableEnd="@{viewModel.expandNetwork ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
android:drawableTint="@color/gray_9"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/calls_background"/>
@ -439,7 +406,7 @@
app:layout_constraintBottom_toBottomOf="@id/network_bottom_anchor"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_700"
style="@style/settings_title_style"
android:onClick="@{() -> viewModel.toggleEnableVideo()}"
android:id="@+id/wifi_only_title"
android:visibility="@{viewModel.expandNetwork ? View.VISIBLE : View.GONE}"
@ -448,8 +415,6 @@
android:layout_marginStart="16dp"
android:layout_marginEnd="10dp"
android:text="@string/settings_network_use_wifi_only"
android:textSize="13sp"
android:textColor="@color/gray_1"
android:maxLines="2"
android:ellipsize="end"
app:layout_constraintTop_toTopOf="@id/wifi_only_switch"
@ -479,7 +444,7 @@
app:layout_constraintTop_toBottomOf="@id/wifi_only_switch"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:onClick="@{() -> viewModel.toggleUserInterfaceExpand()}"
android:id="@+id/user_interface"
android:layout_width="0dp"
@ -491,7 +456,6 @@
android:text="@string/settings_user_interface_title"
android:drawableEnd="@{viewModel.expandUserInterface ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
android:drawableTint="@color/gray_9"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/network_background"/>
@ -520,7 +484,7 @@
app:layout_constraintTop_toBottomOf="@id/network_bottom_anchor"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/section_header_style"
android:id="@+id/advanced_settings"
android:layout_width="0dp"
android:layout_height="wrap_content"
@ -532,7 +496,6 @@
android:text="@string/settings_advanced_title"
android:drawableEnd="@drawable/caret_right"
android:drawableTint="@color/gray_9"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/user_interface"

12
app/src/main/res/layout/voip_active_call_fragment.xml
View file

@ -135,7 +135,7 @@
app:layout_constraintBottom_toBottomOf="@id/call_direction_label"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/in_call_header_style"
android:id="@+id/call_direction_label"
android:layout_width="wrap_content"
android:layout_height="@dimen/in_call_top_bar_text_height"
@ -143,32 +143,26 @@
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:text="@{viewModel.isOutgoing ? @string/call_outgoing : @string/call_incoming, default=@string/call_outgoing}"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintStart_toEndOf="@id/call_direction_icon"
app:layout_constraintTop_toTopOf="@id/hinge_top"
app:layout_constraintBottom_toTopOf="@id/background"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/in_call_header_style"
android:id="@+id/separator"
android:layout_width="wrap_content"
android:layout_height="@dimen/in_call_top_bar_text_height"
android:layout_marginStart="5dp"
android:textColor="@color/white"
android:textSize="16sp"
android:text="@string/vertical_separator"
app:layout_constraintStart_toEndOf="@id/call_direction_label"
app:layout_constraintTop_toTopOf="@id/call_direction_label"/>
<Chronometer
style="@style/default_text_style_800"
style="@style/in_call_header_style"
android:id="@+id/chronometer"
android:layout_width="wrap_content"
android:layout_height="@dimen/in_call_top_bar_text_height"
android:layout_marginStart="5dp"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintStart_toEndOf="@id/separator"
app:layout_constraintTop_toTopOf="@id/call_direction_label"/>

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

@ -27,7 +27,7 @@
app:layout_constraintBottom_toBottomOf="@id/call_direction_label"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/in_call_header_style"
android:id="@+id/call_direction_label"
android:layout_width="wrap_content"
android:layout_height="@dimen/in_call_top_bar_text_height"
@ -35,8 +35,6 @@
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:text="@string/call_incoming"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintStart_toEndOf="@id/call_direction_icon"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/background"/>

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

@ -27,7 +27,7 @@
app:layout_constraintBottom_toBottomOf="@id/call_direction_label"/>
<androidx.appcompat.widget.AppCompatTextView
style="@style/default_text_style_800"
style="@style/in_call_header_style"
android:id="@+id/call_direction_label"
android:layout_width="wrap_content"
android:layout_height="@dimen/in_call_top_bar_text_height"
@ -35,8 +35,6 @@
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:text="@string/call_outgoing"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintStart_toEndOf="@id/call_direction_icon"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/background"/>

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

@ -68,22 +68,16 @@
<androidx.appcompat.widget.AppCompatTextView
android:onClick="@{nextClickListener}"
style="@style/default_text_style_600"
style="@style/primary_button_label_style"
android:id="@+id/next"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:paddingTop="@dimen/primary_secondary_buttons_label_padding"
android:paddingBottom="@dimen/primary_secondary_buttons_label_padding"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:text="@string/next"
android:textSize="18sp"
android:textColor="@color/primary_button_label_color"
android:gravity="center"
android:background="@drawable/primary_button_background"
app:layout_constraintWidth_max="@dimen/button_max_width"
app:layout_constraintTop_toBottomOf="@id/dots_indicator"
app:layout_constraintBottom_toBottomOf="parent"

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

@ -24,6 +24,67 @@
<item name="android:fontFamily">@font/noto_sans_800</item>
<item name="android:textColor">@color/gray_9</item>
</style>
<style name="main_page_title_style">
<item name="android:fontFamily">@font/noto_sans_800</item>
<item name="android:textColor">@color/primary_color</item>
<item name="android:textSize">16sp</item>
<item name="android:gravity">center_vertical</item>
</style>
<style name="assistant_page_title_style">
<item name="android:fontFamily">@font/noto_sans_800</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">20sp</item>
</style>
<style name="in_call_header_style">
<item name="android:fontFamily">@font/noto_sans_800</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">16sp</item>
</style>
<style name="section_header_style">
<item name="android:fontFamily">@font/noto_sans_800</item>
<item name="android:textColor">@color/gray_9</item>
<item name="android:textSize">16sp</item>
</style>
<style name="header_style">
<item name="android:fontFamily">@font/noto_sans_700</item>
<item name="android:textColor">@color/gray_9</item>
<item name="android:textSize">13sp</item>
</style>
<style name="settings_title_style">
<item name="android:fontFamily">@font/noto_sans_700</item>
<item name="android:textColor">@color/gray_1</item>
<item name="android:textSize">13sp</item>
</style>
<style name="settings_subtitle_style">
<item name="android:fontFamily">@font/noto_sans</item>
<item name="android:textColor">@color/gray_1</item>
<item name="android:textSize">14sp</item>
<item name="android:maxLines">2</item>
<item name="android:ellipsize">end</item>
</style>
<style name="primary_button_label_style">
<item name="android:fontFamily">@font/noto_sans_600</item>
<item name="android:textColor">@color/primary_button_label_color</item>
<item name="android:textSize">18sp</item>
<item name="android:gravity">center</item>
<item name="android:background">@drawable/primary_button_background</item>
<item name="android:paddingTop">@dimen/primary_secondary_buttons_label_padding</item>
<item name="android:paddingBottom">@dimen/primary_secondary_buttons_label_padding</item>
</style>
<style name="secondary_button_label_style">
<item name="android:fontFamily">@font/noto_sans_600</item>
<item name="android:textColor">@color/secondary_button_label_color</item>
<item name="android:textSize">18sp</item>
<item name="android:gravity">center</item>
<item name="android:background">@drawable/secondary_button_background</item>
<item name="android:paddingTop">@dimen/primary_secondary_buttons_label_padding</item>
<item name="android:paddingBottom">@dimen/primary_secondary_buttons_label_padding</item>
</style>
<style name="tertiary_button_label_style">
<item name="android:fontFamily">@font/noto_sans_600</item>
<item name="android:textColor">@color/tertiary_button_label_color</item>
<item name="android:textSize">13sp</item>
</style>
<style name="bottom_nav_bar_label_style">
<item name="android:fontFamily">@font/noto_sans</item>
<item name="android:textSize">11sp</item>