Merge pull request #3310 from vector-im/feature/bma/samples

Improve layout preview regarding avatars

vector/sampledata/messages.json

@@ -1,58 +1,22 @@
 {
   "data": [
     {
-      "displayName": "Long display name useful to test layout with a long display name",
+      "message": "William Shakespeare (bapt. 26 April 1564 – 23 April 1616) was an English poet, playwright and actor, widely regarded as the greatest writer in the English language and the world's greatest dramatist. He is often called England's national poet and the \"Bard of Avon\". His extant works, including collaborations, consist of approximately 39 plays, 154 sonnets, two long narrative poems, and a few other verses, some of uncertain authorship. His plays have been translated into every major living language and are performed more often than those of any other playwright.\n\nShakespeare was born and raised in Stratford-upon-Avon, Warwickshire. At the age of 18, he married Anne Hathaway, with whom he had three children: Susanna and twins Hamnet and Judith. Sometime between 1585 and 1592, he began a successful career in London as an actor, writer, and part-owner of a playing company called the Lord Chamberlain's Men, later known as the King's Men. At age 49 (around 1613), he appears to have retired to Stratford, where he died three years later. Few records of Shakespeare's private life survive; this has stimulated considerable speculation about such matters as his physical appearance, his sexuality, his religious beliefs, and whether the works attributed to him were written by others. Such theories are often criticised for failing to adequately note that few records survive of most commoners of the period.\n\nShakespeare produced most of his known works between 1589 and 1613. His early plays were primarily comedies and histories and are regarded as some of the best work produced in these genres. Until about 1608, he wrote mainly tragedies, among them Hamlet, Othello, King Lear, and Macbeth, all considered to be among the finest works in the English language. In the last phase of his life, he wrote tragicomedies (also known as romances) and collaborated with other playwrights.\n\nMany of Shakespeare's plays were published in editions of varying quality and accuracy in his lifetime. However, in 1623, two fellow actors and friends of Shakespeare's, John Heminges and Henry Condell, published a more definitive text known as the First Folio, a posthumous collected edition of Shakespeare's dramatic works that included all but two of his plays. The volume was prefaced with a poem by Ben Jonson, in which Jonson presciently hails Shakespeare in a now-famous quote as \"not of an age, but for all time\".\n\nThroughout the 20th and 21st centuries, Shakespeare's works have been continually adapted and rediscovered by new movements in scholarship and performance. His plays remain popular and are studied, performed, and reinterpreted through various cultural and political contexts around the world."
-      "mxid": "@longmatrixidbecausesometimesuserschooselongmxid:matrix.org",
-      "message": "William Shakespeare (bapt. 26 April 1564 – 23 April 1616) was an English poet, playwright and actor, widely regarded as the greatest writer in the English language and the world's greatest dramatist. He is often called England's national poet and the \"Bard of Avon\". His extant works, including collaborations, consist of approximately 39 plays, 154 sonnets, two long narrative poems, and a few other verses, some of uncertain authorship. His plays have been translated into every major living language and are performed more often than those of any other playwright.\n\nShakespeare was born and raised in Stratford-upon-Avon, Warwickshire. At the age of 18, he married Anne Hathaway, with whom he had three children: Susanna and twins Hamnet and Judith. Sometime between 1585 and 1592, he began a successful career in London as an actor, writer, and part-owner of a playing company called the Lord Chamberlain's Men, later known as the King's Men. At age 49 (around 1613), he appears to have retired to Stratford, where he died three years later. Few records of Shakespeare's private life survive; this has stimulated considerable speculation about such matters as his physical appearance, his sexuality, his religious beliefs, and whether the works attributed to him were written by others. Such theories are often criticised for failing to adequately note that few records survive of most commoners of the period.\n\nShakespeare produced most of his known works between 1589 and 1613. His early plays were primarily comedies and histories and are regarded as some of the best work produced in these genres. Until about 1608, he wrote mainly tragedies, among them Hamlet, Othello, King Lear, and Macbeth, all considered to be among the finest works in the English language. In the last phase of his life, he wrote tragicomedies (also known as romances) and collaborated with other playwrights.\n\nMany of Shakespeare's plays were published in editions of varying quality and accuracy in his lifetime. However, in 1623, two fellow actors and friends of Shakespeare's, John Heminges and Henry Condell, published a more definitive text known as the First Folio, a posthumous collected edition of Shakespeare's dramatic works that included all but two of his plays. The volume was prefaced with a poem by Ben Jonson, in which Jonson presciently hails Shakespeare in a now-famous quote as \"not of an age, but for all time\".\n\nThroughout the 20th and 21st centuries, Shakespeare's works have been continually adapted and rediscovered by new movements in scholarship and performance. His plays remain popular and are studied, performed, and reinterpreted through various cultural and political contexts around the world.",
-      "roomName": "Matrix HQ",
-      "roomAlias": "#matrix:matrix.org",
-      "spaceName": "Runner's world",
-      "roomTopic": "Welcome to Matrix HQ! Here is the rest of the room topic, with a https://www.example.org url and a phone number: 0102030405 which should not be clickable."
     },
     {
-      "displayName": "benoit",
+      "message": "Hello!"
-      "mxid": "@benoit:matrix.org",
-      "message": "Hello!",
-      "roomName": "Room name very loooooooong with some details",
-      "roomAlias": "#matrix:matrix.org",
-      "spaceName": "Matrix Org",
-      "roomTopic": "Room topic very loooooooong with some details"
     },
     {
-      "displayName": "ganfra",
+      "message": "How are you?"
-      "mxid": "@ganfra:matrix.org",
-      "message": "How are you?",
-      "roomName": "Room name very loooooooong with some details",
-      "roomAlias": "#matrix:matrix.org",
-      "spaceName": "Rennes",
-      "roomTopic": "Room topic very loooooooong with some details"
     },
     {
-      "displayName": "Manu",
+      "message": "Great weather today!"
-      "mxid": "@manu:matrix.org",
-      "message": "Great weather today!",
-      "roomName": "Room name very loooooooong with some details",
-      "roomAlias": "#matrix:matrix.org",
-      "spaceName": "Est London",
-      "roomTopic": "Room topic very loooooooong with some details"
     },
     {
-      "displayName": "Giom",
+      "message": "Let's do a picnic"
-      "mxid": "@giom:matrix.org",
-      "message": "Let's do a picnic",
-      "roomName": "Room name very loooooooong with some details",
-      "roomAlias": "#matrix:matrix.org",
-      "spaceName": "Element HQ",
-      "roomTopic": "Room topic very loooooooong with some details"
     },
     {
-      "displayName": "Nad",
+      "message": "Yes, great idea"
-      "mxid": "@nadonomy:matrix.org",
-      "message": "Yes, great idea",
-      "roomName": "Room name very loooooooong with some details",
-      "roomAlias": "#matrix:matrix.org",
-      "spaceName": "My Company",
-      "roomTopic": "Room topic very loooooooong with some details"
     }
   ]
 }

