mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-22 17:35:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use style to take into account lineHeight

Browse source
This commit is contained in:
Benoit Marty 2021-06-14 23:03:37 +02:00
parent b5bdd134cb
commit f90ee45d8c
202 changed files with 542 additions and 503 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vector/src/debug/res/layout/activity_test_material_theme.xml
View file

@ -444,10 +444,10 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Text appearance" />
android:text="Text views" />
<include
layout="@layout/debug_text_appearance"
layout="@layout/debug_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

74
vector/src/debug/res/layout/debug_text_appearance.xml
View file

@ -1,74 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:ignore="HardcodedText">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceTitle"
android:textAppearance="@style/VectorTextAppearanceTitle" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceTitle.M"
android:textAppearance="@style/VectorTextAppearanceTitle.M" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceHeadlineM"
android:textAppearance="@style/VectorTextAppearanceHeadlineM" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceSubtitle"
android:textAppearance="@style/VectorTextAppearanceSubtitle" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceSubtitle.M"
android:textAppearance="@style/VectorTextAppearanceSubtitle" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceBody\nVectorTextAppearanceBody"
android:textAppearance="@style/VectorTextAppearanceBody" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceBody.M"
android:textAppearance="@style/VectorTextAppearanceBody.M" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceButton"
android:textAppearance="@style/VectorTextAppearanceButton" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceCaption"
android:textAppearance="@style/VectorTextAppearanceCaption" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceMicro"
android:textAppearance="@style/VectorTextAppearanceMicro" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Default (VectorTextAppearanceBody)" />
</LinearLayout>

68
vector/src/debug/res/layout/debug_text_view.xml Normal file
View file

@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:ignore="HardcodedText">
<TextView
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceTitle\nline 2" />
<TextView
style="@style/VectorTextView.Title.M"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceTitle.M\nline 2" />
<TextView
style="@style/VectorTextView.HeadlineM"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceHeadlineM\nline 2" />
<TextView
style="@style/VectorTextView.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceSubtitle\nline 2" />
<TextView
style="@style/VectorTextView.Subtitle.M"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceSubtitle.M\nline 2" />
<TextView
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceBody\nline 2" />
<TextView
style="@style/VectorTextView.Body.M"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceBody.M\nline 2" />
<TextView
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceCaption\nline 2" />
<TextView
style="@style/VectorTextView.Micro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="VectorTextAppearanceMicro\nline 2" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Default (VectorTextAppearanceBody)\nline 2" />
</LinearLayout>

6
vector/src/debug/res/layout/item_sas_emoji.xml
View file

@ -12,11 +12,11 @@
<TextView
android:id="@+id/sas_emoji_index"
style="@style/VectorTextView.Subtitle"
android:layout_width="32dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:gravity="center"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
tools:text="63:" />
@ -36,19 +36,19 @@
<TextView
android:id="@+id/sas_emoji_text"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
tools:text="@string/verification_emoji_spanner" />
<TextView
android:id="@+id/sas_emoji_text_id"
style="@style/VectorTextView.Caption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:textAppearance="@style/VectorTextAppearanceCaption"
tools:text="verification_emoji_spanner" />
</LinearLayout>

2
vector/src/main/res/layout/activity_bug_report.xml
View file

@ -91,12 +91,12 @@
</com.google.android.material.textfield.TextInputLayout>
<TextView
style="@style/VectorTextView.Caption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:text="@string/send_bug_report_description_in_english"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />
<TextView

2
vector/src/main/res/layout/activity_call.xml
View file

@ -114,6 +114,7 @@
<TextView
android:id="@+id/callStatusText"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -121,7 +122,6 @@
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:layout_marginBottom="8dp"
android:gravity="center"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="@android:color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

4
vector/src/main/res/layout/activity_signed_out.xml
View file

@ -17,19 +17,19 @@
tools:ignore="ContentDescription" />
<TextView
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/signed_out_title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:text="@string/signed_out_notice"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<Button

1
vector/src/main/res/layout/activity_simple_loading.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinatorLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">

4
vector/src/main/res/layout/alerter_incoming_call_layout.xml
View file

@ -22,13 +22,13 @@
<TextView
android:id="@+id/incomingCallNameView"
style="@style/VectorTextView.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/incomingCallRejectView"
@ -38,6 +38,7 @@
<TextView
android:id="@+id/incomingCallKindView"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
@ -45,7 +46,6 @@
android:drawablePadding="4dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:drawableTint="?vctr_content_secondary"
app:layout_constraintEnd_toStartOf="@+id/incomingCallRejectView"

6
vector/src/main/res/layout/alerter_verification_layout.xml
View file

@ -44,19 +44,21 @@
<TextView
android:id="@+id/tvTitle"
style="@style/VectorTextView.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/alerter_padding_half"
android:layout_marginEnd="@dimen/alerter_padding_half"
android:paddingStart="@dimen/alerter_padding_small"
android:paddingEnd="@dimen/alerter_padding_small"
android:textAppearance="@style/AlertTextAppearance.Title"
android:textColor="@android:color/white"
android:visibility="gone"
tools:text="Title"
tools:visibility="visible" />
<TextView
android:id="@+id/tvText"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/alerter_padding_half"
@ -66,7 +68,7 @@
android:paddingTop="@dimen/alerter_padding_small"
android:paddingEnd="@dimen/alerter_padding_small"
android:paddingBottom="@dimen/alerter_padding_small"
android:textAppearance="@style/AlertTextAppearance.Text"
android:textColor="@android:color/white"
android:visibility="gone"
tools:text="Text"
tools:visibility="visible" />

2
vector/src/main/res/layout/bottom_sheet_generic_list_with_title.xml
View file

@ -9,11 +9,11 @@
<TextView
android:id="@+id/bottomSheetTitle"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:padding="8dp"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
tools:text="@string/reactions" />

4
vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
View file

@ -17,9 +17,9 @@
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:padding="16dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:padding="16dp">
<ImageView
android:id="@+id/inviterAvatarImage"

2
vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml
View file

@ -11,13 +11,13 @@
android:paddingBottom="8dp">
<TextView
style="@style/VectorTextView.HeadlineM"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:layout_marginBottom="8dp"
android:text="@string/action_sign_out"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
android:textStyle="bold" />

8
vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
View file

