jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TextAppearances: import from figma and apply to login screens

This commit is contained in:
Benoit Marty 2021-06-14 20:20:19 +02:00
parent 2fb289ec14
commit 1793885ec6
46 changed files with 395 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vector/src/debug/res/layout/activity_debug_button_styles.xml
View File

@ -12,12 +12,19 @@
android:orientation="vertical"
android:padding="16dp">
<!-- Note: Default style is @style/VectorButtonStyle in the theme -->
<Button
style="@style/VectorButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Default" />
<Button
style="@style/VectorButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Line1\nLine 2" />
<Button
style="@style/VectorButtonStyle"
android:layout_width="wrap_content"

12
vector/src/debug/res/layout/activity_test_material_theme.xml
View File

@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".features.debug.DebugMaterialThemeActivity"
tools:ignore="HardcodedText">
tools:ignore="HardcodedText,MissingPrefix">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@ -441,6 +441,16 @@
</com.google.android.material.card.MaterialCardView>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Text appearance" />
<include
layout="@layout/debug_text_appearance"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@ -0,0 +1,74 @@
<?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>

6
vector/src/main/res/layout/activity_signed_out.xml
View File

@ -20,7 +20,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/signed_out_title"
android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:layout_width="wrap_content"
@ -28,7 +29,8 @@
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:text="@string/signed_out_notice"
android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<Button
android:id="@+id/signedOutSubmit"

12
vector/src/main/res/layout/fragment_login.xml
View File

@ -29,7 +29,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/TextAppearance.Vector.Login.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_signin_to" />
<TextView
@ -38,7 +39,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_server_matrix_org_text" />
<com.google.android.material.textfield.TextInputLayout
@ -103,7 +105,8 @@
android:layout_height="wrap_content"
android:gravity="start"
android:text="@string/login_signin_matrix_id_password_notice"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:visibility="gone"
tools:visibility="visible" />
@ -149,7 +152,8 @@
android:layout_marginTop="16dp"
android:gravity="center"
android:text="@string/login_social_continue"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
android:textSize="14sp" />
<im.vector.app.features.login.SocialLoginButtonsView

15
vector/src/main/res/layout/fragment_login_account_created.xml
View File

@ -20,14 +20,16 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_account_created_title"
android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/loginAccountCreatedSubtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
tools:text="@string/login_account_created_subtitle" />
<TextView
@ -35,14 +37,16 @@
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/login_account_created_notice"
android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<TextView
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/TextAppearance.Vector.Login.Text" />
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/loginAccountCreatedMessage"
@ -108,7 +112,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_account_created_instruction"
android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<FrameLayout
android:layout_width="match_parent"

5
vector/src/main/res/layout/fragment_login_captcha.xml
View File

@ -22,11 +22,12 @@
<TextView
android:id="@+id/loginCaptchaNotice"
style="@style/TextAppearance.Vector.Login.Text.Small"
style="@style/VectorTextAppearanceCaption"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/auth_recaptcha_message" />
android:text="@string/auth_recaptcha_message"
android:textColor="?vctr_content_secondary" />
<!-- contentDescription does not work on WebView? -->
<WebView

9
vector/src/main/res/layout/fragment_login_generic_text_input_form.xml
View File

@ -19,7 +19,8 @@
android:id="@+id/loginGenericTextInputFormTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.Vector.Login.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_set_email_title" />
<TextView
@ -29,7 +30,8 @@
android:layout_marginTop="@dimen/layout_vertical_margin"
android:layout_marginBottom="26dp"
android:gravity="start"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_set_email_notice" />
<TextView
@ -37,7 +39,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:visibility="gone"
tools:text="@string/login_set_msisdn_notice2"
tools:visibility="visible" />

12
vector/src/main/res/layout/fragment_login_generic_text_input_form_2.xml
View File

@ -20,7 +20,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/TextAppearance.Vector.Login.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_set_email_title_2" />
<TextView
@ -30,7 +31,8 @@
android:layout_marginTop="@dimen/layout_vertical_margin"
android:layout_marginBottom="@dimen/layout_vertical_margin"
android:gravity="start"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_set_email_notice_2" />
<TextView
@ -39,7 +41,8 @@
android:layout_height="wrap_content"
android:layout_marginBottom="26dp"
android:gravity="start"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:visibility="gone"
tools:text="@string/login_set_email_mandatory_notice_2"
tools:visibility="visible" />
@ -49,7 +52,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="start"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:visibility="gone"
tools:text="@string/login_set_msisdn_notice2"
tools:visibility="visible" />