vector/sampledata/rooms.json

@@ -0,0 +1,14 @@
+{
+  "data": [
+    {
+      "name": "Matrix HQ",
+      "alias": "#matrix:matrix.org",
+      "topic": "Welcome to Matrix HQ! Here is the rest of the room topic, with a https://www.example.org url and a phone number: 0102030405 which should not be clickable."
+    },
+    {
+      "name": "Room name very loooooooong with some details",
+      "alias": "#matrix:matrix.org",
+      "topic": "Room topic very loooooooong with some details"
+    }
+  ]
+}

vector/sampledata/spaces.json

@@ -0,0 +1,28 @@
+{
+  "data": [
+    {
+      "name": "Runner's world",
+      "topic": "Space about running around the world!"
+    },
+    {
+      "name": "Matrix Org",
+      "topic": "Space about matrix.org!"
+    },
+    {
+      "name": "Rennes",
+      "topic": "Venez visiter Rennes!"
+    },
+    {
+      "name": "Est London",
+      "topic": "All about Est London!"
+    },
+    {
+      "name": "Element HQ",
+      "topic": "All about Element!"
+    },
+    {
+      "name": "My Company",
+      "topic": "All about My company!"
+    }
+  ]
+}

vector/sampledata/users.json

@@ -0,0 +1,28 @@
+{
+  "data": [
+    {
+      "displayName": "amandine",
+      "id": "@amandine:matrix.org"
+    },
+    {
+      "displayName": "benoit",
+      "id": "@benoit:matrix.org"
+    },
+    {
+      "displayName": "gaelle",
+      "id": "@gawa:matrix.org"
+    },
+    {
+      "displayName": "Manu",
+      "id": "@manu:matrix.org"
+    },
+    {
+      "displayName": "Matthew",
+      "id": "@matthew:matrix.org"
+    },
+    {
+      "displayName": "Nad",
+      "id": "@nadonomy:matrix.org"
+    }
+  ]
+}

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"
@@ -106,7 +106,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/otherMemberAvatar"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/callStatusText"

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"
@@ -34,7 +34,7 @@
         app:layout_constraintEnd_toStartOf="@+id/incomingCallRejectView"
         app:layout_constraintStart_toEndOf="@id/incomingCallAvatar"
         app:layout_constraintTop_toTopOf="@id/incomingCallAvatar"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/incomingCallKindView"

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"

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
@@ -57,7 +57,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/inviterAvatarImage"
                 app:layout_constraintTop_toBottomOf="@id/inviterText"