@ -23,13 +23,13 @@
<TextView
android:id="@+id/widgetPermissionHeader2"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:layout_marginBottom="8dp"
android:text="@string/room_widget_permission_added_by"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary" />
<LinearLayout
@ -57,20 +57,20 @@
<TextView
android:id="@+id/widgetPermissionOwnerDisplayName"
style="@style/VectorTextView.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAlignment="center"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
tools:text="@sample/users.json/data/displayName" />
<TextView
android:id="@+id/widgetPermissionOwnerId"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAlignment="center"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@sample/users.json/data/id" />
@ -80,13 +80,13 @@
<TextView
android:id="@+id/widgetPermissionSharedInfo"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginTop="@dimen/layout_vertical_margin_big"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:layout_marginBottom="8dp"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
tools:text="@string/room_widget_permission_shared_info_title" />

4
vector/src/main/res/layout/bottom_sheet_space_invite.xml
View file

@ -10,24 +10,24 @@
<TextView
android:id="@+id/headerText"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="12dp"
android:gravity="center"
android:text="@string/invite_people_to_your_space"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/descriptionText"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:gravity="center"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@id/joinInfoHelpText"
app:layout_constraintTop_toBottomOf="@id/headerText"

2
vector/src/main/res/layout/bottom_sheet_space_invite_chooser.xml
View file

@ -9,13 +9,13 @@
<TextView
android:id="@+id/headerText"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:gravity="center"
android:text="@string/invite_people_menu"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent" />

4
vector/src/main/res/layout/bottom_sheet_space_settings.xml
View file

@ -27,13 +27,13 @@
<TextView
android:id="@+id/spaceNameView"
style="@style/VectorTextView.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:duplicateParentState="true"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constrainedWidth="true"
@ -56,6 +56,7 @@
<TextView
android:id="@+id/spaceDescription"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -63,7 +64,6 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"

2
vector/src/main/res/layout/dialog_disclaimer_content.xml
View file

@ -52,6 +52,7 @@
app:layout_constraintTop_toBottomOf="@id/disclaimerIconsLayout" />
<TextView
style="@style/VectorTextView.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
@ -60,7 +61,6 @@
android:gravity="center"
android:paddingBottom="32dp"
android:text="@string/disclaimer_content"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

4
vector/src/main/res/layout/dialog_event_content.xml
View file

@ -8,7 +8,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:textSize="12sp"
android:fontFamily="monospace"
android:textIsSelectable="true" />
android:textIsSelectable="true"
android:textSize="12sp" />
</ScrollView>

2
vector/src/main/res/layout/dialog_export_e2e_keys.xml
View file

@ -12,10 +12,10 @@
<TextView
android:id="@+id/exportDialogText"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/encryption_export_notice"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
app:layout_constraintTop_toTopOf="parent" />

2
vector/src/main/res/layout/dialog_import_e2e_keys.xml
View file

@ -12,11 +12,11 @@
<TextView
android:id="@+id/dialog_e2e_keys_passphrase_filename"
style="@style/VectorTextView.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent"

2
vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
View file

@ -48,9 +48,9 @@
<TextView
android:id="@+id/keepItSafeText"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
tools:text="@string/bootstrap_crosssigning_save_usb" />

2
vector/src/main/res/layout/fragment_bootstrap_conclusion.xml
View file

@ -11,13 +11,13 @@
<TextView
android:id="@+id/bootstrapConclusionText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="@string/bootstrap_cross_signing_success"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
app:layout_constraintTop_toTopOf="parent" />

2
vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
View file

@ -9,10 +9,10 @@
<TextView
android:id="@+id/bootstrapDescriptionText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@id/bootstrapAccountPasswordTil"
app:layout_constraintTop_toTopOf="parent"

4
vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
View file

@ -8,11 +8,11 @@
<TextView
android:id="@+id/bootstrapDescriptionText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/bootstrap_info_text_2"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@id/ssss_passphrase_enter_til"
app:layout_constraintTop_toTopOf="parent" />
@ -48,6 +48,7 @@
<TextView
android:id="@+id/bootstrapWarningInfo"
style="@style/VectorTextView.Caption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
@ -55,7 +56,6 @@
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:text="@string/bootstrap_dont_reuse_pwd"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
app:drawableStartCompat="@drawable/ic_alert_triangle"
app:drawableTint="?colorError" />

2
vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
View file

@ -9,10 +9,10 @@
<TextView
android:id="@+id/bootstrapDescriptionText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@id/bootstrapRecoveryKeyEnterTil"
app:layout_constraintTop_toTopOf="parent"

4
vector/src/main/res/layout/fragment_bootstrap_reauth.xml
View file

@ -9,10 +9,10 @@
<TextView
android:id="@+id/bootstrapDescriptionText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@id/waitingProgress"
app:layout_constraintTop_toTopOf="parent"
@ -28,10 +28,10 @@
<TextView
android:id="@+id/reAuthFailureText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?colorError"
app:layout_constraintBottom_toTopOf="@id/buttonFlow"
app:layout_constraintTop_toBottomOf="@id/waitingProgress"

4
vector/src/main/res/layout/fragment_bootstrap_save_key.xml
View file

@ -10,17 +10,18 @@
<TextView
android:id="@+id/bootstrapSaveText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="@string/bottom_sheet_save_your_recovery_key_content"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/bootstrapRecoveryKeyText"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
@ -28,7 +29,6 @@
android:fontFamily="monospace"
android:gravity="center_horizontal"
android:padding="4dp"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_notice_secondary"
tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8" />

4
vector/src/main/res/layout/fragment_bootstrap_setup_recovery.xml
View file

@ -10,13 +10,13 @@
<TextView
android:id="@+id/bootstrapSetupSecureText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="@string/bottom_sheet_setup_secure_backup_subtitle"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary" />
<View
@ -75,6 +75,7 @@
<TextView
android:id="@+id/bootstrapSetupWarningTextView"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -83,7 +84,6 @@
android:layout_marginBottom="16dp"
android:drawablePadding="4dp"
android:text="@string/reset_secure_backup_warning"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?colorError"
app:drawableStartCompat="@drawable/ic_warning_badge" />

4
vector/src/main/res/layout/fragment_bootstrap_waiting.xml
View file

@ -10,11 +10,11 @@
<TextView
android:id="@+id/bootstrapDescriptionText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/bootstrap_loading_text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
app:layout_constraintTop_toTopOf="parent" />
@ -28,11 +28,11 @@
<TextView
android:id="@+id/bootstrapLoadingStatusText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
app:layout_constraintTop_toBottomOf="@id/bootstrapWaitingProgress"
tools:text="Bending the spoon..." />