6
vector/src/main/res/layout/fragment_login_reset_password.xml
View File

@ -18,7 +18,8 @@
android:id="@+id/resetPasswordTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.Vector.Login.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_reset_password_on" />
<TextView
@ -28,7 +29,8 @@
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:text="@string/login_reset_password_notice"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/resetPasswordEmailTil"

12
vector/src/main/res/layout/fragment_login_reset_password_2.xml
View File

@ -19,7 +19,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/TextAppearance.Vector.Login.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_reset_password_on" />
<TextView
@ -28,7 +29,8 @@
android:layout_gravity="center_vertical"
android:layout_marginTop="32dp"
android:text="@string/login_enter_your_email"
android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small" />
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/resetPasswordEmailTil"
@ -54,7 +56,8 @@
android:layout_marginTop="8dp"
android:gravity="start"
android:text="@string/login_reset_password_notice"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />
<TextView
android:layout_width="wrap_content"
@ -62,7 +65,8 @@
android:layout_gravity="center_vertical"
android:layout_marginTop="16dp"
android:text="@string/login_choose_a_new_password"
android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small" />
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary" />
<FrameLayout
android:id="@+id/passwordContainer"

9
vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation.xml
View File

@ -17,14 +17,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/login_reset_password_mail_confirmation_title"
android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/resetPasswordMailConfirmationNotice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_reset_password_mail_confirmation_notice" />
<TextView
@ -32,7 +34,8 @@
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/TextAppearance.Vector.Login.Text.Small" />
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />
<Button
android:id="@+id/resetPasswordMailConfirmationSubmit"

9
vector/src/main/res/layout/fragment_login_reset_password_mail_confirmation_2.xml
View File

@ -18,14 +18,16 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_reset_password_mail_confirmation_title"
android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/resetPasswordMailConfirmationNotice"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_reset_password_mail_confirmation_notice" />
<TextView
@ -33,7 +35,8 @@
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/TextAppearance.Vector.Login.Text.Small" />
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />
<Button
android:id="@+id/resetPasswordMailConfirmationSubmit"

9
vector/src/main/res/layout/fragment_login_reset_password_success.xml
View File

@ -17,7 +17,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/login_reset_password_success_title"
android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/resetPasswordSuccessNotice"
@ -25,14 +26,16 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_reset_password_success_notice"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<TextView
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/TextAppearance.Vector.Login.Text.Small" />
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />
<Button
android:id="@+id/resetPasswordSuccessSubmit"

9
vector/src/main/res/layout/fragment_login_reset_password_success_2.xml
View File

@ -18,7 +18,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_reset_password_success_title"
android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/resetPasswordSuccessNotice"
@ -26,14 +27,16 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_reset_password_success_notice"
android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small" />
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary" />
<TextView
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/TextAppearance.Vector.Login.Text" />
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<Button
android:id="@+id/resetPasswordSuccessSubmit"

19
vector/src/main/res/layout/fragment_login_server_selection.xml
View File

@ -23,7 +23,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="36dp"
android:text="@string/login_server_title"
android:textAppearance="@style/TextAppearance.Vector.Login.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
android:transitionName="loginTitleTransition"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -36,7 +37,8 @@
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:text="@string/login_server_text"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginServerTitle" />
@ -76,7 +78,8 @@
android:layout_marginTop="5dp"
android:gravity="start"
android:text="@string/login_server_matrix_org_text"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -118,7 +121,8 @@
android:layout_marginTop="7dp"
android:gravity="start"
android:text="@string/login_server_modular_text"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/loginServerChoiceEmsLearnMore"
app:layout_constraintStart_toStartOf="parent"
@ -130,7 +134,7 @@
android:layout_height="wrap_content"
android:padding="16dp"
android:text="@string/login_server_modular_learn_more"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?colorPrimary"
app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText"
app:layout_constraintEnd_toEndOf="parent"
@ -158,7 +162,7 @@
android:layout_height="wrap_content"
android:gravity="start"
android:text="@string/login_server_other_title"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
@ -173,7 +177,8 @@
android:layout_marginTop="4dp"
android:gravity="start"
android:text="@string/login_server_other_text"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

20
vector/src/main/res/layout/fragment_login_server_selection_2.xml
View File