-                tools:text="@sample/matrix.json/data/mxid" />
+                tools:text="@sample/users.json/data/id" />
 
 
         </androidx.constraintlayout.widget.ConstraintLayout>

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"

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"
@@ -42,7 +42,7 @@
             app:layout_constraintStart_toEndOf="@id/spaceAvatarImageView"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_chainStyle="packed"
-            tools:text="@sample/matrix.json/data/displayName" />
+            tools:text="@sample/spaces.json/data/name" />
 
         <ImageView
             android:id="@+id/spaceBetaTag"
@@ -70,7 +70,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/spaceAvatarImageView"
             app:layout_constraintTop_toBottomOf="@+id/spaceNameView"
-            tools:text="@sample/matrix.json/data/message"
+            tools:text="@sample/spaces.json/data/topic"
             tools:visibility="visible" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

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"

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:ignore="MissingConstraints" />
-        tools:src="@tools:sample/avatars" />
 
     <TextView
         android:id="@+id/composerRelatedMessageTitle"

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"
+        app:layout_constraintEnd_toStartOf="parent" />
-        tools:src="@tools:sample/avatars" />
 
     <TextView
         android:id="@+id/composerRelatedMessageTitle"

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"

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"
@@ -55,7 +55,7 @@
             app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
             app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
             app:layout_constraintTop_toBottomOf="@+id/homeDrawerHeaderAvatarView"
-            tools:text="@sample/matrix.json/data/displayName" />
+            tools:text="@sample/users.json/data/displayName" />
 
         <TextView
             android:id="@+id/homeDrawerUserIdView"
@@ -70,7 +70,7 @@
             app:layout_constraintEnd_toStartOf="@+id/homeDrawerQRCodeButton"
             app:layout_constraintStart_toStartOf="@+id/homeDrawerHeaderAvatarView"
             app:layout_constraintTop_toBottomOf="@+id/homeDrawerUsernameView"
-            tools:text="@sample/matrix.json/data/mxid" />
+            tools:text="@sample/users.json/data/id" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/homeDrawerQRCodeButton"

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"
@@ -87,7 +87,7 @@
                         app:layout_constraintStart_toEndOf="@+id/matrixProfileToolbarAvatarImageView"
                         app:layout_constraintTop_toTopOf="parent"
                         tools:alpha="1"
