Use round room and user avatars and rounded corner space avatar

2024-11-21 08:55:42 +03:00 · 2021-05-10 22:34:13 +02:00 · 2021-05-10 22:34:13 +02:00 · 3e66988b6a
commit 3e66988b6a
parent 5631a4714e
81 changed files with 70 additions and 72 deletions
--- a/vector/sampledata/room_round_avatars/0_element_rainbow.png
+++ b/vector/sampledata/room_round_avatars/0_element_rainbow.png
--- a/vector/sampledata/room_round_avatars/element_black.png
+++ b/vector/sampledata/room_round_avatars/element_black.png
--- a/vector/sampledata/room_round_avatars/element_ems.png
+++ b/vector/sampledata/room_round_avatars/element_ems.png
--- a/vector/sampledata/room_round_avatars/element_multi.png
+++ b/vector/sampledata/room_round_avatars/element_multi.png
--- a/vector/sampledata/room_round_avatars/element_sky.png
+++ b/vector/sampledata/room_round_avatars/element_sky.png
--- a/vector/sampledata/room_round_avatars/element_verde.png
+++ b/vector/sampledata/room_round_avatars/element_verde.png
--- a/vector/sampledata/room_round_avatars/element_web.png
+++ b/vector/sampledata/room_round_avatars/element_web.png
--- a/vector/sampledata/room_round_avatars/element_x.png
+++ b/vector/sampledata/room_round_avatars/element_x.png
--- a/vector/sampledata/room_round_avatars/matrix.png
+++ b/vector/sampledata/room_round_avatars/matrix.png
--- a/vector/sampledata/room_round_avatars/new_vector.png
+++ b/vector/sampledata/room_round_avatars/new_vector.png
--- a/vector/sampledata/room_round_avatars/ops.png
+++ b/vector/sampledata/room_round_avatars/ops.png
--- a/vector/sampledata/room_round_avatars/write_club.png
+++ b/vector/sampledata/room_round_avatars/write_club.png
--- a/vector/sampledata/space_avatars/car.png
+++ b/vector/sampledata/space_avatars/car.png
--- a/vector/sampledata/space_avatars/face.png
+++ b/vector/sampledata/space_avatars/face.png
--- a/vector/sampledata/space_avatars/london.png
+++ b/vector/sampledata/space_avatars/london.png
--- a/vector/sampledata/space_avatars/paris.png
+++ b/vector/sampledata/space_avatars/paris.png
--- a/vector/sampledata/space_avatars/runner.png
+++ b/vector/sampledata/space_avatars/runner.png
--- a/vector/sampledata/space_avatars/snow.png
+++ b/vector/sampledata/space_avatars/snow.png
--- a/vector/sampledata/user_round_avatars/amandine.png
+++ b/vector/sampledata/user_round_avatars/amandine.png
--- a/vector/sampledata/user_round_avatars/ben.png
+++ b/vector/sampledata/user_round_avatars/ben.png
--- a/vector/sampledata/user_round_avatars/benoit.png
+++ b/vector/sampledata/user_round_avatars/benoit.png
--- a/vector/sampledata/user_round_avatars/bruno.png
+++ b/vector/sampledata/user_round_avatars/bruno.png
--- a/vector/sampledata/user_round_avatars/gaelle.png
+++ b/vector/sampledata/user_round_avatars/gaelle.png
--- a/vector/sampledata/user_round_avatars/manu.png
+++ b/vector/sampledata/user_round_avatars/manu.png
--- a/vector/sampledata/user_round_avatars/matthew.png
+++ b/vector/sampledata/user_round_avatars/matthew.png
--- a/vector/sampledata/user_round_avatars/nad.png
+++ b/vector/sampledata/user_round_avatars/nad.png
--- a/vector/sampledata/user_round_avatars/nique.png
+++ b/vector/sampledata/user_round_avatars/nique.png
--- a/vector/sampledata/user_round_avatars/toml.png
+++ b/vector/sampledata/user_round_avatars/toml.png
--- a/vector/sampledata/user_round_avatars/victor.png
+++ b/vector/sampledata/user_round_avatars/victor.png
--- a/vector/src/main/res/layout/activity_call.xml
+++ b/vector/src/main/res/layout/activity_call.xml
@ -79,7 +79,7 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <ImageView
        android:id="@+id/smallIsHeldIcon"
--- a/vector/src/main/res/layout/alerter_incoming_call_layout.xml
+++ b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
@ -18,7 +18,7 @@
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <TextView
        android:id="@+id/incomingCallNameView"
