mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-27 20:06:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Keys backup fix some issue on layout

Browse source
This commit is contained in:
Benoit Marty 2019-06-11 16:48:48 +02:00
parent 4827b76b80
commit 53dd9c3427
26 changed files with 108 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vector/src/main/java/im/vector/riotredesign/core/ui/list/GenericItemViewHolder.kt
View file

@ -63,7 +63,7 @@ class GenericItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
titleText.text = item.title
when (item.style) {
GenericRecyclerViewItem.STYLE.BIG_TEXT -> titleText.textSize = 18f
GenericRecyclerViewItem.STYLE.BIG_TEXT -> titleText.textSize = 18f
GenericRecyclerViewItem.STYLE.NORMAL_TEXT -> titleText.textSize = 14f
}

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

@ -10,6 +10,7 @@
style="@style/VectorToolbarStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:elevation="4dp"
app:layout_constraintTop_toTopOf="parent" />
<FrameLayout
@ -61,6 +62,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textColor="?riotx_text_secondary"
android:visibility="gone"
tools:text="Waiting status..."
tools:visibility="visible" />

7
vector/src/main/res/layout/activity_login.xml
View file

@ -111,15 +111,14 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/authenticateButton"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:text="@string/auth_login"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@ -16,9 +16,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/encryption_export_notice"
android:textColor="?riotx_text_primary"
android:textSize="16sp" />
<com.google.android.material.textfield.TextInputLayout
style="@style/VectorTextInputLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
@ -37,6 +39,7 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/dialog_e2e_keys_confirm_passphrase_til"
style="@style/VectorTextInputLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
@ -53,10 +56,11 @@
</com.google.android.material.textfield.TextInputLayout>
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/dialog_e2e_keys_export_button"
style="@style/VectorButtonStyle"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_gravity="end"
android:enabled="false"
android:text="@string/encryption_export_export" />
</LinearLayout>

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

@ -12,6 +12,7 @@
android:paddingBottom="12dp">
<com.google.android.material.textfield.TextInputLayout
style="@style/VectorTextInputLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="?attr/vctr_default_text_hint_color">
@ -26,11 +27,12 @@
</com.google.android.material.textfield.TextInputLayout>
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/dialog_e2e_keys_import_button"
style="@style/VectorButtonStyle"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:layout_marginTop="10dp"
android:enabled="false"
android:text="@string/encryption_import_import" />

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

@ -16,7 +16,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="36dp"
android:src="@drawable/key_big"
android:tint="?android:textColorTertiary"
android:tint="?riotx_text_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -28,6 +28,7 @@
android:layout_margin="16dp"
android:text="@string/keys_backup_restore_with_recovery_key"
android:textAlignment="center"
android:textColor="?riotx_text_primary"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@ -36,6 +37,7 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/keys_backup_key_enter_til"
style="@style/VectorTextInputLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -67,7 +69,6 @@
android:scaleType="center"
android:src="@drawable/ic_import_black"
android:tint="?attr/colorAccent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/keys_backup_key_enter_til"
app:layout_constraintTop_toTopOf="@id/keys_backup_key_enter_til" />
@ -79,18 +80,18 @@
android:layout_margin="16dp"
android:text="@string/keys_backup_restore_with_key_helper"
android:textAlignment="center"
android:textColor="?riotx_text_secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/keys_backup_key_enter_til" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_restore_button"
style="@style/VectorButtonStyle"
android:layout_marginTop="@dimen/layout_vertical_margin_big"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:layout_marginRight="@dimen/layout_horizontal_margin"
android:minWidth="200dp"
android:padding="16dp"
android:text="@string/keys_backup_unlock_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/keys_restore_key_help_with_link"

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