-                        tools:text="@sample/matrix.json/data/roomName" />
+                        tools:text="@sample/rooms.json/data/name" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 

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"
@@ -52,7 +52,7 @@
             android:textSize="15sp"
             android:textStyle="bold"
             app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
-            tools:text="@sample/matrix.json/data/roomName" />
+            tools:text="@sample/rooms.json/data/name" />
 
         <TextView
             android:id="@+id/matrixToCardAliasText"
@@ -67,7 +67,8 @@
             android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
             app:layout_goneMarginTop="0dp"
-            tools:text="@sample/matrix.json/data/roomAlias" />
+            tools:text="@sample/rooms.json/data/alias"
+            tools:visibility="visible" />
 
         <LinearLayout
             android:id="@+id/matrixToMemberPills"
@@ -117,7 +118,7 @@
             android:textColor="?riotx_text_secondary"
             android:textSize="15sp"
             app:layout_constraintTop_toBottomOf="@id/matrixToMemberPills"
-            tools:text="@sample/matrix.json/data/roomTopic" />
+            tools:text="@sample/rooms.json/data/topic" />
 
         <ImageView
             android:id="@+id/knownMember5"
@@ -128,7 +129,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 +141,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 +153,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 +164,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,19 +174,21 @@
             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" />
 
+        <!-- layout_goneMarginStart: add half the width of the avatar: 15dp -->
         <TextView
             android:id="@+id/peopleYouMayKnowText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
+            android:layout_marginStart="10dp"
             android:textColor="?riotx_text_secondary"
             android:textSize="15sp"
             app:layout_constraintBottom_toBottomOf="@id/knownMember1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/knownMember5"
             app:layout_constraintTop_toTopOf="@id/knownMember1"
+            app:layout_goneMarginStart="25dp"
             tools:text="7 people you may know" />
 
         <im.vector.app.core.platform.ButtonStateView

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"
@@ -32,7 +32,7 @@
         android:textColor="?riotx_text_primary"
         android:textSize="15sp"
         app:layout_constraintTop_toBottomOf="@+id/matrixToCardAvatar"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/matrixToCardUserIdText"
@@ -47,7 +47,7 @@
         android:textColor="?riotx_text_secondary"
         android:textSize="15sp"
         app:layout_constraintTop_toBottomOf="@id/matrixToCardNameText"
-        tools:text="@sample/matrix.json/data/mxid" />
+        tools:text="@sample/users.json/data/id" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/matrixToCardSendMessageButton"

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"
@@ -58,7 +58,7 @@
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toEndOf="@+id/roomToolbarAvatarImageView"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:text="@sample/matrix.json/data/roomName" />
+                tools:text="@sample/rooms.json/data/name" />
 
             <TextView
                 android:id="@+id/roomToolbarSubtitleView"
@@ -75,7 +75,7 @@
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toEndOf="@+id/roomToolbarAvatarImageView"
                 app:layout_constraintTop_toBottomOf="@+id/roomToolbarTitleView"
-                tools:text="@sample/matrix.json/data/roomTopic" />
+                tools:text="@sample/rooms.json/data/topic" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 

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"
@@ -49,7 +49,7 @@
                     app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toEndOf="@+id/roomPreviewNoPreviewToolbarAvatar"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:text="@sample/matrix.json/data/displayName" />
+                    tools:text="@sample/users.json/data/displayName" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -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"
@@ -93,7 +93,7 @@
                     android:textAppearance="@style/TextAppearance.Vector.Title"
                     android:textSize="15sp"
                     android:textStyle="bold"
-                    tools:text="@sample/matrix.json/data/roomName" />
+                    tools:text="@sample/rooms.json/data/name" />
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewTopic"
@@ -104,7 +104,7 @@
                     android:gravity="center"
                     android:textAppearance="@style/TextAppearance.Vector.Subtitle"
                     android:textSize="15sp"