--- a/vector/src/main/res/layout/alerter_verification_layout.xml
+++ b/vector/src/main/res/layout/alerter_verification_layout.xml
@ -17,7 +17,7 @@
        app:layout_constraintEnd_toStartOf="@+id/alerter_texts"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <androidx.appcompat.widget.AppCompatImageView
        android:id="@+id/ivIcon"
--- a/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
+++ b/vector/src/main/res/layout/bottom_sheet_invited_to_space.xml
@ -31,7 +31,7 @@
                app:layout_constraintHorizontal_bias="0"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="parent"
-                tools:src="@tools:sample/avatars" />
+                tools:src="@sample/user_round_avatars" />


            <TextView
--- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
+++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml
@ -46,7 +46,7 @@
            android:layout_height="40dp"
            android:layout_gravity="center"
            android:contentDescription="@string/avatar"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />

        <LinearLayout
            android:layout_width="0dp"
--- a/vector/src/main/res/layout/bottom_sheet_space_settings.xml
+++ b/vector/src/main/res/layout/bottom_sheet_space_settings.xml
@ -23,7 +23,7 @@
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/space_avatars" />

        <TextView
            android:id="@+id/spaceNameView"
--- a/vector/src/main/res/layout/bottom_sheet_verification.xml
+++ b/vector/src/main/res/layout/bottom_sheet_verification.xml
@ -26,7 +26,7 @@
            android:scaleType="centerCrop"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />

        <im.vector.app.core.ui.views.ShieldImageView
            android:id="@+id/otherUserShield"
--- a/vector/src/main/res/layout/composer_layout.xml
+++ b/vector/src/main/res/layout/composer_layout.xml
@ -37,8 +37,7 @@
        android:layout_width="0dp"
        android:layout_height="0dp"
        android:contentDescription="@string/avatar"
-        tools:ignore="MissingConstraints"
-        tools:src="@tools:sample/avatars" />
+        tools:ignore="MissingConstraints" />

    <TextView
        android:id="@+id/composerRelatedMessageTitle"
--- a/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
@ -45,8 +45,7 @@
        android:contentDescription="@string/avatar"
        android:visibility="invisible"
        app:layout_constraintBottom_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="parent"
-        tools:src="@tools:sample/avatars" />
+        app:layout_constraintEnd_toStartOf="parent" />

    <TextView
        android:id="@+id/composerRelatedMessageTitle"
--- a/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
+++ b/vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
@ -47,7 +47,7 @@
        app:layout_constraintEnd_toStartOf="@+id/composerRelatedMessageTitle"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="@id/composerRelatedMessageTitle"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <TextView
        android:id="@+id/composerRelatedMessageTitle"
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@ -40,7 +40,7 @@
            android:transitionName="profile"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />

        <TextView
            android:id="@+id/homeDrawerUsernameView"
--- a/vector/src/main/res/layout/fragment_matrix_profile.xml
+++ b/vector/src/main/res/layout/fragment_matrix_profile.xml
@ -58,7 +58,7 @@
                        app:layout_constraintStart_toStartOf="parent"
                        app:layout_constraintTop_toTopOf="parent"
                        tools:alpha="1"
-                        tools:src="@tools:sample/avatars" />
+                        tools:src="@sample/room_round_avatars" />

                    <im.vector.app.core.ui.views.ShieldImageView
                        android:id="@+id/matrixProfileDecorationToolbarAvatarImageView"
--- a/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_room_space_card.xml
@ -26,7 +26,7 @@
            app:layout_constraintHorizontal_bias="0"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/room_round_avatars" />

        <ImageView
            android:id="@+id/matrixToBetaTag"
@ -128,7 +128,7 @@
            app:layout_constraintCircleAngle="90"
            app:layout_constraintCircleRadius="20dp"
            tools:ignore="MissingConstraints"
-            tools:src="@tools:sample/avatars"
+            tools:src="@sample/user_round_avatars"
            tools:visibility="gone" />

        <ImageView
@ -140,7 +140,7 @@
            app:layout_constraintCircleAngle="90"
            app:layout_constraintCircleRadius="20dp"
            tools:ignore="MissingConstraints"
-            tools:src="@tools:sample/avatars"
+            tools:src="@sample/user_round_avatars"
            tools:visibility="gone" />

        <ImageView
@ -152,7 +152,7 @@
            app:layout_constraintCircleAngle="90"
            app:layout_constraintCircleRadius="20dp"
            tools:ignore="MissingConstraints"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />

        <ImageView
            android:id="@+id/knownMember2"