@ -20,7 +20,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_please_choose_a_server"
android:textAppearance="@style/TextAppearance.Vector.Login.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:ignore="UnknownId" />
<TextView
@ -30,7 +31,8 @@
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:text="@string/login_server_text"
android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<!-- Use a CheckableConstraintLayout to keep the pressed state when retrieving login flow -->
<im.vector.app.core.platform.CheckableConstraintLayout
@ -64,7 +66,8 @@
android:layout_marginTop="5dp"
android:gravity="start"
android:text="@string/login_server_matrix_org_text"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -78,7 +81,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:text="@string/login_if_you_re_not_sure_select_this_option"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textStyle="italic" />
<im.vector.app.core.platform.CheckableConstraintLayout
@ -98,7 +102,7 @@
android:layout_height="wrap_content"
android:gravity="start"
android:text="@string/login_element_matrix_server_and_others"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_primary"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
@ -113,7 +117,8 @@
android:layout_marginTop="4dp"
android:gravity="start"
android:text="@string/login_server_other_text"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -129,7 +134,8 @@
android:paddingTop="16dp"
android:paddingBottom="16dp"
android:text="@string/login_server_modular_learn_more_about_ems"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/loginServerChoiceEmsText" />

13
vector/src/main/res/layout/fragment_login_server_url_form.xml
View File

@ -30,7 +30,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="27dp"
android:textAppearance="@style/TextAppearance.Vector.Login.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_connect_to_modular" />
<TextView
@ -39,7 +40,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_server_url_form_modular_text" />
<TextView
@ -48,7 +50,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/login_server_modular_learn_more"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?colorPrimary" />
<com.google.android.material.textfield.TextInputLayout
@ -77,7 +79,7 @@
android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="@string/login_clear_homeserver_history"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?colorPrimary"
android:visibility="invisible"
tools:visibility="visible" />
@ -88,7 +90,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:gravity="start"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_server_url_form_common_notice" />
<Button

5
vector/src/main/res/layout/fragment_login_server_url_form_2.xml
View File

@ -21,7 +21,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_server_url_form_common_notice"
android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/loginServerUrlFormHomeServerUrlTil"
@ -52,7 +53,7 @@
android:paddingEnd="0dp"
android:paddingBottom="16dp"
android:text="@string/login_clear_homeserver_history"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?colorPrimary"
android:visibility="invisible"
tools:visibility="visible" />

8
vector/src/main/res/layout/fragment_login_signin_password_2.xml
View File

@ -20,7 +20,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_please_enter_your_password"
android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<ImageView
android:id="@+id/loginUserIcon"
@ -36,7 +37,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="Welcome back user!" />
<TextView
@ -45,7 +47,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_unknown_user_warning"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="@color/vector_warning_color_2"
android:visibility="gone"
tools:visibility="visible" />

6
vector/src/main/res/layout/fragment_login_signin_to_any_2.xml
View File

@ -20,7 +20,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/TextAppearance.Vector.Login.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_signin_to" />
<com.google.android.material.textfield.TextInputLayout
@ -123,7 +124,8 @@
android:layout_marginTop="16dp"
android:gravity="center"
android:text="@string/login_social_continue"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
android:textSize="14sp" />
<im.vector.app.features.login.SocialLoginButtonsView

9
vector/src/main/res/layout/fragment_login_signin_username_2.xml
View File

@ -21,7 +21,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_please_enter_your_matrix_identifier"
android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/loginSubtitle"
@ -29,7 +30,8 @@
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/TextAppearance.Vector.Login.Text" />
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/loginFieldTil"
@ -64,7 +66,8 @@
android:layout_marginTop="32dp"
android:gravity="start"
android:text="@string/login_enter_identifier_help"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small" />
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />
<Button
android:id="@+id/loginChooseAServer"

15
vector/src/main/res/layout/fragment_login_signup_password_2.xml
View File

@ -20,21 +20,24 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_please_choose_a_password"
android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/login_your_matrix_identifier"
android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small" />
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/loginMatrixIdentifier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="\@user:domain.org" />
<TextView
@ -42,7 +45,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/login_press_back_to_change"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textStyle="italic" />
<TextView
@ -51,7 +55,8 @@
android:layout_gravity="center_vertical"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_choose_a_password"
android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small" />
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary" />
<FrameLayout
android:id="@+id/passwordContainer"

9
vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
View File