2
vector/src/main/res/layout/fragment_contacts_book.xml
View file

@ -41,6 +41,7 @@
<TextView
android:id="@+id/phoneBookTitle"
style="@style/VectorTextView.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -48,7 +49,6 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/contacts_book_title"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"

2
vector/src/main/res/layout/fragment_create_direct_room_directory_users.xml
View file

@ -41,6 +41,7 @@
<TextView
android:id="@+id/createDirectRoomTitle"
style="@style/VectorTextView.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -48,7 +49,6 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/direct_chats_header"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"

2
vector/src/main/res/layout/fragment_create_room.xml
View file

@ -38,6 +38,7 @@
<TextView
android:id="@+id/createRoomTitle"
style="@style/VectorTextView.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -45,7 +46,6 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/create_room_title"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"

18
vector/src/main/res/layout/fragment_devtool_keyrequests.xml
View file

@ -15,20 +15,20 @@
app:tabMode="scrollable" />
<androidx.viewpager2.widget.ViewPager2
app:layout_constraintTop_toBottomOf="@id/devToolKeyRequestTabs"
app:layout_constraintBottom_toBottomOf="parent"
android:id="@+id/devToolKeyRequestPager"
android:layout_width="match_parent"
android:layout_height="0dp" />
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/devToolKeyRequestTabs" />
<ProgressBar
android:id="@+id/exportWaitingView"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_width="40dp"
android:layout_height="40dp"/>
android:layout_height="40dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
vector/src/main/res/layout/fragment_home_detail.xml
View file

@ -46,6 +46,7 @@
<im.vector.app.features.home.room.list.UnreadCounterBadgeView
android:id="@+id/drawerUnreadCounterBadgeView"
style="@style/VectorTextView.Micro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
@ -56,7 +57,6 @@
android:minHeight="16dp"
android:paddingStart="4dp"
android:paddingEnd="4dp"
android:textAppearance="@style/VectorTextAppearanceMicro"
android:textColor="?colorOnError"
android:visibility="gone"
tools:background="@drawable/bg_unread_highlight"
@ -89,12 +89,12 @@
<TextView
android:id="@+id/groupToolbarSpaceTitleView"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="start"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
android:visibility="gone"
tools:text="@tools:sample/lorem/random"

8
vector/src/main/res/layout/fragment_home_drawer.xml
View file

@ -44,13 +44,13 @@
<TextView
android:id="@+id/homeDrawerUsernameView"
style="@style/VectorTextView.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:maxLines="1"
android:singleLine="true"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
@ -59,12 +59,12 @@
<TextView
android:id="@+id/homeDrawerUserIdView"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:maxLines="1"
android:singleLine="true"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@+id/homeDrawerInviteFriendButton"
app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
@ -140,6 +140,7 @@
<TextView
android:id="@+id/homeDrawerHeaderSettingsView"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
@ -149,7 +150,6 @@
android:minHeight="52dp"
android:padding="16dp"
android:text="@string/settings"
android:textAppearance="@style/VectorTextAppearanceBody"
android:tint="?vctr_content_secondary"
app:drawableStartCompat="@drawable/ic_settings_18dp"
app:drawableTint="?vctr_content_secondary"
@ -158,6 +158,7 @@
<TextView
android:id="@+id/homeDrawerHeaderSignoutView"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
@ -167,7 +168,6 @@
android:minHeight="52dp"
android:padding="16dp"
android:text="@string/logout"
android:textAppearance="@style/VectorTextAppearanceBody"
android:tint="?vctr_content_secondary"
app:drawableStartCompat="@drawable/ic_signout_18dp"
app:drawableTint="?vctr_content_secondary"

2
vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
View file

@ -26,12 +26,12 @@
<TextView
android:id="@+id/keys_restore_with_key"
style="@style/VectorTextView.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:text="@string/keys_backup_restore_with_recovery_key"
android:textAlignment="center"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"

2
vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
View file

@ -26,12 +26,12 @@
<TextView
android:id="@+id/keys_backup_restore_with_passphrase"
style="@style/VectorTextView.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:text="@string/keys_backup_restore_with_passphrase"
android:textAlignment="center"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"

2
vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
View file

@ -35,11 +35,11 @@
<TextView
android:id="@+id/success_details_text"
style="@style/VectorTextView.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:textAlignment="center"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

2
vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
View file

@ -25,12 +25,12 @@
<TextView
android:id="@+id/keys_backup_setup_step1_title"
style="@style/VectorTextView.HeadlineM"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:text="@string/keys_backup_setup_step1_title"
android:textAlignment="center"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/keys_backup_setup_step1_description"

2
vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
View file

@ -32,6 +32,7 @@
<TextView
android:id="@+id/keys_backup_setup_step2_text_description"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
@ -40,7 +41,6 @@
android:layout_marginBottom="16dp"
android:text="@string/keys_backup_setup_step2_text_description"
android:textAlignment="center"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

4
vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
View file

@ -43,6 +43,7 @@
<TextView
android:id="@+id/keys_backup_setup_step3_line1_text"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
@ -50,18 +51,17 @@
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:text="@string/keys_backup_setup_step3_text_line1"
android:textAlignment="center"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/keys_backup_setup_step3_label2"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginTop="20dp"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:textAlignment="center"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/keys_backup_setup_step3_text_line2" />

8
vector/src/main/res/layout/fragment_login.xml
View file

@ -26,20 +26,20 @@
<TextView
android:id="@+id/loginTitle"
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_signin_to" />
<TextView
android:id="@+id/loginNotice"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_server_matrix_org_text" />
@ -101,11 +101,11 @@
<TextView
android:id="@+id/loginPasswordNotice"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:text="@string/login_signin_matrix_id_password_notice"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:visibility="gone"
tools:visibility="visible" />
@ -147,12 +147,12 @@
<TextView
android:id="@+id/loginSocialLoginHeader"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:text="@string/login_social_continue"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<im.vector.app.features.login.SocialLoginButtonsView

16
vector/src/main/res/layout/fragment_login_account_created.xml
View file