@ -16,7 +16,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="36dp"
android:src="@drawable/key_big"
android:tint="?android:textColorTertiary"
android:tint="?riotx_text_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -28,6 +28,7 @@
android:layout_margin="16dp"
android:text="@string/keys_backup_restore_with_passphrase"
android:textAlignment="center"
android:textColor="?riotx_text_primary"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@ -36,6 +37,7 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/keys_backup_passphrase_enter_til"
style="@style/VectorTextInputLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -65,7 +67,7 @@
android:background="?attr/selectableItemBackground"
android:scaleType="center"
android:src="@drawable/ic_eye_black"
android:tint="?attr/colorAccent"
android:tint="?colorAccent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/keys_backup_passphrase_enter_til"
app:layout_constraintTop_toTopOf="@+id/keys_backup_passphrase_enter_til" />
@ -76,12 +78,13 @@
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:textAlignment="center"
android:textColor="?riotx_text_secondary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/keys_backup_passphrase_enter_til"
tools:text="@string/keys_backup_restore_with_passphrase_helper_with_link" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_restore_with_passphrase_submit"
style="@style/VectorButtonStyle"
android:layout_marginTop="@dimen/layout_vertical_margin_big"
@ -89,7 +92,6 @@
android:layout_marginRight="@dimen/layout_horizontal_margin"
android:layout_marginBottom="@dimen/layout_vertical_margin_big"
android:minWidth="200dp"
android:padding="16dp"
android:text="@string/keys_backup_unlock_button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

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

@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="36dp"
android:src="@drawable/key_big"
android:tint="?android:textColorTertiary"
android:tint="?riotx_text_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -22,6 +22,7 @@
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:textAlignment="center"
android:textColor="?riotx_text_primary"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@ -35,19 +36,18 @@
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:textAlignment="center"
android:textColor="?android:attr/textColorSecondary"
android:textColor="?riotx_text_secondary"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/keys_backup_restore_success"
tools:text="@string/keys_backup_restore_success_description" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_setup_done_button"
style="@style/VectorButtonStyle"
android:layout_margin="20dp"
android:minWidth="200dp"
android:padding="16dp"
android:text="@string/done"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

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

@ -7,4 +7,4 @@
android:clipToPadding="false"
android:paddingTop="@dimen/layout_vertical_margin"
android:paddingBottom="@dimen/layout_vertical_margin_big"
tools:listitem="@layout/item_notification_troubleshoot" />
tools:listitem="@layout/item_generic_list" />

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

@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:src="@drawable/backup_keys"
android:tint="?android:attr/textColorTertiary"
android:tint="?riotx_text_primary"
app:layout_constraintBottom_toTopOf="@+id/keys_backup_setup_step1_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -27,6 +27,7 @@
android:layout_margin="16dp"
android:text="@string/keys_backup_setup_step1_title"
android:textAlignment="center"
android:textColor="?riotx_text_primary"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/keys_backup_setup_step1_description"
@ -40,24 +41,27 @@
android:layout_margin="16dp"
android:text="@string/keys_backup_setup_step1_description"
android:textAlignment="center"
android:textColor="?riotx_text_secondary"
app:layout_constraintBottom_toTopOf="@+id/keys_backup_setup_step1_button"
app:layout_constraintTop_toBottomOf="@id/keys_backup_setup_step1_title" />
<!-- Centered button -->
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_setup_step1_button"
style="@style/VectorButtonStyle"
android:layout_width="wrap_content"
android:layout_margin="16dp"
android:minWidth="200dp"
android:padding="8dp"
android:text="@string/keys_backup_setup"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/keys_backup_setup_step1_description" />
<TextView
android:id="@+id/keys_backup_setup_step1_advanced"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginLeft="16dp"
@ -65,14 +69,19 @@
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:text="@string/keys_backup_setup_step1_advanced"
android:textAlignment="center"
android:textColor="?riotx_text_secondary"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/keys_backup_setup_step1_button"
tools:visibility="visible" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_setup_step1_manualExport"
style="@style/VectorButtonStyleFlat"
android:layout_margin="16dp"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:minWidth="200dp"
android:padding="8dp"
android:text="@string/keys_backup_setup_step1_manual_export"

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