-                    tools:text="@sample/matrix.json/data/roomTopic" />
+                    tools:text="@sample/rooms.json/data/topic" />
 
                 <TextView
                     android:id="@+id/roomPreviewNoPreviewLabel"

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"
@@ -57,7 +57,7 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/roomSettingsToolbarAvatarImageView"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:text="@sample/matrix.json/data/roomName" />
+                tools:text="@sample/rooms.json/data/name" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 

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"
@@ -62,7 +62,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/roomUploadsToolbarAvatarImageView"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:text="@sample/matrix.json/data/roomName" />
+                    tools:text="@sample/rooms.json/data/name" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 

vector/src/main/res/layout/fragment_space_add_rooms.xml

@@ -63,7 +63,7 @@
                     android:maxLines="1"
                     android:textColor="?riotx_text_secondary"
                     android:textSize="16sp"
-                    tools:text="@sample/matrix.json/data/spaceName" />
+                    tools:text="@sample/spaces.json/data/name" />
 
             </LinearLayout>
 

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"
@@ -63,7 +63,7 @@
                     app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toEndOf="@+id/spacePreviewToolbarAvatar"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:text="@sample/matrix.json/data/displayName" />
+                    tools:text="@sample/users.json/data/displayName" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 

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"
@@ -109,7 +109,7 @@
                     android:textColor="?riotx_text_primary"
                     android:textSize="15sp"
                     app:layout_constraintTop_toTopOf="parent"
-                    tools:text="@sample/matrix.json/data/displayName" />
+                    tools:text="@sample/users.json/data/displayName" />
 
                 <TextView
                     android:id="@+id/showUserCodeCardUserIdText"
@@ -124,7 +124,7 @@
                     android:textColor="?riotx_text_secondary"
                     android:textSize="15sp"
                     app:layout_constraintTop_toBottomOf="@id/showUserCodeCardNameText"
-                    tools:text="@sample/matrix.json/data/mxid" />
+                    tools:text="@sample/users.json/data/id" />
 
 
                 <!--                android:id="@+id/itemShareQrCodeImage"-->

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"

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"
@@ -37,7 +37,8 @@
         app:layout_constraintEnd_toStartOf="@+id/bottom_sheet_message_preview_timestamp"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
         app:layout_constraintTop_toTopOf="@id/bottom_sheet_message_preview_avatar"
-        tools:text="@tools:sample/full_names" />
+        tools:fontFamily="sans-serif"
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_timestamp"

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"
@@ -41,7 +41,8 @@
         app:layout_constraintEnd_toStartOf="@+id/bottomSheetRoomPreviewLowPriority"
         app:layout_constraintStart_toEndOf="@id/bottomSheetRoomPreviewAvatar"
         app:layout_constraintTop_toTopOf="@id/bottomSheetRoomPreviewAvatar"
-        tools:text="@tools:sample/full_names" />
+        tools:fontFamily="sans-serif"
+        tools:text="@sample/rooms.json/data/name" />
 
     <ImageView
         android:id="@+id/bottomSheetRoomPreviewLowPriority"

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"

vector/src/main/res/layout/item_contact_detail.xml

@@ -24,7 +24,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/contactDetailMatrixId"
@@ -40,7 +40,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/contactDetailName"
         app:layout_constraintTop_toBottomOf="@+id/contactDetailName"
-        tools:text="@sample/matrix.json/data/mxid"
+        tools:text="@sample/users.json/data/id"
         tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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"

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"
@@ -55,7 +55,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/createDirectRoomUserAvatarContainer"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/createDirectRoomUserID"
@@ -70,6 +70,6 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="@+id/createDirectRoomUserName"
         app:layout_constraintTop_toBottomOf="@+id/createDirectRoomUserName"
-        tools:text="Blabla" />
+        tools:text="@sample/users.json/data/id" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