@ -163,7 +163,7 @@
            app:layout_constraintCircleAngle="90"
            app:layout_constraintCircleRadius="20dp"
            tools:ignore="MissingConstraints"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />

        <ImageView
            android:id="@+id/knownMember1"
@ -173,7 +173,7 @@
            android:contentDescription="@string/avatar"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@id/matrixToCardDescText"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />

        <TextView
            android:id="@+id/peopleYouMayKnowText"
--- a/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
+++ b/vector/src/main/res/layout/fragment_matrix_to_user_card.xml
@ -17,7 +17,7 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <TextView
        android:id="@+id/matrixToCardNameText"
--- a/vector/src/main/res/layout/fragment_room_detail.xml
+++ b/vector/src/main/res/layout/fragment_room_detail.xml
@ -32,7 +32,7 @@
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="parent"
-                tools:src="@tools:sample/avatars" />
+                tools:src="@sample/room_round_avatars" />

            <im.vector.app.core.ui.views.ShieldImageView
                android:id="@+id/roomToolbarDecorationImageView"
--- a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
+++ b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml
@ -32,7 +32,7 @@
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@tools:sample/avatars" />
+                    tools:src="@sample/room_round_avatars" />

                <TextView
                    android:id="@+id/roomPreviewNoPreviewToolbarTitle"
@ -82,7 +82,7 @@
                    android:layout_height="128dp"
                    android:layout_marginTop="60dp"
                    android:importantForAccessibility="no"
-                    tools:src="@tools:sample/avatars" />
+                    tools:src="@sample/room_round_avatars" />

                <TextView
                    android:id="@+id/roomPreviewNoPreviewName"
--- a/vector/src/main/res/layout/fragment_room_setting_generic.xml
+++ b/vector/src/main/res/layout/fragment_room_setting_generic.xml
@ -32,7 +32,7 @@
                app:layout_constraintBottom_toBottomOf="parent"
                app:layout_constraintStart_toStartOf="parent"
                app:layout_constraintTop_toTopOf="parent"
-                tools:src="@tools:sample/avatars" />
+                tools:src="@sample/room_round_avatars" />

            <im.vector.app.core.ui.views.ShieldImageView
                android:id="@+id/roomSettingsDecorationToolbarAvatarImageView"
--- a/vector/src/main/res/layout/fragment_room_uploads.xml
+++ b/vector/src/main/res/layout/fragment_room_uploads.xml
@ -37,7 +37,7 @@
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@tools:sample/avatars" />
+                    tools:src="@sample/room_round_avatars" />

                <im.vector.app.core.ui.views.ShieldImageView
                    android:id="@+id/roomUploadsDecorationToolbarAvatarImageView"
--- a/vector/src/main/res/layout/fragment_space_preview.xml
+++ b/vector/src/main/res/layout/fragment_space_preview.xml
@ -46,7 +46,7 @@
                    app:layout_constraintBottom_toBottomOf="parent"
                    app:layout_constraintStart_toStartOf="parent"
                    app:layout_constraintTop_toTopOf="parent"
-                    tools:src="@tools:sample/avatars" />
+                    tools:src="@sample/space_avatars" />

                <TextView
                    android:id="@+id/roomPreviewNoPreviewToolbarTitle"
--- a/vector/src/main/res/layout/fragment_user_code_show.xml
+++ b/vector/src/main/res/layout/fragment_user_code_show.xml
@ -69,7 +69,7 @@
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="@id/showUserCodeCardTopBarrier"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />

        <androidx.constraintlayout.widget.Barrier
            android:id="@+id/showUserCodeCardTopBarrier"
--- a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
+++ b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml
@ -14,7 +14,7 @@
        android:layout_height="28dp"
        android:layout_gravity="center_vertical"
        android:importantForAccessibility="no"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <LinearLayout
        android:layout_width="match_parent"
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@ -20,7 +20,7 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintVertical_bias="0"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <TextView
        android:id="@+id/bottom_sheet_message_preview_sender"
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@ -23,7 +23,7 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        app:layout_constraintVertical_bias="0"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />

    <TextView
        android:id="@+id/bottomSheetRoomPreviewName"
--- a/vector/src/main/res/layout/item_breadcrumbs.xml
+++ b/vector/src/main/res/layout/item_breadcrumbs.xml
@ -34,7 +34,7 @@
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
        tools:ignore="ContentDescription"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />

    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
        android:id="@+id/breadcrumbsUnreadCounterBadgeView"