@ -22,6 +22,7 @@
android:layout_marginBottom="16dp"
android:text="@string/keys_backup_setup_step2_text_title"
android:textAlignment="center"
android:textColor="?riotx_text_primary"
android:textSize="17sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@ -38,6 +39,7 @@
android:layout_marginBottom="16dp"
android:text="@string/keys_backup_setup_step2_text_description"
android:textAlignment="center"
android:textColor="?riotx_text_secondary"
android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -45,6 +47,7 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/keys_backup_passphrase_enter_til"
style="@style/VectorTextInputLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -88,6 +91,7 @@
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/keys_backup_passphrase_confirm_til"
style="@style/VectorTextInputLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
@ -109,7 +113,7 @@
</com.google.android.material.textfield.TextInputLayout>
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_setup_step2_button"
style="@style/VectorButtonStyle"
android:layout_marginTop="16dp"
@ -132,14 +136,15 @@
android:layout_marginRight="16dp"
android:text="@string/keys_backup_setup_step1_recovery_key_alternative"
android:textAlignment="center"
android:textColor="?riotx_text_primary"
app:layout_constraintTop_toBottomOf="@+id/keys_backup_setup_step2_button" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_setup_step2_skip_button"
style="@style/VectorButtonStyleFlat"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:text="@string/keys_backup_setup_step2_skip_button_title"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

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

@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="60dp"
android:src="@drawable/backup_keys"
android:tint="?android:attr/textColorTertiary" />
android:tint="?riotx_text_primary" />
<TextView
android:id="@+id/keys_backup_setup_step3_success_title"
@ -30,6 +30,7 @@
android:layout_marginRight="@dimen/layout_horizontal_margin"
android:text="@string/keys_backup_setup_step3_success_title"
android:textAlignment="center"
android:textColor="?riotx_text_primary"
android:textSize="17sp"
android:textStyle="bold"
android:visibility="gone"
@ -45,6 +46,7 @@
android:layout_marginRight="@dimen/layout_horizontal_margin"
android:text="@string/keys_backup_setup_step3_text_line1"
android:textAlignment="center"
android:textColor="?riotx_text_secondary"
android:textSize="15sp" />
<TextView
@ -55,6 +57,7 @@
android:layout_marginTop="20dp"
android:layout_marginRight="@dimen/layout_horizontal_margin"
android:textAlignment="center"
android:textColor="?riotx_text_secondary"
android:textSize="15sp"
tools:text="@string/keys_backup_setup_step3_text_line2" />
@ -66,19 +69,20 @@
android:layout_margin="@dimen/layout_horizontal_margin"
android:fontFamily="monospace"
android:textAlignment="center"
android:textColor="?riotx_text_primary"
android:textSize="20sp"
android:visibility="gone"
tools:text="HHWJ Y8DK RDR4\nBQEN FQ4V M4F8\nBQEN FQ4V M4A8"
tools:visibility="visible" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_setup_step3_copy_button"
style="@style/VectorButtonStyleFlat"
android:layout_gravity="center"
android:text="@string/keys_backup_setup_step3_copy_button_title" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_setup_step3_button"
style="@style/VectorButtonStyle"
android:layout_gravity="center"

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

@ -17,6 +17,7 @@
android:layout_margin="@dimen/layout_horizontal_margin"
android:layout_marginTop="@dimen/layout_vertical_margin"
android:gravity="center"
android:textColor="?riotx_text_primary"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@ -31,7 +32,7 @@
android:layout_margin="@dimen/layout_vertical_margin"
android:gravity="center"
android:text="@string/sas_security_advise"
android:textColor="?android:attr/textColorSecondary"
android:textColor="?riotx_text_secondary"
android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -42,6 +43,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="?riotx_text_primary"
android:textSize="28sp"
android:textStyle="bold"
android:visibility="invisible"
@ -96,7 +98,7 @@
</GridLayout>
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/sas_request_continue_button"
style="@style/VectorButtonStyle"
android:layout_margin="@dimen/layout_vertical_margin"
@ -106,7 +108,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sas_emoji_grid" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/sas_request_cancel_button"
style="@style/VectorButtonStyleFlat"
android:layout_margin="@dimen/layout_vertical_margin"

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