@ -16,36 +16,36 @@
tools:ignore="ContentDescription" />
<TextView
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_account_created_title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/loginAccountCreatedSubtitle"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
tools:text="@string/login_account_created_subtitle" />
<TextView
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/login_account_created_notice"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<TextView
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_account_created_notice_2"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<androidx.constraintlayout.widget.ConstraintLayout
@ -67,6 +67,7 @@
<TextView
android:id="@+id/loginAccountCreatedMemberName"
style="@style/VectorTextView.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -74,7 +75,6 @@
android:layout_marginEnd="4dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/loginAccountCreatedTime"
@ -84,22 +84,22 @@
<TextView
android:id="@+id/loginAccountCreatedTime"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
app:layout_constraintBaseline_toBaselineOf="@+id/loginAccountCreatedMemberName"
app:layout_constraintEnd_toEndOf="parent"
tools:text="@tools:sample/date/hhmm" />
<TextView
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/login_account_created_message"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/loginAccountCreatedMemberName"
@ -108,11 +108,11 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_account_created_instruction"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<FrameLayout

6
vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
View file

@ -17,29 +17,29 @@
<TextView
android:id="@+id/loginGenericTextInputFormTitle"
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_set_email_title" />
<TextView
android:id="@+id/loginGenericTextInputFormNotice"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:layout_marginBottom="26dp"
android:gravity="start"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_set_email_notice" />
<TextView
android:id="@+id/loginGenericTextInputFormNotice2"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:visibility="gone"
tools:text="@string/login_set_msisdn_notice2"

8
vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
View file

@ -17,31 +17,31 @@
<TextView
android:id="@+id/loginGenericTextInputFormTitle"
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_set_email_title_2" />
<TextView
android:id="@+id/loginGenericTextInputFormNotice"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:layout_marginBottom="@dimen/layout_vertical_margin"
android:gravity="start"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_set_email_notice_2" />
<TextView
android:id="@+id/loginGenericTextInputFormMandatoryNotice"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="26dp"
android:gravity="start"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:visibility="gone"
tools:text="@string/login_set_email_mandatory_notice_2"
@ -49,10 +49,10 @@
<TextView
android:id="@+id/loginGenericTextInputFormNotice2"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:visibility="gone"
tools:text="@string/login_set_msisdn_notice2"

4
vector/src/main/res/layout/fragment_login_reset_password.xml
View file

@ -16,20 +16,20 @@
<TextView
android:id="@+id/resetPasswordTitle"
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_reset_password_on" />
<TextView
android:id="@+id/loginNotice"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:text="@string/login_reset_password_notice"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<com.google.android.material.textfield.TextInputLayout

8
vector/src/main/res/layout/fragment_login_reset_password_2.xml
View file

@ -16,20 +16,20 @@
<TextView
android:id="@+id/resetPasswordTitle"
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_reset_password_on" />
<TextView
style="@style/VectorTextView.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="32dp"
android:text="@string/login_enter_your_email"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary" />
<com.google.android.material.textfield.TextInputLayout
@ -51,21 +51,21 @@
<TextView
android:id="@+id/loginNotice"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="start"
android:text="@string/login_reset_password_notice"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />
<TextView
style="@style/VectorTextView.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="16dp"
android:text="@string/login_choose_a_new_password"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary" />
<FrameLayout

6
vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
View file

@ -14,27 +14,27 @@
tools:ignore="ContentDescription" />
<TextView
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/login_reset_password_mail_confirmation_title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/resetPasswordMailConfirmationNotice"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_reset_password_mail_confirmation_notice" />
<TextView
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_reset_password_mail_confirmation_notice_2"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />
<Button

6
vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
View file

@ -14,28 +14,28 @@
tools:ignore="ContentDescription" />
<TextView
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_reset_password_mail_confirmation_title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/resetPasswordMailConfirmationNotice"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_reset_password_mail_confirmation_notice" />
<TextView
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_reset_password_mail_confirmation_notice_2"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />
<Button

6
vector/src/main/res/layout/fragment_login_reset_password_success.xml
View file

@ -14,27 +14,27 @@
tools:ignore="ContentDescription" />
<TextView
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/login_reset_password_success_title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/resetPasswordSuccessNotice"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_reset_password_success_notice"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<TextView
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_reset_password_success_notice_2"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />
<Button

6
vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
View file

@ -14,28 +14,28 @@
tools:ignore="ContentDescription" />
<TextView
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_reset_password_success_title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/resetPasswordSuccessNotice"
style="@style/VectorTextView.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_reset_password_success_notice"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary" />
<TextView
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_reset_password_success_notice_2"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<Button

14
vector/src/main/res/layout/fragment_login_server_selection.xml
View file

@ -19,11 +19,11 @@
<TextView
android:id="@+id/loginServerTitle"
style="@style/VectorTextView.Title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="36dp"
android:text="@string/login_server_title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
android:transitionName="loginTitleTransition"
app:layout_constraintEnd_toEndOf="parent"
@ -32,12 +32,12 @@
<TextView
android:id="@+id/loginServerText"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:text="@string/login_server_text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -73,12 +73,12 @@
<TextView
android:id="@+id/loginServerChoiceMatrixOrgText"
style="@style/VectorTextView.Caption"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="start"
android:text="@string/login_server_matrix_org_text"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -116,12 +116,12 @@
<TextView
android:id="@+id/loginServerChoiceEmsText"
style="@style/VectorTextView.Caption"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="7dp"
android:gravity="start"
android:text="@string/login_server_modular_text"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/loginServerChoiceEmsLearnMore"
@ -130,11 +130,11 @@
<TextView
android:id="@+id/loginServerChoiceEmsLearnMore"
style="@style/VectorTextView.Caption"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="16dp"
android:text="@string/login_server_modular_learn_more"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?colorPrimary"
app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText"
app:layout_constraintEnd_toEndOf="parent"
@ -158,11 +158,11 @@
<TextView
android:id="@+id/loginServerChoiceOtherTitle"
style="@style/VectorTextView.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:text="@string/login_server_other_title"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
app:layout_constraintStart_toStartOf="parent"
@ -171,12 +171,12 @@
<TextView
android:id="@+id/loginServerChoiceOtherText"
style="@style/VectorTextView.Caption"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="start"
android:text="@string/login_server_other_text"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

14
vector/src/main/res/layout/fragment_login_server_selection_2.xml
View file