--- a/vector/src/main/res/layout/item_contact_main.xml
+++ b/vector/src/main/res/layout/item_contact_main.xml
@ -18,7 +18,7 @@
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <TextView
        android:id="@+id/contactDisplayName"
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@ -25,7 +25,7 @@
            android:layout_width="40dp"
            android:layout_height="40dp"
            android:contentDescription="@string/avatar"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />

        <ImageView
            android:id="@+id/createDirectRoomUserAvatarChecked"
--- a/vector/src/main/res/layout/item_display_read_receipt.xml
+++ b/vector/src/main/res/layout/item_display_read_receipt.xml
@ -17,7 +17,7 @@
        android:layout_height="32dp"
        android:layout_marginEnd="8dp"
        android:contentDescription="@string/avatar"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <TextView
        android:id="@+id/readReceiptName"
--- a/vector/src/main/res/layout/item_editable_avatar.xml
+++ b/vector/src/main/res/layout/item_editable_avatar.xml
@ -34,7 +34,7 @@
            android:importantForAccessibility="no"
            android:scaleType="center"
            tools:alpha="0.3"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />

    </FrameLayout>

--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@ -21,7 +21,7 @@
        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />

    <TextView
        android:id="@+id/groupNameView"
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@ -25,7 +25,7 @@
            android:layout_width="40dp"
            android:layout_height="40dp"
            android:contentDescription="@string/avatar"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />

        <ImageView
            android:id="@+id/knownUserAvatarChecked"
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@ -24,7 +24,7 @@
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <im.vector.app.core.ui.views.ShieldImageView
        android:id="@+id/matrixItemAvatarDecoration"
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@ -24,7 +24,7 @@
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <im.vector.app.core.ui.views.ShieldImageView
        android:id="@+id/matrixItemAvatarDecoration"
--- a/vector/src/main/res/layout/item_public_room.xml
+++ b/vector/src/main/res/layout/item_public_room.xml
@ -21,7 +21,7 @@
        app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />

    <TextView
        android:id="@+id/itemPublicRoomName"
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@ -35,7 +35,7 @@
            android:layout_width="56dp"
            android:layout_height="56dp"
            android:contentDescription="@string/avatar"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/room_round_avatars" />

        <ImageView
            android:id="@+id/roomAvatarCheckedImageView"
--- a/vector/src/main/res/layout/item_room_invitation.xml
+++ b/vector/src/main/res/layout/item_room_invitation.xml
@ -19,7 +19,7 @@
        android:contentDescription="@string/avatar"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />

    <!-- Margin bottom does not work, so I use space -->
    <Space
--- a/vector/src/main/res/layout/item_room_to_add_in_space.xml
+++ b/vector/src/main/res/layout/item_room_to_add_in_space.xml
@ -20,7 +20,7 @@
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />

    <TextView
        android:id="@+id/itemAddRoomRoomNameText"
--- a/vector/src/main/res/layout/item_search_result.xml
+++ b/vector/src/main/res/layout/item_search_result.xml
@ -15,7 +15,7 @@
        android:contentDescription="@string/avatar"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <TextView
        android:id="@+id/messageMemberNameView"
--- a/vector/src/main/res/layout/item_space.xml
+++ b/vector/src/main/res/layout/item_space.xml
@ -31,7 +31,7 @@
        app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
        app:layout_constraintStart_toEndOf="@id/indent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/space_avatars" />

    <im.vector.app.features.home.room.list.UnreadCounterBadgeView
        android:id="@+id/groupCounterBadge"
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@ -37,7 +37,7 @@
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
            tools:ignore="MissingPrefix"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/room_round_avatars" />

        <TextView
            android:id="@+id/childRoomName"
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@ -32,7 +32,7 @@
        app:layout_constraintStart_toEndOf="@id/childSpaceTab"
        app:layout_constraintTop_toTopOf="@id/childSpaceName"
        tools:ignore="MissingPrefix"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/space_avatars" />

    <View
        android:layout_width="2dp"
--- a/vector/src/main/res/layout/item_suggested_room.xml
+++ b/vector/src/main/res/layout/item_suggested_room.xml
@ -22,7 +22,7 @@
            android:layout_width="56dp"
            android:layout_height="56dp"
            android:contentDescription="@string/avatar"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/room_round_avatars" />

    </FrameLayout>

--- a/vector/src/main/res/layout/item_timeline_event_base.xml
+++ b/vector/src/main/res/layout/item_timeline_event_base.xml
@ -22,7 +22,7 @@
        android:layout_marginStart="8dp"
        android:layout_marginTop="4dp"
        android:contentDescription="@string/avatar"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <TextView
        android:id="@+id/messageMemberNameView"
