textSize 12sp -> Caption or Default

This commit is contained in:
Benoit Marty 2021-06-14 21:22:56 +02:00
parent 1793885ec6
commit 070dae78e7
34 changed files with 70 additions and 76 deletions

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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"
xmlns:tools="http://schemas.android.com/tools">
android:layout_height="match_parent">
<ImageView
android:id="@+id/videoThumbnailImage"
@ -19,19 +19,18 @@
<ImageView
android:id="@+id/videoControlIcon"
android:layout_centerInParent="true"
android:visibility="gone"
tools:visibility="visible"
android:layout_width="44dp"
android:layout_height="44dp"
/>
android:layout_centerInParent="true"
android:visibility="gone"
tools:visibility="visible" />
<ProgressBar
android:layout_centerInParent="true"
android:id="@+id/videoLoaderProgress"
style="?android:attr/progressBarStyle"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerInParent="true"
android:visibility="invisible"
tools:visibility="visible" />

View File

@ -46,7 +46,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:textSize="12sp"
android:textAppearance="@style/VectorTextAppearanceCaption"
tools:text="verification_emoji_spanner" />
</LinearLayout>

View File

@ -96,8 +96,8 @@
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:text="@string/send_bug_report_description_in_english"
android:textColor="?vctr_content_secondary"
android:textSize="12sp" />
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />
<TextView
android:id="@+id/bug_report_logs_description"

View File

@ -16,22 +16,19 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/encryption_information_verify_device_warning"
android:textSize="12sp" />
android:text="@string/encryption_information_verify_device_warning" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/encryption_information_device_name"
android:textSize="12sp"
android:textStyle="bold" />
<TextView
android:id="@+id/encrypted_device_info_device_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="12sp"
tools:text="a device name" />
<TextView
@ -39,14 +36,12 @@
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/encryption_information_device_id"
android:textSize="12sp"
android:textStyle="bold" />
<TextView
android:id="@+id/encrypted_device_info_device_id"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="12sp"
tools:text="a device id" />
<TextView
@ -54,21 +49,20 @@
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/encryption_information_device_key"
android:textSize="12sp"
android:textStyle="bold" />
<TextView
android:id="@+id/encrypted_device_info_device_key"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="12sp"
tools:text="a device key" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/encryption_information_verify_device_warning2"
android:textSize="12sp" />
android:text="@string/encryption_information_verify_device_warning2" />
</LinearLayout>
</ScrollView>

View File

@ -17,8 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/devices_delete_dialog_text"
android:textSize="12sp" />
android:text="@string/devices_delete_dialog_text" />
<FrameLayout
android:layout_width="match_parent"

View File

@ -55,7 +55,8 @@
android:drawablePadding="4dp"
android:gravity="center_vertical"
android:text="@string/bootstrap_dont_reuse_pwd"
android:textSize="12sp"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
app:drawableStartCompat="@drawable/ic_alert_triangle"
app:drawableTint="?colorError" />

View File

@ -13,7 +13,6 @@
android:hint="@string/dev_tools_event_content_hint"
android:inputType="textMultiLine"
android:scrollHorizontally="true"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

View File

@ -89,8 +89,8 @@
android:layout_alignParentEnd="true"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
app:layout_constraintBaseline_toBaselineOf="@+id/loginAccountCreatedMemberName"
app:layout_constraintEnd_toEndOf="parent"
tools:text="@tools:sample/date/hhmm" />

View File

@ -16,8 +16,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
android:textSize="12sp"
android:textStyle="bold"
tools:text="/invite" />
@ -29,8 +29,8 @@
android:layout_marginStart="5dp"
android:layout_toEndOf="@+id/commandName"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
android:textStyle="italic"
tools:text="&lt;user-id&gt;" />
@ -42,8 +42,8 @@
android:layout_alignParentStart="true"
android:layout_gravity="center_vertical"
android:maxLines="2"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
tools:text="@string/command_description_invite_user" />
</RelativeLayout>