@ -16,22 +16,22 @@
<TextView
android:id="@+id/loginServerTitle"
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_please_choose_a_server"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:ignore="UnknownId" />
<TextView
android:id="@+id/loginServerText"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:text="@string/login_server_text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<!-- Use a CheckableConstraintLayout to keep the pressed state when retrieving login flow -->
@ -61,12 +61,12 @@
<TextView
android:id="@+id/loginServerChoiceMatrixOrgText"
style="@style/VectorTextView.Caption"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="start"
android:text="@string/login_server_matrix_org_text"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -77,11 +77,11 @@
<TextView
android:id="@+id/loginServerText2"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="@string/login_if_you_re_not_sure_select_this_option"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textStyle="italic" />
@ -98,11 +98,11 @@
<TextView
android:id="@+id/loginServerChoiceOtherTitle"
style="@style/VectorTextView.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:text="@string/login_element_matrix_server_and_others"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
app:layout_constraintStart_toStartOf="parent"
@ -111,12 +111,12 @@
<TextView
android:id="@+id/loginServerChoiceOtherText"
style="@style/VectorTextView.Caption"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="start"
android:text="@string/login_server_other_text"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -127,13 +127,13 @@
<TextView
android:id="@+id/loginServerChoiceEmsLearnMore"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/login_server_modular_learn_more_about_ems"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText"
app:layout_constraintEnd_toEndOf="parent"

10
vector/src/main/res/layout/fragment_login_server_url_form.xml
View file

@ -27,30 +27,30 @@
<TextView
android:id="@+id/loginServerUrlFormTitle"
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="27dp"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_connect_to_modular" />
<TextView
android:id="@+id/loginServerUrlFormText"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_server_url_form_modular_text" />
<TextView
android:id="@+id/loginServerUrlFormLearnMore"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/login_server_modular_learn_more"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?colorPrimary" />
<com.google.android.material.textfield.TextInputLayout
@ -75,22 +75,22 @@
<TextView
android:id="@+id/loginServerUrlFormClearHistory"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="@string/login_clear_homeserver_history"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?colorPrimary"
android:visibility="invisible"
tools:visibility="visible" />
<TextView
android:id="@+id/loginServerUrlFormNotice"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="start"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_server_url_form_common_notice" />

4
vector/src/main/res/layout/fragment_login_server_url_form_2.xml
View file

@ -17,11 +17,11 @@
<TextView
android:id="@+id/loginServerUrlFormTitle"
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_server_url_form_common_notice"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<com.google.android.material.textfield.TextInputLayout
@ -46,6 +46,7 @@
<TextView
android:id="@+id/loginServerUrlFormClearHistory"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
@ -53,7 +54,6 @@
android:paddingEnd="0dp"
android:paddingBottom="16dp"
android:text="@string/login_clear_homeserver_history"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?colorPrimary"
android:visibility="invisible"
tools:visibility="visible" />

6
vector/src/main/res/layout/fragment_login_signin_password_2.xml
View file

@ -16,11 +16,11 @@
tools:ignore="ContentDescription" />
<TextView
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_please_enter_your_password"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<ImageView
@ -34,20 +34,20 @@
<TextView
android:id="@+id/loginWelcomeBack"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="Welcome back user!" />
<TextView
android:id="@+id/loginWelcomeBackWarning"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_unknown_user_warning"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="@color/vector_warning_color_2"
android:visibility="gone"
tools:visibility="visible" />

4
vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
View file

@ -17,10 +17,10 @@
<TextView
android:id="@+id/loginTitle"
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_signin_to" />
@ -119,12 +119,12 @@
<TextView
android:id="@+id/loginSocialLoginHeader"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:text="@string/login_social_continue"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<im.vector.app.features.login.SocialLoginButtonsView

6
vector/src/main/res/layout/fragment_login_signin_username_2.xml
View file

@ -17,20 +17,20 @@
<TextView
android:id="@+id/loginTitle"
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_please_enter_your_matrix_identifier"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/loginSubtitle"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_please_enter_your_matrix_identifier_help"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<com.google.android.material.textfield.TextInputLayout
@ -61,12 +61,12 @@
<TextView
android:id="@+id/loginServerText3"
style="@style/VectorTextView.Caption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:gravity="start"
android:text="@string/login_enter_identifier_help"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />
<Button

10
vector/src/main/res/layout/fragment_login_signup_password_2.xml
View file

@ -16,46 +16,46 @@
tools:ignore="ContentDescription" />
<TextView
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_please_choose_a_password"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
style="@style/VectorTextView.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/login_your_matrix_identifier"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/loginMatrixIdentifier"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="\@user:domain.org" />
<TextView
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/login_press_back_to_change"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textStyle="italic" />
<TextView
style="@style/VectorTextView.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_choose_a_password"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary" />
<FrameLayout

6
vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
View file

@ -33,10 +33,10 @@
<TextView
android:id="@+id/loginSignupSigninTitle"
style="@style/VectorTextView.Title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="27dp"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninServerIcon"
@ -45,11 +45,11 @@
<TextView
android:id="@+id/loginSignupSigninText"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="27dp"
android:gravity="start"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -99,12 +99,12 @@
<TextView
android:id="@+id/loginSignupSigninSocialLoginHeader"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="27dp"
android:gravity="center"
android:text="@string/login_social_continue"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<im.vector.app.features.login.SocialLoginButtonsView

8
vector/src/main/res/layout/fragment_login_signup_username_2.xml
View file

@ -17,19 +17,19 @@
<TextView
android:id="@+id/loginTitle"
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_please_choose_a_user_name"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/loginSubtitle"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_signup_to" />
@ -52,10 +52,10 @@
<TextView
android:id="@+id/loginChooseHelp"
style="@style/VectorTextView.Caption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/login_please_choose_a_user_name_help_2"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textStyle="italic" />
@ -82,12 +82,12 @@
<TextView
android:id="@+id/loginSocialLoginHeader"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:text="@string/login_social_continue"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<im.vector.app.features.login.SocialLoginButtonsView

8
vector/src/main/res/layout/fragment_login_splash.xml
View file

@ -62,11 +62,11 @@
<TextView
android:id="@+id/loginSplashTitle"
style="@style/VectorTextView.Title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/login_splash_title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
android:transitionName="loginTitleTransition"
app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace3"
@ -105,12 +105,12 @@
<TextView
android:id="@+id/loginSplashText1"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:gravity="start"
android:text="@string/login_splash_text1"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
app:layout_constraintEnd_toEndOf="parent"
@ -130,12 +130,12 @@
<TextView
android:id="@+id/loginSplashText2"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="start"
android:text="@string/login_splash_text2"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
app:layout_constraintEnd_toEndOf="parent"
@ -155,12 +155,12 @@
<TextView
android:id="@+id/loginSplashText3"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="start"
android:text="@string/login_splash_text3"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

8
vector/src/main/res/layout/fragment_login_splash_2.xml
View file