@ -36,7 +36,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="27dp"
android:textAppearance="@style/TextAppearance.Vector.Login.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninServerIcon"
app:layout_goneMarginTop="0dp"
@ -48,7 +49,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="27dp"
android:gravity="start"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/loginSignupSigninTitle"
@ -102,7 +104,8 @@
android:layout_marginTop="27dp"
android:gravity="center"
android:text="@string/login_social_continue"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
android:textSize="14sp" />
<im.vector.app.features.login.SocialLoginButtonsView

12
vector/src/main/res/layout/fragment_login_signup_username_2.xml
View File

@ -21,14 +21,16 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_please_choose_a_user_name"
android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/loginSubtitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_signup_to" />
<com.google.android.material.textfield.TextInputLayout
@ -53,7 +55,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/login_please_choose_a_user_name_help_2"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textStyle="italic" />
<Button
@ -84,7 +87,8 @@
android:layout_marginTop="16dp"
android:gravity="center"
android:text="@string/login_social_continue"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
android:textSize="14sp" />
<im.vector.app.features.login.SocialLoginButtonsView

12
vector/src/main/res/layout/fragment_login_splash.xml
View File

@ -66,7 +66,8 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/login_splash_title"
android:textAppearance="@style/TextAppearance.Vector.Login.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
android:transitionName="loginTitleTransition"
app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace3"
app:layout_constraintEnd_toEndOf="parent"
@ -109,7 +110,8 @@
android:layout_marginStart="8dp"
android:gravity="start"
android:text="@string/login_splash_text1"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
@ -133,7 +135,8 @@
android:layout_marginTop="16dp"
android:gravity="start"
android:text="@string/login_splash_text2"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/loginSplashText1"
@ -157,7 +160,8 @@
android:layout_marginTop="16dp"
android:gravity="start"
android:text="@string/login_splash_text3"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/loginSplashText1"

12
vector/src/main/res/layout/fragment_login_splash_2.xml
View File

@ -66,7 +66,8 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/login_splash_title"
android:textAppearance="@style/TextAppearance.Vector.Login.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
android:transitionName="loginTitleTransition"
app:layout_constraintBottom_toTopOf="@+id/loginSplashSpace25"
app:layout_constraintEnd_toEndOf="parent"
@ -109,7 +110,8 @@
android:layout_marginStart="8dp"
android:gravity="start"
android:text="@string/login_splash_text1"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@+id/loginSplashText2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/loginSplashPicto1"
@ -133,7 +135,8 @@
android:layout_marginTop="16dp"
android:gravity="start"
android:text="@string/login_splash_text2"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toTopOf="@id/loginSplashText3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/loginSplashText1"
@ -157,7 +160,8 @@
android:layout_marginTop="16dp"
android:gravity="start"
android:text="@string/login_splash_text3"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/loginSplashText1"

3
vector/src/main/res/layout/fragment_login_sso_only_2.xml
View File

@ -18,7 +18,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:textAppearance="@style/TextAppearance.Vector.Login.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:ignore="UnknownId"
tools:text="@string/login_connect_to" />

6
vector/src/main/res/layout/fragment_login_terms.xml
View File

@ -20,24 +20,26 @@
<TextView
android:id="@+id/loginTermsTitle"
style="@style/TextAppearance.Vector.Login.Title"
style="@style/VectorTextAppearanceTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="36dp"
android:paddingStart="36dp"
android:paddingEnd="36dp"
android:text="@string/login_terms_title"
android:textColor="?vctr_content_primary"
app:layout_constraintTop_toBottomOf="@id/loginLogo" />
<TextView
android:id="@+id/loginTermsNotice"
style="@style/TextAppearance.Vector.Login.Text.Small"
style="@style/VectorTextAppearanceBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:paddingStart="36dp"
android:paddingEnd="36dp"
android:text="@string/auth_accept_policies"
android:textColor="?vctr_content_secondary"
app:layout_constraintTop_toBottomOf="@+id/loginTermsTitle" />
<androidx.recyclerview.widget.RecyclerView

6
vector/src/main/res/layout/fragment_login_terms_2.xml
View File

@ -27,7 +27,8 @@
android:layout_marginTop="52dp"
android:layout_marginEnd="36dp"
android:text="@string/login_terms_title"
android:textAppearance="@style/TextAppearance.Vector.Login.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/loginLogo"
@ -35,13 +36,14 @@
<TextView
android:id="@+id/loginTermsNotice"
style="@style/TextAppearance.Vector.Login.Text.Small"
style="@style/VectorTextAppearanceBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:paddingStart="36dp"
android:paddingEnd="36dp"
android:text="@string/auth_accept_policies"
android:textColor="?vctr_content_secondary"
app:layout_constraintTop_toBottomOf="@+id/loginTermsTitle" />
<androidx.recyclerview.widget.RecyclerView

