diff --git a/vector/sampledata/matrix.json b/vector/sampledata/messages.json similarity index 57% rename from vector/sampledata/matrix.json rename to vector/sampledata/messages.json index c69e0201ad..8145277f6b 100644 --- a/vector/sampledata/matrix.json +++ b/vector/sampledata/messages.json @@ -1,58 +1,22 @@ { "data": [ { - "displayName": "Long display name useful to test layout with a long display name", - "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." + "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." }, { - "displayName": "benoit", - "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" + "message": "Hello!" }, { - "displayName": "ganfra", - "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" + "message": "How are you?" }, { - "displayName": "Manu", - "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" + "message": "Great weather today!" }, { - "displayName": "Giom", - "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" + "message": "Let's do a picnic" }, { - "displayName": "Nad", - "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" + "message": "Yes, great idea" } ] } diff --git a/vector/sampledata/room_round_avatars/0_element_rainbow.png b/vector/sampledata/room_round_avatars/0_element_rainbow.png new file mode 100644 index 0000000000..2efdc02312 Binary files /dev/null and b/vector/sampledata/room_round_avatars/0_element_rainbow.png differ diff --git a/vector/sampledata/room_round_avatars/element_black.png b/vector/sampledata/room_round_avatars/element_black.png new file mode 100644 index 0000000000..3b7430b5c1 Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_black.png differ diff --git a/vector/sampledata/room_round_avatars/element_ems.png b/vector/sampledata/room_round_avatars/element_ems.png new file mode 100644 index 0000000000..63cdf3ccae Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_ems.png differ diff --git a/vector/sampledata/room_round_avatars/element_multi.png b/vector/sampledata/room_round_avatars/element_multi.png new file mode 100644 index 0000000000..ab0657768a Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_multi.png differ diff --git a/vector/sampledata/room_round_avatars/element_sky.png b/vector/sampledata/room_round_avatars/element_sky.png new file mode 100644 index 0000000000..16c1be7316 Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_sky.png differ diff --git a/vector/sampledata/room_round_avatars/element_verde.png b/vector/sampledata/room_round_avatars/element_verde.png new file mode 100644 index 0000000000..778ad83725 Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_verde.png differ diff --git a/vector/sampledata/room_round_avatars/element_web.png b/vector/sampledata/room_round_avatars/element_web.png new file mode 100644 index 0000000000..c99a34f1a2 Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_web.png differ diff --git a/vector/sampledata/room_round_avatars/element_x.png b/vector/sampledata/room_round_avatars/element_x.png new file mode 100644 index 0000000000..bc95bf28f3 Binary files /dev/null and b/vector/sampledata/room_round_avatars/element_x.png differ diff --git a/vector/sampledata/room_round_avatars/matrix.png b/vector/sampledata/room_round_avatars/matrix.png new file mode 100644 index 0000000000..a3b8f89a8a Binary files /dev/null and b/vector/sampledata/room_round_avatars/matrix.png differ diff --git a/vector/sampledata/room_round_avatars/new_vector.png b/vector/sampledata/room_round_avatars/new_vector.png new file mode 100644 index 0000000000..16a51c6788 Binary files /dev/null and b/vector/sampledata/room_round_avatars/new_vector.png differ diff --git a/vector/sampledata/room_round_avatars/ops.png b/vector/sampledata/room_round_avatars/ops.png new file mode 100644 index 0000000000..6809885cc9 Binary files /dev/null and b/vector/sampledata/room_round_avatars/ops.png differ diff --git a/vector/sampledata/room_round_avatars/write_club.png b/vector/sampledata/room_round_avatars/write_club.png new file mode 100644 index 0000000000..1284472581 Binary files /dev/null and b/vector/sampledata/room_round_avatars/write_club.png differ diff --git a/vector/sampledata/rooms.json b/vector/sampledata/rooms.json new file mode 100644 index 0000000000..9304aa308d --- /dev/null +++ b/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" + } + ] +} diff --git a/vector/sampledata/space_avatars/car.png b/vector/sampledata/space_avatars/car.png new file mode 100644 index 0000000000..7e8af6b71d Binary files /dev/null and b/vector/sampledata/space_avatars/car.png differ diff --git a/vector/sampledata/space_avatars/face.png b/vector/sampledata/space_avatars/face.png new file mode 100644 index 0000000000..8bec44153c Binary files /dev/null and b/vector/sampledata/space_avatars/face.png differ diff --git a/vector/sampledata/space_avatars/london.png b/vector/sampledata/space_avatars/london.png new file mode 100644 index 0000000000..e77ddaaccc Binary files /dev/null and b/vector/sampledata/space_avatars/london.png differ diff --git a/vector/sampledata/space_avatars/paris.png b/vector/sampledata/space_avatars/paris.png new file mode 100644 index 0000000000..4506794b4a Binary files /dev/null and b/vector/sampledata/space_avatars/paris.png differ diff --git a/vector/sampledata/space_avatars/runner.png b/vector/sampledata/space_avatars/runner.png new file mode 100644 index 0000000000..ceaa047f79 Binary files /dev/null and b/vector/sampledata/space_avatars/runner.png differ diff --git a/vector/sampledata/space_avatars/snow.png b/vector/sampledata/space_avatars/snow.png new file mode 100644 index 0000000000..b523cf3066 Binary files /dev/null and b/vector/sampledata/space_avatars/snow.png differ diff --git a/vector/sampledata/spaces.json b/vector/sampledata/spaces.json new file mode 100644 index 0000000000..f58c2ca5da --- /dev/null +++ b/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!" + } + ] +} diff --git a/vector/sampledata/user_round_avatars/0_amandine.png b/vector/sampledata/user_round_avatars/0_amandine.png new file mode 100644 index 0000000000..2a279852b3 Binary files /dev/null and b/vector/sampledata/user_round_avatars/0_amandine.png differ diff --git a/vector/sampledata/user_round_avatars/1_benoit.png b/vector/sampledata/user_round_avatars/1_benoit.png new file mode 100644 index 0000000000..6c51a1bb5a Binary files /dev/null and b/vector/sampledata/user_round_avatars/1_benoit.png differ diff --git a/vector/sampledata/user_round_avatars/2_gaelle.png b/vector/sampledata/user_round_avatars/2_gaelle.png new file mode 100644 index 0000000000..a679639e00 Binary files /dev/null and b/vector/sampledata/user_round_avatars/2_gaelle.png differ diff --git a/vector/sampledata/user_round_avatars/3_manu.png b/vector/sampledata/user_round_avatars/3_manu.png new file mode 100644 index 0000000000..0cf9229614 Binary files /dev/null and b/vector/sampledata/user_round_avatars/3_manu.png differ diff --git a/vector/sampledata/user_round_avatars/4_matthew.png b/vector/sampledata/user_round_avatars/4_matthew.png new file mode 100644 index 0000000000..13d8eb3cfc Binary files /dev/null and b/vector/sampledata/user_round_avatars/4_matthew.png differ diff --git a/vector/sampledata/user_round_avatars/5_nad.png b/vector/sampledata/user_round_avatars/5_nad.png new file mode 100644 index 0000000000..e60f9f3325 Binary files /dev/null and b/vector/sampledata/user_round_avatars/5_nad.png differ diff --git a/vector/sampledata/user_round_avatars/ben.png b/vector/sampledata/user_round_avatars/ben.png new file mode 100644 index 0000000000..14839da426 Binary files /dev/null and b/vector/sampledata/user_round_avatars/ben.png differ diff --git a/vector/sampledata/user_round_avatars/bruno.png b/vector/sampledata/user_round_avatars/bruno.png new file mode 100644 index 0000000000..c0278ea73d Binary files /dev/null and b/vector/sampledata/user_round_avatars/bruno.png differ diff --git a/vector/sampledata/user_round_avatars/nique.png b/vector/sampledata/user_round_avatars/nique.png new file mode 100644 index 0000000000..41480b4bb4 Binary files /dev/null and b/vector/sampledata/user_round_avatars/nique.png differ diff --git a/vector/sampledata/user_round_avatars/toml.png b/vector/sampledata/user_round_avatars/toml.png new file mode 100644 index 0000000000..1abeb74d94 Binary files /dev/null and b/vector/sampledata/user_round_avatars/toml.png differ diff --git a/vector/sampledata/user_round_avatars/victor.png b/vector/sampledata/user_round_avatars/victor.png new file mode 100644 index 0000000000..f1f91bda4f Binary files /dev/null and b/vector/sampledata/user_round_avatars/victor.png differ diff --git a/vector/sampledata/users.json b/vector/sampledata/users.json new file mode 100644 index 0000000000..0a49d27450 --- /dev/null +++ b/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" + } + ] +} diff --git a/vector/src/main/res/layout/activity_call.xml b/vector/src/main/res/layout/activity_call.xml index 7ea632eefb..c4bba45ebf 100644 --- 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" /> + tools:text="@sample/users.json/data/displayName" /> + tools:src="@sample/user_round_avatars" /> + tools:text="@sample/users.json/data/displayName" /> + tools:src="@sample/user_round_avatars" /> + tools:src="@sample/user_round_avatars" /> + tools:text="@sample/users.json/data/id" /> diff --git a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml index 2f8d890131..68fc8653cf 100644 --- a/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml +++ b/vector/src/main/res/layout/bottom_sheet_room_widget_permission.xml @@ -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" /> + tools:src="@sample/space_avatars" /> + tools:text="@sample/spaces.json/data/name" /> diff --git a/vector/src/main/res/layout/bottom_sheet_verification.xml b/vector/src/main/res/layout/bottom_sheet_verification.xml index 9ed8f17069..e3c97d92dc 100644 --- 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" /> + tools:ignore="MissingConstraints" /> + app:layout_constraintEnd_toStartOf="parent" /> + tools:src="@sample/user_round_avatars" /> + tools:src="@sample/user_round_avatars" /> + tools:text="@sample/users.json/data/displayName" /> + tools:text="@sample/users.json/data/id" /> + tools:src="@sample/room_round_avatars" /> + tools:text="@sample/rooms.json/data/name" /> diff --git 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 index 3b12a05c92..b2d24f5218 100644 --- 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" /> + tools:text="@sample/rooms.json/data/name" /> + tools:text="@sample/rooms.json/data/alias" + tools:visibility="visible" /> + tools:text="@sample/rooms.json/data/topic" /> + tools:src="@sample/user_round_avatars" /> + tools:src="@sample/user_round_avatars" /> + tools:src="@sample/user_round_avatars" /> + + tools:src="@sample/user_round_avatars" /> + tools:text="@sample/users.json/data/displayName" /> + tools:text="@sample/users.json/data/id" /> + tools:src="@sample/room_round_avatars" /> + tools:text="@sample/rooms.json/data/name" /> + tools:text="@sample/rooms.json/data/topic" /> diff --git a/vector/src/main/res/layout/fragment_room_preview_no_preview.xml b/vector/src/main/res/layout/fragment_room_preview_no_preview.xml index 55dcc560e3..dc23a8f33f 100644 --- 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" /> + tools:text="@sample/users.json/data/displayName" /> @@ -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" /> + tools:text="@sample/rooms.json/data/name" /> + tools:text="@sample/rooms.json/data/topic" /> + tools:src="@sample/room_round_avatars" /> + tools:text="@sample/rooms.json/data/name" /> diff --git a/vector/src/main/res/layout/fragment_room_uploads.xml b/vector/src/main/res/layout/fragment_room_uploads.xml index d6af178308..39ba60f1a7 100644 --- 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" /> + tools:text="@sample/rooms.json/data/name" /> diff --git a/vector/src/main/res/layout/fragment_space_add_rooms.xml b/vector/src/main/res/layout/fragment_space_add_rooms.xml index 84774d9cf9..eb21470ba5 100644 --- a/vector/src/main/res/layout/fragment_space_add_rooms.xml +++ b/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" /> diff --git a/vector/src/main/res/layout/fragment_space_preview.xml b/vector/src/main/res/layout/fragment_space_preview.xml index 7e89ab9070..765b5f607c 100644 --- 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" /> + tools:text="@sample/users.json/data/displayName" /> diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml index 6b92712d3a..e77b51591c 100644 --- 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" /> + tools:text="@sample/users.json/data/displayName" /> + tools:text="@sample/users.json/data/id" /> diff --git a/vector/src/main/res/layout/item_autocomplete_matrix_item.xml b/vector/src/main/res/layout/item_autocomplete_matrix_item.xml index 4fc7d45f07..e15db581fd 100644 --- 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" /> + tools:src="@sample/user_round_avatars" /> + tools:fontFamily="sans-serif" + tools:text="@sample/users.json/data/displayName" /> + tools:src="@sample/room_round_avatars" /> + tools:fontFamily="sans-serif" + tools:text="@sample/rooms.json/data/name" /> + tools:src="@sample/room_round_avatars" /> + tools:text="@sample/users.json/data/displayName" /> \ No newline at end of file diff --git a/vector/src/main/res/layout/item_contact_main.xml b/vector/src/main/res/layout/item_contact_main.xml index 8db2080b47..812325d16a 100644 --- 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" /> + tools:src="@sample/user_round_avatars" /> + tools:text="@sample/users.json/data/displayName" /> + tools:text="@sample/users.json/data/id" /> \ No newline at end of file diff --git a/vector/src/main/res/layout/item_display_read_receipt.xml b/vector/src/main/res/layout/item_display_read_receipt.xml index 7058b8b86f..58ddf8e5ad 100644 --- a/vector/src/main/res/layout/item_display_read_receipt.xml +++ b/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" /> + tools:text="@sample/users.json/data/displayName" /> + tools:src="@sample/user_round_avatars" /> diff --git a/vector/src/main/res/layout/item_expandable_textview.xml b/vector/src/main/res/layout/item_expandable_textview.xml index d0520d2dba..5da2583fd3 100644 --- a/vector/src/main/res/layout/item_expandable_textview.xml +++ b/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" /> + tools:src="@sample/room_round_avatars" /> + tools:src="@sample/user_round_avatars" /> + tools:text="@sample/users.json/data/displayName" /> + tools:text="@sample/users.json/data/id" /> \ No newline at end of file diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml index 3d9aa0e876..db7c36658a 100644 --- 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" /> + tools:text="@sample/users.json/data/displayName" /> + tools:text="@sample/users.json/data/id" /> + tools:src="@sample/user_round_avatars" /> + tools:text="@sample/users.json/data/displayName" /> + tools:text="@sample/users.json/data/id" /> + tools:src="@sample/room_round_avatars" /> + tools:text="@sample/rooms.json/data/name" /> + tools:text="@sample/rooms.json/data/alias" /> + tools:src="@sample/room_round_avatars" /> + tools:text="@sample/users.json/data/displayName" /> + tools:text="@sample/messages.json/data/message" /> + tools:src="@sample/room_round_avatars" /> + tools:text="@sample/rooms.json/data/name" /> + tools:text="@sample/rooms.json/data/topic" /> + tools:src="@sample/room_round_avatars" /> + tools:text="@sample/rooms.json/data/name" /> - - - - - - - - - - - - - + app:layout_constraintVertical_chainStyle="packed" /> \ No newline at end of file diff --git a/vector/src/main/res/layout/item_search_result.xml b/vector/src/main/res/layout/item_search_result.xml index 3e89ab4ba4..1837175b71 100644 --- 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" /> + tools:text="@sample/users.json/data/displayName" /> + tools:text="@sample/messages.json/data/message" /> \ No newline at end of file diff --git a/vector/src/main/res/layout/item_simple_reaction_info.xml b/vector/src/main/res/layout/item_simple_reaction_info.xml index 73b0750cbd..1fd9df247c 100644 --- a/vector/src/main/res/layout/item_simple_reaction_info.xml +++ b/vector/src/main/res/layout/item_simple_reaction_info.xml @@ -24,7 +24,7 @@ + tools:text="@sample/users.json/data/displayName" /> + tools:src="@sample/space_avatars" /> + tools:src="@sample/room_round_avatars" /> + tools:text="@sample/rooms.json/data/name" /> + tools:text="@sample/rooms.json/data/topic" /> + tools:src="@sample/space_avatars" /> + tools:text="@sample/spaces.json/data/name" /> \ No newline at end of file diff --git a/vector/src/main/res/layout/item_space_top_summary.xml b/vector/src/main/res/layout/item_space_top_summary.xml index 27b21ece9b..fd451e7b93 100644 --- a/vector/src/main/res/layout/item_space_top_summary.xml +++ b/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" /> \ No newline at end of file diff --git a/vector/src/main/res/layout/item_suggested_room.xml b/vector/src/main/res/layout/item_suggested_room.xml index e694e34c13..dd1c5ba01e 100644 --- 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" /> @@ -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" /> + tools:text="@sample/rooms.json/data/topic" /> + tools:src="@sample/user_round_avatars" /> + tools:text="@sample/users.json/data/displayName" /> + tools:src="@sample/user_round_avatars" /> + tools:text="@sample/users.json/data/displayName" /> + tools:text="@sample/rooms.json/data/name" /> + tools:text="@sample/messages.json/data/message" /> + tools:src="@sample/room_round_avatars" /> + tools:text="@sample/rooms.json/data/name" /> + tools:src="@sample/user_round_avatars" /> + tools:text="@sample/users.json/data/id" /> \ No newline at end of file diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml index 3028fb7953..7af3262248 100644 --- 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" /> + tools:text="@sample/users.json/data/displayName" /> + tools:text="@sample/users.json/data/id" /> + tools:src="@sample/user_round_avatars" /> + tools:src="@sample/user_round_avatars" /> + tools:src="@sample/user_round_avatars" /> + tools:src="@sample/user_round_avatars" /> + tools:src="@sample/user_round_avatars" /> \ No newline at end of file diff --git a/vector/src/main/res/layout/vector_settings_round_avatar.xml b/vector/src/main/res/layout/vector_settings_round_avatar.xml index 3349e092f9..596eef5d3c 100644 --- 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" /> + tools:src="@sample/user_round_avatars" /> + tools:src="@sample/user_round_avatars" /> + tools:src="@sample/user_round_avatars" /> + tools:src="@sample/user_round_avatars" /> + tools:src="@sample/user_round_avatars" /> diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml index ac4351b379..6e674406fa 100644 --- 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" /> + tools:src="@sample/user_round_avatars" /> + tools:src="@sample/user_round_avatars" /> + tools:src="@sample/user_round_avatars" /> + tools:src="@sample/user_round_avatars" /> diff --git 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 index 7df09721be..c31f25d24b 100644 --- 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" /> + tools:text="@sample/users.json/data/displayName" /> + tools:text="@sample/users.json/data/id" /> + tools:src="@sample/room_round_avatars" /> + tools:text="@sample/rooms.json/data/name" /> + tools:text="@sample/rooms.json/data/alias" />