View File

@ -31,8 +31,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
android:textSize="12sp"
android:textStyle="bold"
tools:text="name" />
@ -44,8 +44,8 @@
android:layout_marginTop="2dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
android:visibility="gone"
tools:text="name"
tools:visibility="visible" />

View File

@ -29,8 +29,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
android:textSize="12sp"
android:textStyle="bold"
tools:text="name" />
@ -41,8 +41,8 @@
android:layout_gravity="center_vertical"
android:layout_marginTop="2dp"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
android:visibility="gone"
tools:text="name"
tools:visibility="visible" />

View File

@ -5,5 +5,5 @@
android:background="?android:colorBackground"
android:padding="8dp"
android:text="@string/autocomplete_limited_results"
android:textColor="?vctr_content_secondary"
android:textSize="12sp" />
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />

View File

@ -45,8 +45,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/layout_horizontal_margin"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@id/bottom_sheet_message_preview_sender"
app:layout_constraintEnd_toEndOf="parent"
tools:text="Friday 8pm" />
@ -91,9 +91,9 @@
android:layout_marginBottom="4dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_tertiary"
android:textIsSelectable="false"
android:textSize="12sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/bottom_sheet_message_preview_body"

View File

@ -22,8 +22,8 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="40dp"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:textSize="16sp"
tools:text="Riot X" />
<!---
@ -35,15 +35,14 @@
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/devices_details_name_title"
android:textColor="?vctr_content_secondary"
android:textSize="12sp" />
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />
<TextView
android:id="@+id/itemDeviceDisplayName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?vctr_content_primary"
android:textSize="16sp"
tools:text="Android phone" />
<TextView
@ -52,8 +51,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/devices_details_id_title"
android:textColor="?vctr_content_secondary"
android:textSize="12sp" />
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />
<TextView
android:id="@+id/itemDeviceId"
@ -62,7 +61,6 @@
android:ellipsize="end"
android:maxLines="1"
android:textColor="?vctr_content_primary"
android:textSize="15sp"
tools:text="XUIDERFZAA" />
<TextView
@ -71,15 +69,14 @@
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/devices_details_last_seen_title"
android:textColor="?vctr_content_secondary"
android:textSize="12sp" />
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary" />
<TextView
android:id="@+id/itemDeviceLastSeen"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?vctr_content_primary"
android:textSize="15sp"
tools:text="x.x.x.x @ 01/01 00:00:00" />
</LinearLayout>

View File

@ -56,8 +56,8 @@
android:layout_marginEnd="16dp"
android:drawablePadding="16dp"
android:ellipsize="end"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/actionSecondaryAccessory"

View File

@ -43,8 +43,8 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:textSize="16sp"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@+id/matrixItemSubtitle"
app:layout_constraintEnd_toStartOf="@+id/matrixItemPowerLevelLabel"
@ -61,8 +61,8 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/matrixItemPowerLevelLabel"
@ -76,7 +76,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:textSize="12sp"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/matrixItemEditable"

View File

@ -43,8 +43,8 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:textSize="16sp"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@+id/matrixItemSubtitle"
app:layout_constraintEnd_toStartOf="@+id/matrixItemProgress"
@ -61,8 +61,8 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/matrixItemProgress"

View File

@ -48,14 +48,14 @@
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="1"
android:text="@string/space_suggested"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/itemAddRoomRoomCheckBox"
app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomNameText"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
android:text="@string/space_suggested" />
app:layout_constraintVertical_chainStyle="packed" />
<ImageView
android:id="@+id/itemAddRoomRoomCheckBox"

View File

@ -42,8 +42,8 @@
android:layout_alignBaseline="@+id/messageMemberNameView"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/messageMemberNameView"
app:layout_constraintEnd_toEndOf="parent"
tools:text="@tools:sample/date/hhmm" />

View File