6
vector/src/main/res/layout/fragment_login_wait_for_email.xml
View File

@ -19,7 +19,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/login_wait_for_email_title"
android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/loginWaitForEmailNotice"
@ -27,7 +28,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
tools:text="@string/login_wait_for_email_notice" />
<ProgressBar

9
vector/src/main/res/layout/fragment_login_wait_for_email_2.xml
View File

@ -19,7 +19,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:text="@string/login_wait_for_email_title"
android:textAppearance="@style/TextAppearance.Vector.Login.Title" />
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary" />
<TextView
android:id="@+id/loginWaitForEmailNotice"
@ -27,7 +28,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="start"
android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
tools:text="@string/login_wait_for_email_notice_2" />
<TextView
@ -37,7 +39,8 @@
android:layout_marginTop="32dp"
android:gravity="start"
android:text="@string/login_wait_for_email_help"
android:textAppearance="@style/TextAppearance.Vector.Login.Text" />
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary" />
<ProgressBar
style="@style/VectorHorizontalProgressBar"

4
vector/src/main/res/layout/fragment_reauth_confirm.xml
View File

@ -70,7 +70,7 @@
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="start"-->
<!-- android:text="@string/login_signin_matrix_id_password_notice"-->
<!-- android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"-->
<!-- android:textAppearance="@style/VectorTextAppearanceCaption"-->
<!-- android:visibility="gone"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
@ -83,7 +83,7 @@
android:layout_height="wrap_content"
android:gravity="start"
android:text="@string/authentication_error"
android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?colorError"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"

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

@ -94,7 +94,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="56dp"
android:gravity="center"
android:textAppearance="@style/TextAppearance.Vector.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
android:textSize="15sp"
android:textStyle="bold"
tools:text="@sample/rooms.json/data/name" />
@ -106,8 +107,8 @@
android:layout_marginTop="@dimen/layout_vertical_margin"
android:autoLink="web"
android:gravity="center"
android:textAppearance="@style/TextAppearance.Vector.Subtitle"
android:textSize="15sp"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
tools:text="@sample/rooms.json/data/topic" />
<TextView
@ -116,7 +117,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:gravity="center"
android:textAppearance="@style/TextAppearance.Vector.Subtitle2"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
android:textSize="14sp"
tools:text="@string/room_preview_no_preview" />

3
vector/src/main/res/layout/item_login_text.xml
View File

@ -8,5 +8,6 @@
android:layout_marginTop="12dp"
android:paddingStart="36dp"
android:paddingEnd="36dp"
android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textColor="?vctr_content_secondary"
android:textAppearance="@style/VectorTextAppearanceBody"
tools:text="Login Title" />

3
vector/src/main/res/layout/item_login_title.xml
View File

@ -8,5 +8,6 @@
android:layout_marginTop="32dp"
android:paddingStart="36dp"
android:paddingEnd="36dp"
android:textAppearance="@style/TextAppearance.Vector.Login.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
tools:text="Login Title" />

3
vector/src/main/res/layout/item_login_title_small.xml
View File

@ -8,5 +8,6 @@
android:layout_marginTop="16dp"
android:paddingStart="36dp"
android:paddingEnd="36dp"
android:textAppearance="@style/TextAppearance.Vector.Login.Title.Small"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
tools:text="Login Title" />

6
vector/src/main/res/layout/item_policy.xml
View File

@ -19,10 +19,11 @@
<TextView
android:id="@+id/adapter_item_policy_title"
style="@style/TextAppearance.Vector.Login.Text"
style="@style/VectorTextAppearanceBody"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:drawablePadding="8dp"
android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@+id/adapter_item_policy_subtitle"
app:layout_constraintEnd_toStartOf="@+id/adapter_item_policy_arrow"
app:layout_constraintStart_toEndOf="@+id/adapter_item_policy_checkbox"
@ -32,11 +33,12 @@
<TextView
android:id="@+id/adapter_item_policy_subtitle"
style="@style/TextAppearance.Vector.Login.Text.Small"
style="@style/VectorTextAppearanceCaption"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:drawablePadding="8dp"
android:textColor="?vctr_content_secondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/adapter_item_policy_arrow"
app:layout_constraintStart_toEndOf="@+id/adapter_item_policy_checkbox"