vector/src/main/res/layout/item_display_read_receipt.xml

@@ -17,12 +17,12 @@
         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"
         style="@style/BottomSheetItemTextMain"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/readReceiptDate"

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>
 

vector/src/main/res/layout/item_expandable_textview.xml

@@ -20,7 +20,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:maxLines="2"
-        tools:text="@sample/matrix.json/data/roomTopic" />
+        tools:text="@sample/rooms.json/data/topic" />
 
     <ImageView
         android:id="@+id/expandableArrow"

vector/src/main/res/layout/item_generic_list.xml

@@ -58,7 +58,8 @@
         app:layout_constraintEnd_toStartOf="@+id/item_generic_barrier"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/item_generic_title_text"
-        tools:text="At totam delectus et aliquid dolorem. Consectetur voluptas tempore et non blanditiis id optio. Dolorum impedit quidem minus nihil. "
+        tools:maxLines="3"
+        tools:text="@tools:sample/lorem/random"
         tools:visibility="visible" />
 
     <androidx.constraintlayout.widget.Barrier

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"

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"
@@ -54,7 +54,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/knownUserAvatarContainer"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/knownUserID"
@@ -69,6 +69,6 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="@+id/knownUserName"
         app:layout_constraintTop_toBottomOf="@+id/knownUserName"
-        tools:text="Blabla" />
+        tools:text="@sample/users.json/data/id" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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"
@@ -51,7 +51,7 @@
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_goneMarginEnd="80dp"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
@@ -69,7 +69,7 @@
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toBottomOf="@id/matrixItemTitle"
         app:layout_goneMarginEnd="8dp"
-        tools:text="@sample/matrix.json/data/mxid" />
+        tools:text="@sample/users.json/data/id" />
 
     <TextView
         android:id="@+id/matrixItemPowerLevelLabel"

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"
@@ -51,7 +51,7 @@
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_goneMarginEnd="80dp"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/matrixItemSubtitle"
@@ -69,7 +69,7 @@
         app:layout_constraintStart_toEndOf="@id/matrixItemAvatar"
         app:layout_constraintTop_toBottomOf="@id/matrixItemTitle"
         app:layout_goneMarginEnd="8dp"
-        tools:text="@sample/matrix.json/data/mxid" />
+        tools:text="@sample/users.json/data/id" />
 
     <ProgressBar
         android:id="@+id/matrixItemProgress"

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"
@@ -39,7 +39,7 @@
         app:layout_constraintStart_toEndOf="@id/itemPublicRoomAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@sample/matrix.json/data/roomName" />
+        tools:text="@sample/rooms.json/data/name" />
 
     <TextView
         android:id="@+id/itemPublicRoomTopic"
@@ -57,7 +57,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/itemPublicRoomName"
         app:layout_constraintTop_toBottomOf="@+id/itemPublicRoomName"
-        tools:text="@sample/matrix.json/data/roomTopic"
+        tools:text="@sample/rooms.json/data/topic"
         tools:visibility="visible" />
 
     <TextView
@@ -93,7 +93,7 @@
         app:layout_constraintBaseline_toBaselineOf="@+id/itemPublicRoomMembersCount"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/itemPublicRoomMembersCount"
-        tools:text="@sample/matrix.json/data/roomAlias" />
+        tools:text="@sample/rooms.json/data/alias" />
 
     <im.vector.app.core.platform.ButtonStateView
         android:id="@+id/itemPublicRoomButtonState"

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"
@@ -114,7 +114,7 @@
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toEndOf="@id/roomAvatarContainer"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <ImageView
         android:id="@+id/roomDraftBadge"
@@ -179,7 +179,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/roomNameView"
         app:layout_constraintTop_toBottomOf="@+id/roomNameView"