@ -62,11 +62,11 @@
<TextView
android:id="@+id/loginSplashTitle"
style="@style/VectorTextView.Title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/login_splash_title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
android:transitionName="loginTitleTransition"
app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace25"
@ -105,12 +105,12 @@
<TextView
android:id="@+id/loginSplashText1"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:gravity="start"
android:text="@string/login_splash_text1"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
app:layout_constraintEnd_toEndOf="parent"
@ -130,12 +130,12 @@
<TextView
android:id="@+id/loginSplashText2"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="start"
android:text="@string/login_splash_text2"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
app:layout_constraintEnd_toEndOf="parent"
@ -155,12 +155,12 @@
<TextView
android:id="@+id/loginSplashText3"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="start"
android:text="@string/login_splash_text3"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

2
vector/src/main/res/layout/fragment_login_sso_only_2.xml
View file

@ -15,10 +15,10 @@
<TextView
android:id="@+id/loginSignupSigninTitle"
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:ignore="UnknownId"
tools:text="@string/login_connect_to" />

2
vector/src/main/res/layout/fragment_login_terms_2.xml
View file

@ -21,13 +21,13 @@
<TextView
android:id="@+id/loginTermsTitle"
style="@style/VectorTextView.Title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="36dp"
android:layout_marginTop="52dp"
android:layout_marginEnd="36dp"
android:text="@string/login_terms_title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

4
vector/src/main/res/layout/fragment_login_wait_for_email.xml
View file

@ -16,19 +16,19 @@
<TextView
android:id="@+id/loginWaitForEmailTitle"
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/login_wait_for_email_title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/loginWaitForEmailNotice"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_wait_for_email_notice" />

6
vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
View file

@ -15,31 +15,31 @@
<TextView
android:id="@+id/loginWaitForEmailTitle"
style="@style/VectorTextView.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_wait_for_email_title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/loginWaitForEmailNotice"
style="@style/VectorTextView.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_wait_for_email_notice_2" />
<TextView
android:id="@+id/loginWaitForEmailHelp"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:gravity="start"
android:text="@string/login_wait_for_email_help"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<ProgressBar

2
vector/src/main/res/layout/fragment_matrix_profile.xml
View file

@ -72,6 +72,7 @@
<TextView
android:id="@+id/matrixProfileToolbarTitleView"
style="@style/VectorTextView.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -79,7 +80,6 @@
android:alpha="0"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

8
vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
View file

@ -42,13 +42,13 @@
<TextView
android:id="@+id/matrixToCardNameText"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:maxLines="1"
android:singleLine="true"
android:textAlignment="textStart"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
@ -56,13 +56,13 @@
<TextView
android:id="@+id/matrixToCardAliasText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:maxLines="1"
android:singleLine="true"
android:textAlignment="textStart"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
@ -141,13 +141,13 @@
<TextView
android:id="@+id/matrixToCardDescText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:autoLink="web"
android:maxLines="4"
android:textAlignment="textStart"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintTop_toBottomOf="@id/matrixToMemberPills"
tools:text="@sample/rooms.json/data/topic" />
@ -211,10 +211,10 @@
<!-- layout_goneMarginStart: add half the width of the avatar: 15dp -->
<TextView
android:id="@+id/peopleYouMayKnowText"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="@id/knownMember1"
app:layout_constraintEnd_toEndOf="parent"

4
vector/src/main/res/layout/fragment_matrix_to_user_card.xml
View file

@ -21,6 +21,7 @@
<TextView
android:id="@+id/matrixToCardNameText"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -29,13 +30,13 @@
android:maxLines="1"
android:singleLine="true"
android:textAlignment="center"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
tools:text="@sample/users.json/data/displayName" />
<TextView
android:id="@+id/matrixToCardUserIdText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -44,7 +45,6 @@
android:maxLines="1"
android:singleLine="true"
android:textAlignment="center"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
tools:text="@sample/users.json/data/id" />

44
vector/src/main/res/layout/fragment_qr_code_scanner.xml
View file

@ -16,27 +16,27 @@
<!-- TODO In the future we could add a toggle to switch the flash, and other possible settings -->
<!-- TODO add take from album option.. -->
<!-- <Button-->
<!-- android:id="@+id/openAlbumButton"-->
<!-- style="@style/Widget.MaterialComponents.Button.Icon"-->
<!-- android:layout_width="34dp"-->
<!-- android:layout_height="34dp"-->
<!-- android:layout_marginEnd="@dimen/layout_horizontal_margin"-->
<!-- android:layout_marginBottom="@dimen/layout_vertical_margin_big"-->
<!-- android:backgroundTint="?vctr_bottom_nav_background_color"-->
<!-- android:elevation="0dp"-->
<!-- android:insetLeft="0dp"-->
<!-- android:insetTop="0dp"-->
<!-- android:insetRight="0dp"-->
<!-- android:insetBottom="0dp"-->
<!-- android:padding="0dp"-->
<!-- app:cornerRadius="17dp"-->
<!-- app:icon="@drawable/ic_picture_icon"-->
<!-- app:iconGravity="textStart"-->
<!-- app:iconPadding="0dp"-->
<!-- app:iconSize="20dp"-->
<!-- app:iconTint="?colorPrimary"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"/>-->
<!-- <Button-->
<!-- android:id="@+id/openAlbumButton"-->
<!-- style="@style/Widget.MaterialComponents.Button.Icon"-->
<!-- android:layout_width="34dp"-->
<!-- android:layout_height="34dp"-->
<!-- android:layout_marginEnd="@dimen/layout_horizontal_margin"-->
<!-- android:layout_marginBottom="@dimen/layout_vertical_margin_big"-->
<!-- android:backgroundTint="?vctr_bottom_nav_background_color"-->
<!-- android:elevation="0dp"-->
<!-- android:insetLeft="0dp"-->
<!-- android:insetTop="0dp"-->
<!-- android:insetRight="0dp"-->
<!-- android:insetBottom="0dp"-->
<!-- android:padding="0dp"-->
<!-- app:cornerRadius="17dp"-->
<!-- app:icon="@drawable/ic_picture_icon"-->
<!-- app:iconGravity="textStart"-->
<!-- app:iconPadding="0dp"-->
<!-- app:iconSize="20dp"-->
<!-- app:iconTint="?colorPrimary"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"/>-->
</androidx.constraintlayout.widget.ConstraintLayout>

6
vector/src/main/res/layout/fragment_reauth_confirm.xml
View file