9
vector/src/main/res/layout/vector_invite_view.xml
View File

@ -26,7 +26,8 @@
android:layout_marginTop="40dp"
android:paddingStart="@dimen/layout_horizontal_margin"
android:paddingEnd="@dimen/layout_horizontal_margin"
android:textAppearance="@style/TextAppearance.Vector.Title"
android:textAppearance="@style/VectorTextAppearanceTitle"
android:textColor="?vctr_content_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inviteAvatarView"
@ -39,7 +40,8 @@
android:layout_marginTop="8dp"
android:paddingStart="@dimen/layout_horizontal_margin"
android:paddingEnd="@dimen/layout_horizontal_margin"
android:textAppearance="@style/TextAppearance.Vector.Subtitle"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inviteNameView"
@ -51,7 +53,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="40dp"
android:text="@string/send_you_invite"
android:textAppearance="@style/TextAppearance.Vector.Subtitle2"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inviteIdentifierView" />

7
vector/src/main/res/layout/vector_preference_push_rule.xml
View File

@ -23,8 +23,8 @@
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItem"
android:textSize="16sp"
android:textAppearance="?textAppearanceListItem"
android:textColor="?vctr_content_primary"
tools:text="Title" />
<TextView
@ -35,9 +35,8 @@
android:layout_alignStart="@android:id/title"
android:maxLines="2"
android:paddingTop="6dp"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textAppearance="?textAppearanceListItemSecondary"
android:textColor="?vctr_content_secondary"
android:textSize="14sp"
tools:text="Summary"
tools:visibility="visible" />

2
vector/src/main/res/layout/view_room_widgets_banner.xml
View File

@ -17,7 +17,7 @@
android:paddingTop="8dp"
android:paddingEnd="12dp"
android:paddingBottom="8dp"
android:textAppearance="@style/TextAppearance.Vector.Title"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_room_active_widgets_banner_text"
tools:text="2 active widgets" />

4
vector/src/main/res/values/styles_buttons.xml
View File

@ -5,8 +5,6 @@
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
<item name="android:minWidth">94dp</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">14sp</item>
</style>
<style name="VectorButtonStyle.Destructive">
@ -31,8 +29,6 @@
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
<item name="android:minWidth">94dp</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">14sp</item>
</style>
<style name="VectorButtonStyleUnelevated.Bot">

8
vector/src/main/res/values/styles_text_view.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="VectorTextView" parent="Widget.MaterialComponents.TextView">
</style>
</resources>

102
vector/src/main/res/values/text_appearances.xml
View File