@ -22,6 +22,7 @@
android:gravity="center"
android:text="@string/sas_incoming_request_title"
android:textAlignment="center"
android:textColor="?riotx_text_primary"
android:textSize="17sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@ -44,6 +45,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textAlignment="center"
android:textColor="?riotx_text_primary"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@ -56,6 +58,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAlignment="center"
android:textColor="?riotx_text_secondary"
android:textSize="13sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -68,6 +71,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:textAlignment="center"
android:textColor="?riotx_text_secondary"
android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -81,6 +85,7 @@
android:layout_margin="@dimen/layout_vertical_margin"
android:text="@string/sas_incoming_request_description"
android:textAlignment="center"
android:textColor="?riotx_text_secondary"
android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -93,12 +98,13 @@
android:layout_margin="@dimen/layout_vertical_margin"
android:text="@string/sas_incoming_request_description_2"
android:textAlignment="center"
android:textColor="?riotx_text_secondary"
android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/sas_incoming_request_description" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/sas_request_continue_button"
style="@style/VectorButtonStyle"
android:layout_marginTop="@dimen/layout_vertical_margin_big"
@ -111,7 +117,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sas_incoming_request_description_2" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/sas_request_cancel_button"
style="@style/VectorButtonStyleFlat"
android:layout_gravity="end"

13
vector/src/main/res/layout/fragment_sas_verification_start.xml
View file

@ -16,6 +16,7 @@
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:text="@string/sas_verify_title"
android:textColor="?riotx_text_primary"
android:textSize="16sp"
android:textStyle="bold" />
@ -25,7 +26,7 @@
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:text="@string/sas_security_advise"
android:textColor="?android:attr/textColorSecondary" />
android:textColor="?riotx_text_secondary" />
<LinearLayout
android:layout_width="wrap_content"
@ -33,7 +34,7 @@
android:layout_gravity="end"
android:orientation="horizontal">
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/sas_cancel_button"
style="@style/VectorButtonStyleFlat"
android:layout_marginEnd="8dp"
@ -46,7 +47,7 @@
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:layout_marginRight="@dimen/layout_horizontal_margin">
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/sas_start_button"
style="@style/VectorButtonStyle"
android:minWidth="160dp"
@ -63,11 +64,9 @@
</FrameLayout>
</LinearLayout>
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/sas_legacy_verification"
style="@style/VectorButtonStyleFlat"
android:layout_gravity="end"
@ -81,7 +80,7 @@
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:text="@string/sas_verifying_keys"
android:textColor="?android:attr/textColorSecondary"
android:textColor="?riotx_text_secondary"
android:visibility="gone"
tools:visibility="visible" />

5
vector/src/main/res/layout/fragment_sas_verification_verified.xml
View file

@ -18,6 +18,7 @@
android:layout_marginEnd="20dp"
android:layout_marginBottom="16dp"
android:text="@string/sas_verified"
android:textColor="?riotx_text_primary"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@ -31,6 +32,7 @@
android:layout_margin="@dimen/layout_vertical_margin"
android:gravity="center"
android:text="@string/sas_verified_successful"
android:textColor="?riotx_text_secondary"
android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -43,12 +45,13 @@
android:layout_margin="@dimen/layout_vertical_margin"
android:gravity="center"
android:text="@string/sas_verified_successful_description"
android:textColor="?riotx_text_secondary"
android:textSize="15sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/sas_verification_verified_description" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/sas_verification_verified_done_button"
style="@style/VectorButtonStyle"
android:layout_marginTop="@dimen/layout_vertical_margin_big"

5
vector/src/main/res/layout/fragment_settings_notifications_troubleshoot.xml
View file

@ -38,6 +38,7 @@
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:text="@string/settings_troubleshoot_diagnostic"
android:textColor="?riotx_text_primary"
android:textStyle="bold" />
<TextView
@ -58,7 +59,7 @@
android:gravity="center_vertical|end"
android:orientation="horizontal">
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/troubleshoot_run_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -72,7 +73,7 @@
tools:enabled="false"
tools:visibility="visible" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/troubleshoot_summ_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

3
vector/src/main/res/layout/item_error_retry.xml
View file