@ -11,13 +11,13 @@
<TextView
android:id="@+id/reAuthConfirmText"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="16dp"
android:text="@string/re_authentication_default_confirm_text"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@id/reAuthConfirmButton"
app:layout_constraintTop_toTopOf="parent"
@ -70,7 +70,7 @@
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="start"-->
<!-- android:text="@string/login_signin_matrix_id_password_notice"-->
<!-- android:textAppearance="@style/VectorTextAppearanceCaption"-->
<!-- style="@style/VectorTextView.Caption"-->
<!-- android:visibility="gone"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
@ -79,11 +79,11 @@
<TextView
android:id="@+id/genericErrorText"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:text="@string/authentication_error"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?colorError"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"

4
vector/src/main/res/layout/fragment_recyclerview_with_search.xml
View file

@ -37,26 +37,26 @@
<TextView
android:id="@+id/appBarTitle"
style="@style/VectorTextView.HeadlineM"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:gravity="start|center"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
tools:text="@tools:sample/lorem/random" />
<TextView
android:id="@+id/appBarSpaceInfo"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:gravity="start|center"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
tools:text="@tools:sample/lorem/random" />

2
vector/src/main/res/layout/fragment_room_detail.xml
View file

@ -46,13 +46,13 @@
<TextView
android:id="@+id/roomToolbarTitleView"
style="@style/VectorTextView.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@+id/roomToolbarSubtitleView"
app:layout_constraintEnd_toEndOf="parent"

10
vector/src/main/res/layout/fragment_room_preview_no_preview.xml
View file

@ -39,13 +39,13 @@
<TextView
android:id="@+id/roomPreviewNoPreviewToolbarTitle"
style="@style/VectorTextView.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@ -90,43 +90,43 @@
<TextView
android:id="@+id/roomPreviewNoPreviewName"
style="@style/VectorTextView.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="56dp"
android:gravity="center"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
tools:text="@sample/rooms.json/data/name" />
<TextView
android:id="@+id/roomPreviewNoPreviewTopic"
style="@style/VectorTextView.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:autoLink="web"
android:gravity="center"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
tools:text="@sample/rooms.json/data/topic" />
<TextView
android:id="@+id/roomPreviewNoPreviewLabel"
style="@style/VectorTextView.Body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:gravity="center"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/room_preview_no_preview" />
<TextView
android:id="@+id/roomPreviewNoPreviewError"
style="@style/VectorTextView.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="center"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?colorError"
android:visibility="gone"
tools:text="Error"

2
vector/src/main/res/layout/fragment_room_setting_generic.xml
View file

@ -48,13 +48,13 @@
<TextView
android:id="@+id/roomSettingsToolbarTitleView"
style="@style/VectorTextView.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

2
vector/src/main/res/layout/fragment_room_uploads.xml
View file

@ -46,13 +46,13 @@
<TextView
android:id="@+id/roomUploadsToolbarTitleView"
style="@style/VectorTextView.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

4
vector/src/main/res/layout/fragment_set_identity_server.xml
View file

@ -14,9 +14,9 @@
<TextView
android:id="@+id/identityServerSetDefaultNotice"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:visibility="gone"
tools:text="@string/identity_server_set_default_notice"
@ -37,9 +37,9 @@
<TextView
android:id="@+id/identityServerSetDefaultAlternative"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
tools:text="@string/identity_server_set_alternative_notice" />

4
vector/src/main/res/layout/fragment_space_add_rooms.xml
View file

@ -35,6 +35,7 @@
<TextView
android:id="@+id/appBarTitle"
style="@style/VectorTextView.HeadlineM"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
@ -42,19 +43,18 @@
android:gravity="start|center"
android:maxLines="1"
android:text="@string/space_add_existing_rooms"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
android:textStyle="bold" />
<TextView
android:id="@+id/appBarSpaceInfo"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:gravity="start|center"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
tools:text="@sample/spaces.json/data/name" />

2
vector/src/main/res/layout/fragment_space_create_choose_private_model.xml
View file

@ -24,11 +24,11 @@
<TextView
android:id="@+id/accessInfoHelpText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:gravity="center"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintTop_toBottomOf="@id/headerText"
tools:text="@string/create_spaces_make_sure_access" />

6
vector/src/main/res/layout/fragment_space_create_choose_type.xml
View file

@ -12,11 +12,11 @@
<TextView
android:id="@+id/headerText"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/create_spaces_type_header"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
app:layout_constraintTop_toTopOf="parent" />
@ -35,12 +35,12 @@
<TextView
android:id="@+id/joinInfoHelpText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:gravity="center"
android:text="@string/create_spaces_join_info_help"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@id/publicButton" />
@ -72,12 +72,12 @@
<TextView
android:id="@+id/changeLaterText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:gravity="center"
android:text="@string/create_spaces_you_can_change_later"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent" />

2
vector/src/main/res/layout/fragment_space_preview.xml
View file

@ -53,13 +53,13 @@
<TextView
android:id="@+id/roomPreviewNoPreviewToolbarTitle"
style="@style/VectorTextView.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

2
vector/src/main/res/layout/fragment_ssss_access_from_key.xml
View file

@ -41,10 +41,10 @@
<TextView
android:id="@+id/ssss_restore_with_key_text"
style="@style/VectorTextView.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

4
vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
View file

@ -41,10 +41,10 @@
<TextView
android:id="@+id/ssss_restore_with_passphrase_warning_text"
style="@style/VectorTextView.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -98,11 +98,11 @@
<TextView
android:id="@+id/ssss_passphrase_or"
style="@style/VectorTextView.HeadlineM"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/or"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

4
vector/src/main/res/layout/fragment_ssss_reset_all.xml
View file

@ -61,12 +61,12 @@
<TextView
android:id="@+id/ssss_reset_text3"
style="@style/VectorTextView.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/secure_backup_reset_if_you_reset_all"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?colorError"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@ -74,6 +74,7 @@
<TextView
android:id="@+id/ssss_reset_text4"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -81,7 +82,6 @@
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:text="@string/secure_backup_reset_no_history"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
app:layout_constraintTop_toBottomOf="@id/ssss_reset_text3" />

8
vector/src/main/res/layout/fragment_user_code_show.xml
View file