@ -15,7 +15,7 @@
android:layout_height="wrap_content"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:textSize="12sp"
android:textAppearance="@style/VectorTextAppearanceCaption"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"

View File

@ -49,8 +49,8 @@
android:layout_alignParentEnd="true"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
tools:text="@tools:sample/date/hhmm" />
<View

View File

@ -39,8 +39,8 @@
android:layout_marginBottom="12dp"
android:drawablePadding="4dp"
android:gravity="center"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
android:textSize="12sp"
tools:text="@string/action_video_call" />
<TextView

View File

@ -30,8 +30,8 @@
android:text="@string/notice_crypto_unable_to_decrypt_merged"
android:textColor="?vctr_content_secondary"
android:textSize="15sp"
app:drawableTint="?vctr_content_secondary"
app:drawableStartCompat="@drawable/ic_clock" />
app:drawableStartCompat="@drawable/ic_clock"
app:drawableTint="?vctr_content_secondary" />
<TextView
@ -44,8 +44,8 @@
android:layout_marginBottom="12dp"
android:gravity="center"
android:text="@string/notice_crypto_unable_to_decrypt_friendly_desc"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
android:textStyle="italic" />

View File

@ -137,8 +137,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
android:visibility="gone"
tools:text="12 votes - Final Results"
tools:visibility="visible" />

View File

@ -29,8 +29,8 @@
android:layout_marginTop="12dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="12dp"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
android:textSize="12sp"
tools:text="Alice (@alice:matrix.org)" />
</LinearLayout>

View File

@ -30,8 +30,8 @@
android:layout_marginTop="12dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="12dp"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
android:textSize="12sp"
tools:text="Alice (@alice:matrix.org)" />
<LinearLayout

View File

@ -36,8 +36,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?colorPrimary"
android:textSize="16sp"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@+id/itemVerificationActionSubTitle"
app:layout_constraintEnd_toStartOf="@+id/itemVerificationActionIcon"
@ -52,8 +52,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
android:visibility="gone"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"

View File

@ -89,8 +89,8 @@
android:layout_marginTop="16dp"
android:gravity="center"
android:text="@string/or_other_mx_capabale_client"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/labelsBarrier" />

View File

@ -11,7 +11,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textSize="12sp"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
tools:text="Information" />
<ProgressBar

View File

@ -41,8 +41,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?colorPrimary"
android:textSize="16sp"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toTopOf="@+id/bottomSheetActionSubTitle"
app:layout_constraintEnd_toStartOf="@+id/bottomSheetActionIcon"
@ -57,8 +57,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textAppearance="@style/VectorTextAppearanceBody"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
android:visibility="gone"
app:layout_constrainedWidth="true"
app:layout_constraintBottom_toBottomOf="parent"

View File

@ -11,7 +11,8 @@
android:layout_height="match_parent"
android:layout_marginEnd="8dp"
android:gravity="center"
android:textSize="12sp"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
tools:text="999+" />
<ImageView

View File

@ -15,7 +15,8 @@
android:importantForAccessibility="no"
android:paddingStart="4dp"
android:paddingEnd="4dp"
android:textSize="12sp"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
tools:text="999+" />
<ImageView

View File

@ -28,8 +28,8 @@
android:layout_marginStart="8dp"
android:layout_marginEnd="4dp"
android:gravity="start"
android:textAppearance="@style/VectorTextAppearanceSubtitle"
android:textColor="?vctr_content_primary"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/subTitle"
app:layout_constraintEnd_toStartOf="@id/rightChevron"
@ -45,8 +45,8 @@
android:layout_marginStart="8dp"
android:layout_marginEnd="4dp"
android:gravity="start"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_secondary"
android:textSize="12sp"
android:textStyle="normal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/rightChevron"

View File

@ -75,7 +75,8 @@
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:gravity="center"
android:textSize="12sp"
android:textAppearance="@style/VectorTextAppearanceCaption"
android:textColor="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@+id/memberProfileStatusView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"