@ -1,63 +1,79 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2019 New Vector Ltd
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="TextAppearance.Vector.Title" parent="TextAppearance.AppCompat">
<item name="android:textSize">16sp</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textStyle">normal</item>
<style name="VectorTextAppearanceTitle" parent="TextAppearance.MaterialComponents.Headline3">
<item name="fontFamily">sans-serif</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">24sp</item>
<item name="android:letterSpacing">0</item>
<item name="lineHeight">32sp</item>
<item name="android:textColor">?vctr_content_primary</item>
</style>
<style name="TextAppearance.Vector.Subtitle" parent="TextAppearance.AppCompat">
<item name="android:textSize">14sp</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">?vctr_content_secondary</item>
<style name="VectorTextAppearanceTitle.M">
<item name="fontFamily">sans-serif-medium</item>
<item name="android:fontFamily">sans-serif-medium</item>
</style>
<style name="TextAppearance.Vector.Subtitle2" parent="TextAppearance.AppCompat">
<item name="android:textSize">14sp</item>
<style name="VectorTextAppearanceHeadlineM" parent="TextAppearance.MaterialComponents.Headline1">
<item name="fontFamily">sans-serif-medium</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">?vctr_content_secondary</item>
</style>
<style name="TextAppearance.Vector.Login.Title" parent="TextAppearance.AppCompat">
<item name="android:textSize">20sp</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textStyle">bold</item>
<item name="android:textSize">18sp</item>
<item name="android:letterSpacing">0</item>
<item name="android:textColor">?vctr_content_primary</item>
</style>
<style name="TextAppearance.Vector.Login.Title.Small">
<item name="android:textSize">15sp</item>
</style>
<style name="TextAppearance.Vector.Login.Text" parent="TextAppearance.AppCompat">
<item name="android:textSize">16sp</item>
<style name="VectorTextAppearanceSubtitle" parent="TextAppearance.MaterialComponents.Subtitle1">
<item name="fontFamily">sans-serif</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textStyle">normal</item>
<item name="android:textSize">16sp</item>
<item name="android:letterSpacing">0</item>
<item name="android:textColor">?vctr_content_secondary</item>
</style>
<style name="TextAppearance.Vector.Login.Text.Small">
<style name="VectorTextAppearanceSubtitle.M">
<item name="fontFamily">sans-serif-medium</item>
<item name="android:fontFamily">sans-serif-medium</item>
</style>
<!-- Note: this is the default text appearance for all the TextViews -->
<style name="VectorTextAppearanceBody" parent="TextAppearance.MaterialComponents.Body1">
<item name="fontFamily">sans-serif</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">14sp</item>
<item name="android:letterSpacing">0</item>
<item name="lineHeight">20sp</item>
<item name="android:textColor">?vctr_content_primary</item>
</style>
<style name="VectorTextAppearanceBody.M">
<item name="fontFamily">sans-serif-medium</item>
<item name="android:fontFamily">sans-serif-medium</item>
</style>
<style name="VectorTextAppearanceCaption" parent="TextAppearance.MaterialComponents.Caption">
<item name="fontFamily">sans-serif</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">12sp</item>
<item name="android:letterSpacing">0</item>
<item name="lineHeight">16sp</item>
<item name="android:textColor">?vctr_content_secondary</item>
</style>
<style name="VectorTextAppearanceMicro" parent="TextAppearance.MaterialComponents.Caption">
<item name="fontFamily">sans-serif</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">10sp</item>
<item name="android:letterSpacing">0</item>
<item name="lineHeight">16sp</item>
</style>
<style name="VectorTextAppearanceButton" parent="TextAppearance.MaterialComponents.Button">
<item name="fontFamily">sans-serif-medium</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">16sp</item>
<item name="android:letterSpacing">0.02</item>
<item name="lineHeight">24sp</item>
</style>
</resources>

11
vector/src/main/res/values/theme_dark.xml
View File

@ -63,7 +63,18 @@
<item name="android:colorBackground">@color/element_background_dark</item>
<item name="colorOnBackground">?vctr_content_primary</item>
<!--Material type attributes-->
<item name="textAppearanceButton">@style/VectorTextAppearanceButton</item>
<item name="textAppearanceCaption">@style/VectorTextAppearanceCaption</item>
<!-- Default Text appearance for TextViews -->
<item name="android:textAppearanceSmall">@style/VectorTextAppearanceBody</item>
<!-- Text appearance for List item (TODO Check that this is used in Preference Screen -->
<item name="textAppearanceListItem">@style/VectorTextAppearanceSubtitle</item>
<item name="textAppearanceListItemSecondary">@style/VectorTextAppearanceBody</item>
<item name="textAppearanceListItemSmall">@style/VectorTextAppearanceBody</item>
<!-- Default styles -->
<item name="android:textViewStyle">@style/VectorTextView</item>
<item name="materialButtonStyle">@style/VectorButtonStyle</item>
<item name="toolbarStyle">@style/VectorToolbar</item>
<item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleDark</item>

11
vector/src/main/res/values/theme_light.xml
View File

@ -63,7 +63,18 @@
<item name="android:colorBackground">@color/element_background_light</item>
<item name="colorOnBackground">?vctr_content_primary</item>
<!--Material type attributes-->
<item name="textAppearanceButton">@style/VectorTextAppearanceButton</item>
<item name="textAppearanceCaption">@style/VectorTextAppearanceCaption</item>
<!-- Default Text appearance for TextViews -->
<item name="android:textAppearanceSmall">@style/VectorTextAppearanceBody</item>
<!-- Text appearance for List item -->
<item name="textAppearanceListItem">@style/VectorTextAppearanceSubtitle</item>
<item name="textAppearanceListItemSecondary">@style/VectorTextAppearanceBody</item>
<item name="textAppearanceListItemSmall">@style/VectorTextAppearanceBody</item>
<!-- Default styles -->
<item name="android:textViewStyle">@style/VectorTextView</item>
<item name="materialButtonStyle">@style/VectorButtonStyle</item>
<item name="toolbarStyle">@style/VectorToolbar</item>
<item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleLight</item>