diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml index 46b65ad746..9280784f93 100644 --- a/vector/src/main/res/layout/activity_call.xml +++ b/vector/src/main/res/layout/activity_call.xml @@ -44,11 +44,11 @@ android:layout_marginTop="32dp" android:layout_marginEnd="16dp" android:background="@color/element_background_light" + android:foreground="?attr/selectableItemBackground" android:visibility="gone" + app:cardBackgroundColor="@color/bg_call_screen" app:cardCornerRadius="4dp" app:cardElevation="4dp" - android:foreground="?attr/selectableItemBackground" - app:cardBackgroundColor="@color/bg_call_screen" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" tools:visibility="visible"> @@ -121,8 +121,8 @@ android:layout_marginEnd="@dimen/layout_horizontal_margin" android:layout_marginBottom="8dp" android:gravity="center" + android:textAppearance="@style/VectorTextAppearanceBody" android:textColor="@android:color/white" - android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/participantNameText" @@ -136,7 +136,6 @@ android:layout_margin="8dp" android:gravity="center" android:textColor="?colorSecondary" - android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/callStatusText" diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml index cf29601038..03fd26ecff 100644 --- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml +++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml @@ -70,8 +70,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAlignment="center" + android:textAppearance="@style/VectorTextAppearanceBody" android:textColor="?vctr_content_secondary" - android:textSize="14sp" tools:text="\@foo:matrix.org" /> diff --git a/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml b/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml index 65de227755..129bb294b8 100644 --- a/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml +++ b/vector/src/main/res/layout/fragment_bootstrap_conclusion.xml @@ -17,8 +17,8 @@ android:layout_marginTop="8dp" android:layout_marginEnd="16dp" android:text="@string/bootstrap_cross_signing_success" + android:textAppearance="@style/VectorTextAppearanceBody" android:textColor="?vctr_content_primary" - android:textSize="14sp" app:layout_constraintTop_toTopOf="parent" /> diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml index 05cb3faa6d..7187073061 100644 --- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml +++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml @@ -12,8 +12,8 @@ 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" - android:textSize="14sp" app:layout_constraintBottom_toTopOf="@id/ssss_passphrase_enter_til" app:layout_constraintTop_toTopOf="parent" /> diff --git a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml index f3fdc8c7f6..eea1738669 100644 --- a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml +++ b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml @@ -12,8 +12,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" + android:textAppearance="@style/VectorTextAppearanceBody" android:textColor="?vctr_content_primary" - android:textSize="14sp" app:layout_constraintBottom_toTopOf="@id/bootstrapRecoveryKeyEnterTil" app:layout_constraintTop_toTopOf="parent" tools:text="@string/bootstrap_enter_recovery" /> diff --git a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml index b5ee58c614..9cb08b27e3 100644 --- a/vector/src/main/res/layout/fragment_bootstrap_reauth.xml +++ b/vector/src/main/res/layout/fragment_bootstrap_reauth.xml @@ -12,8 +12,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" + android:textAppearance="@style/VectorTextAppearanceBody" android:textColor="?vctr_content_primary" - android:textSize="14sp" app:layout_constraintBottom_toTopOf="@id/waitingProgress" app:layout_constraintTop_toTopOf="parent" tools:text="@string/re_authentication_activity_title" /> @@ -31,11 +31,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" + android:textAppearance="@style/VectorTextAppearanceBody" android:textColor="?colorError" - android:textSize="14sp" app:layout_constraintBottom_toTopOf="@id/buttonFlow" - app:layout_constraintVertical_chainStyle="packed" app:layout_constraintTop_toBottomOf="@id/waitingProgress" + app:layout_constraintVertical_chainStyle="packed" tools:text="Authentication failed" />