@ -37,6 +37,7 @@
<TextView
android:id="@+id/showUserCodeTitle"
style="@style/VectorTextView.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -44,7 +45,6 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/add_by_qr_code"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
@ -102,6 +102,7 @@
<TextView
android:id="@+id/showUserCodeCardNameText"
style="@style/VectorTextView.Subtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -109,13 +110,13 @@
android:maxLines="1"
android:singleLine="true"
android:textAlignment="center"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
app:layout_constraintTop_toTopOf="parent"
tools:text="@sample/users.json/data/displayName" />
<TextView
android:id="@+id/showUserCodeCardUserIdText"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -124,7 +125,6 @@
android:maxLines="1"
android:singleLine="true"
android:textAlignment="center"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintTop_toBottomOf="@id/showUserCodeCardNameText"
tools:text="@sample/users.json/data/id" />
@ -156,6 +156,7 @@
<TextView
android:id="@+id/showUserCodeInfoText"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -163,7 +164,6 @@
android:layout_marginEnd="16dp"
android:text="@string/user_code_info_text"
android:textAlignment="center"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="@id/showUserCodeCard"
app:layout_constraintStart_toStartOf="@id/showUserCodeCard"

2
vector/src/main/res/layout/fragment_user_directory.xml
View file

@ -41,6 +41,7 @@
<TextView
android:id="@+id/userDirectoryTitle"
style="@style/VectorTextView.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -48,7 +49,6 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/direct_chats_header"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"

4
vector/src/main/res/layout/fragment_user_list.xml
View file

@ -36,6 +36,7 @@
<TextView
android:id="@+id/userListTitle"
style="@style/VectorTextView.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -43,7 +44,6 @@
android:ellipsize="end"
android:maxLines="1"
android:text="@string/fab_menu_create_chat"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
@ -109,12 +109,12 @@
<TextView
android:id="@+id/userListE2EbyDefaultDisabled"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:drawablePadding="8dp"
android:text="@string/settings_hs_admin_e2e_disabled"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/userListFilterDivider"

6
vector/src/main/res/layout/item_autocomplete_command.xml
View file

@ -12,37 +12,37 @@
<TextView
android:id="@+id/commandName"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
tools:text="/invite" />
<TextView
android:id="@+id/commandParameter"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="5dp"
android:layout_toEndOf="@+id/commandName"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textStyle="italic"
tools:text="&lt;user-id&gt;" />
<TextView
android:id="@+id/commandDescription"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/commandName"
android:layout_alignParentStart="true"
android:layout_gravity="center_vertical"
android:maxLines="2"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
tools:text="@string/command_description_invite_user" />

4
vector/src/main/res/layout/item_autocomplete_emoji.xml
View file

@ -27,24 +27,24 @@
<TextView
android:id="@+id/itemAutocompleteEmojiName"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
tools:text="name" />
<TextView
android:id="@+id/itemAutocompleteEmojiSubname"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="2dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:visibility="gone"
tools:text="name"

4
vector/src/main/res/layout/item_autocomplete_matrix_item.xml
View file

@ -25,23 +25,23 @@
<TextView
android:id="@+id/matrixItemAutocompleteName"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
tools:text="name" />
<TextView
android:id="@+id/matrixItemAutocompleteSubname"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="2dp"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:visibility="gone"
tools:text="name"

2
vector/src/main/res/layout/item_autocomplete_more_result.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/VectorTextView.Caption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:padding="8dp"
android:text="@string/autocomplete_limited_results"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />

8
vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
View file

@ -24,6 +24,7 @@
<TextView
android:id="@+id/bottom_sheet_message_preview_sender"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -31,7 +32,6 @@
android:ellipsize="end"
android:fontFamily="sans-serif-bold"
android:singleLine="true"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@+id/bottom_sheet_message_preview_timestamp"
@ -42,10 +42,10 @@
<TextView
android:id="@+id/bottom_sheet_message_preview_timestamp"
style="@style/VectorTextView.Caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="@id/bottom_sheet_message_preview_sender"
app:layout_constraintEnd_toEndOf="parent"
@ -67,6 +67,7 @@
<TextView
android:id="@+id/bottom_sheet_message_preview_body"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
@ -74,7 +75,6 @@
android:layout_marginBottom="4dp"
android:ellipsize="end"
android:maxLines="3"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
android:textIsSelectable="false"
app:layout_constraintBottom_toTopOf="@+id/bottom_sheet_message_preview_body_details"
@ -86,12 +86,12 @@
<TextView
android:id="@+id/bottom_sheet_message_preview_body_details"
style="@style/VectorTextView.Caption"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_tertiary"
android:textIsSelectable="false"
android:visibility="gone"

4
vector/src/main/res/layout/item_bottom_sheet_message_status.xml
View file

@ -28,7 +28,7 @@
android:drawablePadding="4dp"
android:textColor="?vctr_content_secondary"
android:textStyle="bold"
tools:text="@string/unable_to_send_message"
app:drawableStartCompat="@drawable/ic_warning_badge" />
app:drawableStartCompat="@drawable/ic_warning_badge"
tools:text="@string/unable_to_send_message" />
</LinearLayout>

4
vector/src/main/res/layout/item_bottom_sheet_radio.xml
View file

@ -26,12 +26,12 @@
<TextView
android:id="@+id/actionTitle"
style="@style/VectorTextView.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@ -42,11 +42,11 @@
<TextView
android:id="@+id/actionDescription"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:maxLines="4"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

2
vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
View file

@ -27,6 +27,7 @@
<TextView
android:id="@+id/bottomSheetRoomPreviewName"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="start"
@ -34,7 +35,6 @@
android:ellipsize="end"
android:fontFamily="sans-serif-bold"
android:singleLine="true"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/bottomSheetRoomPreviewAvatar"

4
vector/src/main/res/layout/item_bottom_sheet_title.xml
View file

@ -12,9 +12,9 @@
<TextView
android:id="@+id/itemBottomSheetTitleTitle"
style="@style/VectorTextView.HeadlineM"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textAppearance="@style/VectorTextAppearanceHeadlineM"
android:textColor="?vctr_content_primary"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/itemBottomSheetTitleSubtitle"
@ -25,10 +25,10 @@
<TextView
android:id="@+id/itemBottomSheetTitleSubtitle"
style="@style/VectorTextView.Body"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"

2
vector/src/main/res/layout/item_completion_homeserver.xml
View file

@ -2,6 +2,7 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@android:id/text1"
style="@style/VectorTextView.Body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="marquee"
@ -9,6 +10,5 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?android:attr/textColorAlertDialogListItem"
tools:text="https://matrix.org" />

2
vector/src/main/res/layout/item_contact_action.xml
View file

@ -22,13 +22,13 @@
<TextView
android:id="@+id/actionTitleText"
style="@style/VectorTextView.Subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
tools:text="@string/invite_friends" />

Some files were not shown because too many files have changed in this diff Show more