@ -12,11 +12,12 @@
android:id="@+id/itemErrorRetryText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/riotx_notice"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Error" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/itemErrorRetryButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@ -17,6 +17,7 @@
android:layout_marginRight="16dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:textColor="?riotx_text_primary"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/item_generic_description_text"
app:layout_constraintEnd_toStartOf="@+id/item_generic_barrier"
@ -35,7 +36,7 @@
android:layout_marginRight="16dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:textColor="?android:attr/textColorSecondary"
android:textColor="?riotx_text_secondary"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/item_generic_action_button"
app:layout_constraintEnd_toStartOf="@+id/item_generic_barrier"
@ -75,22 +76,17 @@
app:layout_constraintTop_toTopOf="@+id/item_generic_title_text"
tools:visibility="visible" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/item_generic_action_button"
style="@style/VectorButtonStyle"
android:layout_width="wrap_content"
android:layout_height="36dp"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginBottom="16dp"
android:background="?attr/colorAccent"
android:padding="8dp"
android:textColor="@android:color/white"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/item_generic_description_text"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/item_generic_description_text"
tools:text="@string/settings_troubleshoot_test_device_settings_quickfix"
tools:visibility="visible" />

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

@ -7,7 +7,7 @@
android:gravity="end"
android:orientation="vertical">
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_settings_footer_button1"
style="@style/VectorButtonStyle"
android:layout_marginTop="16dp"
@ -18,7 +18,7 @@
tools:text="@string/keys_backup_settings_restore_backup_button"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatButton
<com.google.android.material.button.MaterialButton
android:id="@+id/keys_backup_settings_footer_button2"
style="@style/VectorButtonStyle"
android:layout_marginTop="16dp"

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

@ -28,6 +28,7 @@
android:layout_marginRight="16dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:textColor="?riotx_text_primary"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/troubleshootTestDescription"
@ -59,8 +60,9 @@
tools:text="@string/settings_troubleshoot_test_device_settings_failed"
tools:visibility="visible" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/troubleshootTestButton"
style="@style/VectorButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"

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

@ -57,7 +57,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inviteIdentifierView" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/inviteRejectView"
style="@style/VectorButtonStyleFlat"
android:layout_width="wrap_content"
@ -72,7 +72,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/inviteLabelView" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/inviteAcceptView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

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

@ -5,7 +5,7 @@
android:layout_height="wrap_content"
tools:parentTag="android.widget.FrameLayout">
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/buttonStateButtonFlat"
style="@style/VectorButtonStyleFlat"
android:layout_width="wrap_content"

3
vector/src/main/res/layout/view_keys_backup_banner.xml
View file

@ -15,7 +15,7 @@
android:layout_marginStart="19dp"
android:layout_marginLeft="19dp"
android:src="@drawable/key_small"
android:tint="?android:textColorTertiary"
android:tint="?riotx_text_primary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -27,6 +27,7 @@
android:layout_marginStart="27dp"
android:layout_marginLeft="27dp"
android:text="@string/keys_backup_banner_setup_line1"
android:textColor="?riotx_text_primary"
android:textSize="15sp"
app:layout_constraintBottom_toTopOf="@id/view_keys_backup_banner_text_2"
app:layout_constraintEnd_toStartOf="@id/view_keys_backup_banner_barrier"

5
vector/src/main/res/layout/view_state.xml
View file

@ -33,12 +33,13 @@
tools:text="Une erreur est survenue" />
<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/errorRetryView"
android:layout_width="190dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="8dp"
android:minWidth="190dp"
android:text="@string/global_retry" />
</LinearLayout>

4
vector/src/main/res/values/text_appearances.xml
View file

@ -27,14 +27,14 @@
<item name="android:textSize">14sp</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">?riotx_text_primary</item>
<item name="android:textColor">?riotx_text_secondary</item>
</style>
<style name="TextAppearance.Vector.Subtitle2" parent="TextAppearance.AppCompat">
<item name="android:textSize">14sp</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textStyle">normal</item>
<item name="android:textColor">?riotx_text_primary</item>
<item name="android:textColor">?riotx_text_secondary</item>
</style>
</resources>