-        tools:text="@sample/matrix.json/data/message" />
+        tools:text="@sample/messages.json/data/message" />
 
     <TextView
         android:id="@+id/roomTypingView"

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
@@ -50,7 +50,7 @@
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toEndOf="@id/roomInvitationAvatarImageView"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/rooms.json/data/name" />
 
     <TextView
         android:id="@+id/roomInvitationSubTitle"
@@ -64,7 +64,7 @@
         app:layout_constraintEnd_toEndOf="@+id/roomInvitationNameView"
         app:layout_constraintStart_toStartOf="@+id/roomInvitationNameView"
         app:layout_constraintTop_toBottomOf="@+id/roomInvitationNameView"
-        tools:text="@sample/matrix.json/data/message" />
+        tools:text="@sample/rooms.json/data/topic" />
 
     <!-- Margin bottom does not work, so I use space -->
     <Space

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"
@@ -38,7 +38,7 @@
         app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@sample/matrix.json/data/roomName" />
+        tools:text="@sample/rooms.json/data/name" />
 
     <ImageView
         android:id="@+id/itemAddRoomRoomCheckBox"

vector/src/main/res/layout/item_room_to_add_in_space_placeholder.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemPublicRoomLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -28,29 +27,10 @@
         android:layout_marginStart="17dp"
         android:layout_marginEnd="40dp"
         android:background="@drawable/rounded_rect_shape_8"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:textColor="?riotx_text_primary"
-        android:textSize="15sp"
-        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomAvatar"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintVertical_chainStyle="packed" />
-        tools:text="@sample/matrix.json/data/roomName" />
-
-    <!--    <ImageView-->
-    <!--        android:id="@+id/itemAddRoomRoomCheckBox"-->
-    <!--        android:layout_width="20dp"-->
-    <!--        android:layout_height="20dp"-->
-    <!--        android:layout_marginEnd="16dp"-->
-    <!--        android:importantForAccessibility="no"-->
-    <!--        android:src="@drawable/ic_checkbox_off"-->
-    <!--        app:layout_constraintBottom_toBottomOf="parent"-->
-    <!--        app:layout_constraintEnd_toEndOf="parent"-->
-    <!--        app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomNameText"-->
-    <!--        app:layout_constraintTop_toTopOf="parent" />-->
-
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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"
@@ -33,7 +33,7 @@
         app:layout_constraintEnd_toStartOf="@+id/messageTimeView"
         app:layout_constraintStart_toEndOf="@+id/messageAvatarImageView"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/messageTimeView"
@@ -58,6 +58,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/messageMemberNameView"
         app:layout_constraintTop_toBottomOf="@+id/messageMemberNameView"
-        tools:text="@sample/matrix.json/data/message" />
+        tools:text="@sample/messages.json/data/message" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

vector/src/main/res/layout/item_simple_reaction_info.xml

@@ -24,7 +24,7 @@
     <TextView
         android:id="@+id/itemSimpleReactionInfoMemberName"
         style="@style/BottomSheetItemTextMain"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/itemSimpleReactionInfoTime"

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"

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"
@@ -57,7 +57,7 @@
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/childRoomAvatar"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="@tools:sample/full_names" />
+            tools:text="@sample/rooms.json/data/name" />
 
         <TextView
             android:id="@+id/childRoomTopic"
@@ -71,7 +71,7 @@
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="@+id/childRoomName"
             app:layout_constraintTop_toBottomOf="@+id/childRoomName"
-            tools:text="@sample/matrix.json/data/roomTopic" />
+            tools:text="@sample/rooms.json/data/topic" />
 
         <ImageView
             android:id="@+id/spaceChildMemberCountIcon"

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"
@@ -62,6 +62,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/childSpaceAvatar"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@sample/spaces.json/data/name" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

vector/src/main/res/layout/item_space_top_summary.xml

@@ -44,6 +44,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/spaceSummaryMemberCountIcon"
-        tools:text="@sample/matrix.json/data/roomTopic" />
+        tools:text="@sample/spaces.json/data/topic" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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>
 