--- a/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_call_tile_stub.xml
@ -12,7 +12,7 @@
        android:layout_height="40dp"
        android:layout_gravity="center_horizontal"
        android:contentDescription="@string/avatar"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <TextView
        android:id="@+id/itemCallCreatorNameTextView"
--- a/vector/src/main/res/layout/item_unknown_room.xml
+++ b/vector/src/main/res/layout/item_unknown_room.xml
@ -21,7 +21,7 @@
        app:layout_constraintBottom_toTopOf="@+id/itemPublicRoomBottomSeparator"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />

    <TextView
        android:id="@+id/itemUnknownRoomName"
--- a/vector/src/main/res/layout/item_user.xml
+++ b/vector/src/main/res/layout/item_user.xml
@ -19,7 +19,7 @@
        android:contentDescription="@string/avatar"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <TextView
        android:id="@+id/itemUserId"
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@ -17,7 +17,7 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <TextView
        android:id="@+id/inviteNameView"
--- a/vector/src/main/res/layout/vector_message_merge_avatar_list.xml
+++ b/vector/src/main/res/layout/vector_message_merge_avatar_list.xml
@ -12,7 +12,7 @@
        android:adjustViewBounds="true"
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <ImageView
        android:id="@+id/mels_list_avatar_2"
@ -23,7 +23,7 @@
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
        tools:ignore="NegativeMargin"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <ImageView
        android:id="@+id/mels_list_avatar_3"
@ -34,7 +34,7 @@
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
        tools:ignore="NegativeMargin"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <ImageView
        android:id="@+id/mels_list_avatar_4"
@ -45,7 +45,7 @@
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
        tools:ignore="NegativeMargin"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <ImageView
        android:id="@+id/mels_list_avatar_5"
@ -56,6 +56,6 @@
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
        tools:ignore="NegativeMargin"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

 </LinearLayout>
--- a/vector/src/main/res/layout/vector_settings_round_avatar.xml
+++ b/vector/src/main/res/layout/vector_settings_round_avatar.xml
@ -11,7 +11,7 @@
        android:adjustViewBounds="true"
        android:contentDescription="@string/avatar"
        android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <ProgressBar
        android:id="@+id/avatar_update_progress_bar"
--- a/vector/src/main/res/layout/view_read_marker.xml
+++ b/vector/src/main/res/layout/view_read_marker.xml
@ -21,7 +21,7 @@
        android:adjustViewBounds="true"
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <ImageView
        android:id="@+id/receiptAvatar4"
@ -30,7 +30,7 @@
        android:adjustViewBounds="true"
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <ImageView
        android:id="@+id/receiptAvatar3"
@ -39,7 +39,7 @@
        android:adjustViewBounds="true"
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <ImageView
        android:id="@+id/receiptAvatar2"
@ -48,7 +48,7 @@
        android:adjustViewBounds="true"
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <ImageView
        android:id="@+id/receiptAvatar1"
@ -57,6 +57,6 @@
        android:adjustViewBounds="true"
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

 </merge>
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@ -26,7 +26,7 @@
        android:adjustViewBounds="true"
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <ImageView
        android:id="@+id/receiptAvatar4"
@ -36,7 +36,7 @@
        android:adjustViewBounds="true"
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <ImageView
        android:id="@+id/receiptAvatar3"
@ -46,7 +46,7 @@
        android:adjustViewBounds="true"
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <ImageView
        android:id="@+id/receiptAvatar2"
@ -56,7 +56,7 @@
        android:adjustViewBounds="true"
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

    <ImageView
        android:id="@+id/receiptAvatar1"
@ -66,6 +66,6 @@
        android:adjustViewBounds="true"
        android:importantForAccessibility="no"
        android:scaleType="centerCrop"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/user_round_avatars" />

 </merge>
--- a/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_member_profile_header.xml
@ -28,7 +28,7 @@
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintVertical_chainStyle="spread_inside"
-            tools:src="@tools:sample/avatars" />
+            tools:src="@sample/user_round_avatars" />

        <im.vector.app.core.ui.views.ShieldImageView
            android:id="@+id/memberProfileDecorationImageView"
--- a/vector/src/main/res/layout/view_stub_room_profile_header.xml
+++ b/vector/src/main/res/layout/view_stub_room_profile_header.xml
@ -18,7 +18,7 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@sample/room_round_avatars" />

    <im.vector.app.core.ui.views.ShieldImageView
        android:id="@+id/roomProfileDecorationImageView"