@@ -55,7 +55,7 @@
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toEndOf="@id/roomAvatarContainer"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/suggestedRoomDescription"
@@ -70,7 +70,7 @@
         app:layout_constraintEnd_toStartOf="@id/joinSuggestedRoomButton"
         app:layout_constraintStart_toStartOf="@+id/roomNameView"
         app:layout_constraintTop_toBottomOf="@+id/roomNameView"
-        tools:text="@sample/matrix.json/data/message" />
+        tools:text="@sample/rooms.json/data/topic" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/joinSuggestedRoomButton"

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"
@@ -39,7 +39,7 @@
         android:textColor="?riotx_text_primary"
         android:textSize="15sp"
         android:textStyle="bold"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/messageTimeView"

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"
@@ -25,7 +25,7 @@
         android:textColor="?riotx_text_primary"
         android:textSize="15sp"
         android:textStyle="bold"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
 
     <TextView

vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml

@@ -73,7 +73,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/creationTileRoomAvatarImageView"
-            tools:text="@sample/matrix.json/data/roomName" />
+            tools:text="@sample/rooms.json/data/name" />
 
         <TextView
             android:id="@+id/roomNameDescriptionText"

vector/src/main/res/layout/item_timeline_event_text_message_stub.xml

@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:textColor="?riotx_text_primary"
         android:textSize="14sp"
-        tools:text="@sample/matrix.json/data/message" />
+        tools:text="@sample/messages.json/data/message" />
 
     <im.vector.app.features.home.room.detail.timeline.url.PreviewUrlView
         android:id="@+id/messageUrlPreview"

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"
@@ -39,7 +39,7 @@
         app:layout_constraintStart_toEndOf="@id/itemUnknownRoomAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@sample/matrix.json/data/roomName" />
+        tools:text="@sample/rooms.json/data/name" />
 
     <View
         android:id="@+id/itemPublicRoomBottomSeparator"

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"
@@ -37,7 +37,7 @@
         app:layout_constraintStart_toEndOf="@+id/itemUserAvatar"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@sample/matrix.json/data/mxid" />
+        tools:text="@sample/users.json/data/id" />
 
     <TextView
         android:id="@+id/itemUserName"
@@ -53,7 +53,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/itemUserAvatar"
         app:layout_constraintTop_toBottomOf="@+id/itemUserId"
-        tools:text="@sample/matrix.json/data/displayName"
+        tools:text="@sample/users.json/data/displayName"
         tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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"
@@ -30,7 +30,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inviteAvatarView"
-        tools:text="@sample/matrix.json/data/displayName" />
+        tools:text="@sample/users.json/data/displayName" />
 
     <TextView
         android:id="@+id/inviteIdentifierView"
@@ -43,7 +43,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/inviteNameView"
-        tools:text="@sample/matrix.json/data/mxid" />
+        tools:text="@sample/users.json/data/id" />
 
     <TextView
         android:id="@+id/inviteLabelView"

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>

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"

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>

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>

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"
@@ -51,7 +51,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/memberProfileAvatarView"
-            tools:text="@sample/matrix.json/data/displayName" />
+            tools:text="@sample/users.json/data/displayName" />
 
         <TextView
             android:id="@+id/memberProfileIdView"
@@ -67,7 +67,7 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/memberProfileNameView"
-            tools:text="@sample/matrix.json/data/mxid" />
+            tools:text="@sample/users.json/data/id" />
 
         <TextView
             android:id="@+id/memberProfilePowerLevelView"

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"
@@ -41,7 +41,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/roomProfileAvatarView"
-        tools:text="@sample/matrix.json/data/roomName" />
+        tools:text="@sample/rooms.json/data/name" />
 
     <TextView
         android:id="@+id/roomProfileAliasView"
@@ -57,6 +57,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/roomProfileNameView"
-        tools:text="@sample/matrix.json/data/roomAlias" />
+        tools:text="@sample/rooms.json/data/alias" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>