Fix timeline item padding and corners (#573)

* Try to fix timeline offsets and rounded corners.
---------

Co-authored-by: ElementBot <benoitm+elementbot@element.io>
This commit is contained in:
Jorge Martin Espinosa 2023-06-12 10:42:35 +02:00 committed by GitHub
parent 511b26b2ab
commit 1831ec7ab4
63 changed files with 128 additions and 131 deletions

View file

@ -20,6 +20,7 @@ import androidx.compose.animation.animateContentSize
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.lazy.LazyColumn
@ -86,7 +87,8 @@ fun TimelineView(
LazyColumn(
modifier = Modifier.fillMaxSize(),
state = lazyListState,
reverseLayout = true
reverseLayout = true,
contentPadding = PaddingValues(horizontal = 16.dp, vertical = 8.dp),
) {
itemsIndexed(
items = state.timelineItems,

View file

@ -45,7 +45,8 @@ import io.element.android.libraries.designsystem.theme.ElementTheme
import io.element.android.libraries.designsystem.theme.components.Surface
import io.element.android.libraries.designsystem.theme.components.Text
private val BUBBLE_RADIUS = 16.dp
private val BUBBLE_RADIUS = 12.dp
private val BUBBLE_INCOMING_OFFSET = 16.dp
@OptIn(ExperimentalFoundationApi::class)
@Composable
@ -88,7 +89,7 @@ fun MessageEventBubble(
return if (state.isMine) {
this
} else {
offset(x = 20.dp)
offset(x = BUBBLE_INCOMING_OFFSET)
}
}
@ -135,8 +136,8 @@ private fun ContentToPreview(state: BubbleState) {
Box(
modifier = Modifier
.size(width = 240.dp, height = 64.dp)
.padding(8.dp),
contentAlignment = Alignment.CenterStart,
.padding(vertical = 8.dp),
contentAlignment = if (state.isMine) Alignment.CenterEnd else Alignment.CenterStart,
) {
MessageEventBubble(
state = state,

View file

@ -101,9 +101,6 @@ fun TimelineItemEventRow(
contentAlignment = parentAlignment
) {
Row {
if (!event.isMine) {
Spacer(modifier = Modifier.width(4.dp))
}
Column(horizontalAlignment = contentAlignment) {
if (event.showSenderInformation) {
MessageSenderInformation(
@ -144,9 +141,6 @@ fun TimelineItemEventRow(
.offset(x = if (event.isMine) 0.dp else 20.dp, y = -(4.dp))
)
}
if (event.isMine) {
Spacer(modifier = Modifier.width(16.dp))
}
}
}
if (event.groupPosition.isNew()) {

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ddcd892538faa691ade67de5145392f89eaab4c903cc8fed00b24726753ed4e
size 6945
oid sha256:21e595a4cb9b1ea9b04c4a84bcdbe5533d8cf0faa68c86268d9260aeb8dfd2bc
size 6916

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cea39d32d858cd7b28885e634e746aea3652a56b665563e26f62346d9eaa1128
size 7172
oid sha256:0edcb3e1b2b297a0de683a1f03feced5de3880cf5e81b3b8251e8a60e1cb0bc5
size 7054

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7eb000677f48efbd9dfbe373b221dbc98b2da65404e86aea42e79416cc032205
size 7107
oid sha256:db8422219c2b16becfbe939272094f59bb48e0418c0cc4039575c90851cc5586
size 6845

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1daab66cf9beb8a5bb9c4cdea0db76fdc690b850bde1ada9679bfaf0167e6982
size 7150
oid sha256:fde5c44c5fdab00ca176c0c82dbae652e1dfe8d4e312bc5fd922cab112072b28
size 6811

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:37ba26495ac60e2857cfab755675993f44775c8c0bd36b5b7d69ccebf9a71a6d
size 7269
oid sha256:974d3fec4e412977049887cf6fd94285a2faafb301295b3e84e20d1ab7912bee
size 7233

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dcdb3be85af22f6997b372d268d54ca287ef282a8c1353d4fcb47d44ceffcf8a
size 7595
oid sha256:ae1b9d309cd6a84e247d76065869e39b7b46fd0065cf418ba029f1dda0510ad7
size 7433

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:65c434fc772482b1a884bc3c68447e228b470549ff72a510e43ba0aaae69387a
size 7396
oid sha256:63ad7e7c62666abb77701250e156cb8ecbf0dc9128cfdada89bfe29ec43e848f
size 7174

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:23f468e1737a6a3789fdfd56322e4b15551c1a0d74249f92aee92879d476ea91
size 7485
oid sha256:985374e97d5b6a44fa7f0d4ae0496f844247c29dd3e82c8f0fa814691dd04265
size 7108

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ab56f3950f19ed24fcd2592157046eb878a2dde9e9831b8a3d846f5f3207dc0
size 7062
oid sha256:2ca4b0749b140090ef6cfc43d2a103af3c2a3b6303e68557709b965b95b69a5f
size 6787

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2c6e69cd6e3687ef724ff2c8f5151fb6679fd6395d866d7f944507c130e938eb
size 7084
oid sha256:d77372b44033c29a4be413dd198e2348538a41849d9a41c4a009127b3cfb4313
size 6730

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d789e51e1f3c440f8577d465322c982a5a6aea54f7d1a7ab12e183ba841b0f14
size 7274
oid sha256:fb5ff03178b12c2f0aa52273864db71cccc3a8a1504efc3dfdc665d5b4ae0f73
size 7262

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:15100ea369eab89e99c4252b88e33f362cca287e6ef0799e1e3e3a8f4be6e227
size 7327
oid sha256:16fced348e9782a562392f30ca6f8601da841fbf3493f3106287e4a7181274c3
size 7230

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92c2dc09ef213e2f55568f036d17e0ba81f9053a61774bd89ea27273c9a0aeb8
size 7415
oid sha256:d1eda896a41c00072474b1db7cbd5faafdae3a11fcd8e2c6befefe5309e40599
size 7139

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a035a78264d396b78c2653b89ab0edbc3ee6400d380eccd587f80cafdd57f165
size 7335
oid sha256:dd31c568cc026302a41d1018317b60546b614105342ff00b80e96ded3dc5a4ee
size 6990

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:012db6849c7458978d11f0c56b171dcc01993ac3bbc940639a609a04e5f591ad
size 7093
oid sha256:6bf035ee41d3432b6641c08adc4ad1edb79e39fb05983ddbbf5f453094fe90aa
size 7022

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d429ec724142f73fa7846ec26a21b62e1a3466bd1e85193bdf48e749bf188978
size 7253
oid sha256:beeda4086e5886e27c148d751b4237204bed343dc84c25fe65ec647fafe77c94
size 7103

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:87de1686f0e84c9f00f80dc02a63ad6d0b0c360762a9d4f996b315407aec37d6
size 6700
oid sha256:ae6e507ec932bcaa5f62dd93c097caf08c4336b4313efde405e305387ce4c8a2
size 6591

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ab4af3d37dc161ccba7366517f60cb50923539615909c4bf76ec667095a4293c
size 6712
oid sha256:5a30a353141bee2d784c71992108643eebbc3f378c6425cc75422b4caaa6ca97
size 6656

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a5962c60a9072b96cbd72e8ea9cf6344f715d8469a45f51fcdebacfec5344544
size 6693
oid sha256:53b9921acaab2eea4cca9880705fe253c46b58d4f34032281dda0fee06d17a15
size 6569

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3ed947a2df42bc4cd7b0c181d608c69763897383f4846b2878e3df2705dfae0e
size 6715
oid sha256:fc7c34a553e8e13602ca7ee9ace2a1b21308dbb32a46ff6cb5c79b63286032b2
size 6485

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:30f04a04ecde63528df19021a9b43b1bb2d26aaf31fa021e4b83f4503fd73782
size 6997
oid sha256:fb156552a4d78d62e0427a051e8deb1e83793d28621e0aa31f4367b52d63bc53
size 6886

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a4e390e24a61c5ea42c2469bc71c0d7785de647991dbf5b8d5df360e76adcd0a
size 7184
oid sha256:b6bb6bb06b8b0db3f5e148d9dc803d392dd91da12b0ea1235be0b60b562da640
size 7037

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eba96060e90371916f2e62f550cc0fd4fa44e2872263a353dd3c37c2664c0f47
size 7001
oid sha256:0eea59911e30d66c97c53172cde84edac1d638a1285f8d7b5f0ea0d2e76d9357
size 6768

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:05f55e1df050651b48708dc3f40fe95a8ab68d1a0fea7838023cbadc2a21da57
size 7078
oid sha256:763106db16492b98122f47c5efc15cb4ec3bf43f1bc7e114c88f397c10f0331b
size 6714

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:544dac21d0af65c94f1e38ee2b0ff5a20dd3f12c40a5c41037c12f3af54df9ca
size 6598
oid sha256:f0e19eacaa8fe85f23f1e8a08ffaa61461f5785ba2f340fdb996ac0f509d2fb4
size 6526

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dca857bfb1b6405488d96214b72e219f9aa4c4abd535cd1dd83b7efd7603c497
size 6641
oid sha256:043e49b701ca2ed437695e44956b2a2ba6d510366b717457cd28525d383b0597
size 6463

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:83613dcfe9968db44cabf918d6dc9ab011869c80d4bf089d5d4c46f7b6bedae4
size 6968
oid sha256:75ae25992e88281d80e02f8a377a38794c3bd4a73b6308fe745312a70c478f4c
size 6922

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8d44801312b785f5c595a988124de6d70d65de01fb18c74876b1f6328e84c222
size 6914
oid sha256:6e46f8817a6b32536cb651aaef9b45096d12d22fa2167f58a05dd4d050e56cb1
size 6860

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e884fe9fd0c212caf0bfc745206ea277ff77037356e4e94b844e1cd1100a8861
size 6955
oid sha256:1b0da89c4bd81e097b4ec1eec8244bbe41ae5e7e49818b3e7637cbeba49a8de4
size 6912

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7abd5b98f55ca52bccd791196613029d2932520f062f08fd6356666b5fe1dbe8
size 6878
oid sha256:63ba7d2b4621476b23e78af878e4b1b32817ae022088a1d965c62a2045fa0bb4
size 6764

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cfaed204b2cc5ee8d1ec54f84c446346c62e392ad2ae305359a552f5f9a427f1
size 6755
oid sha256:892520ef29cbf8670fae5914510ce3c002b887873cb13dc2b2c60513235a2169
size 6652

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a801ced0c93a02e5fa22ca021f78d3ab1834169745353aaacbaad4bc41bbb112
size 6834
oid sha256:b610fd5b9798b66d8ce5b55ce2ec252461e0d21bf83edd634f21ac2504db7c4f
size 6679

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f99c5fd192b3d56188dc0a14a522b1ea4a05cdbe9b18f63c4a4c99f0914c0df5
size 41443
oid sha256:0c88f7fa82e9201f2b87c77c15dd056d215aaaa037899334596f18b927b53b79
size 41384

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8a524ff4463d72a0adca6a13907d95c6fb2cfe8afeba541cfe03c8fb44202d4f
size 53427
oid sha256:ee1510b367144db7c815e40bc33d5c29b0794a91bbedb8b87e03fc3e39a1a571
size 52815

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6c7090f345c722c0c5d5d415723e1770843d36fef48dc750a893320830b9dfd4
size 46068
oid sha256:052a95ccf790c0ef93bbfd24ff063fd5489b2c250a9c53ab6d58438653fbbea5
size 46098

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b876f9b49579215a6f0cbb73627e6c5ad19e7b71131bee02a2fe4b7f46432a67
size 197787
oid sha256:ed788e9f85e922a81e077c2ad82b89fa822d9dec6d95442ad5aa5365535a87b9
size 193815

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6d358680e2b08ed4d4f709b9f4d908f5cad84b888a7aa74b49609b09297e416e
size 198126
oid sha256:169f1a6dd0d433a900c43867a3c2feacd3143fc8e58029d4f24eeb4e5a41d2f2
size 193901

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d9338c43f771fc2a04c825d40358b01bd4ad3dca2512e3a12408fd2d345e8745
size 61796
oid sha256:5c0f97d84498d9adbb8cc0623dc0768051660580755b9535886869fec64ea980
size 62043

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:68b16f1231e3f328a30458956f395bcbe77afecee2075b07d88dd326beff282a
size 73031
oid sha256:8ff326bcd3a5113b745bef1653170d78c85c0b2009a5a88bc418f0d0915da599
size 70725

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8dbf4c20504f68324ab8606d84f41390bef28479f5e0f9d76d34c358403b0de8
size 42954
oid sha256:1437ae39c0b1c2f38e886865322354d86d58a128c1058189a90e39e1d8652327
size 43132

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3defc06e2e3d791261e87048fb019d2da7e8372d35550bcb17aacb2bb62370eb
size 55127
oid sha256:4c37214a46171d89103e99948ea8e164e6acf5b77abbf1af7bea17af76d2c20f
size 54695

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:824b93fd466fff749da6f6314fecbc1a15d316b3cac201adac0137c28660e121
size 39342
oid sha256:469e93a8efb479d73cb86494e907f6c77d6679d8a6ff3cf5c7972abde93a022d
size 39311

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8233a3eafef97e18dcd6b846d78af3e3a6a4fb79b89af276a1a41067f9e9af45
size 56472
oid sha256:3d8bd74a2da5138d50d2540419e61a274d5c970266c721232ef07556bc2742b7
size 56117

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fbe93775a53dc0e06a019d2fd3c72612dfbf9000709f48b4cdcc14ef72c914ad
size 40934
oid sha256:afa6d6c62c927a21745f23eccd98057188d7300789151738aed1b2af708217ba
size 40533

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4703dc63b3015c2a2c96e731dbabe55f2cff07c5508853f370d4eeb67e67740a
size 53186
oid sha256:99267d52178ee848b98f8a3949977487c81f3301bc120547f604e65e4715929c
size 52836

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:70a1848c08f7e3ed4fcc2cd0b05344234b2c4a2c26139c256344b102b49d98a1
size 45847
oid sha256:744f2192c85b1d6a56cc2eb7f6c873eb45827d2ad2d36fd1678c4ace4118af2c
size 45945

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4fe993ac7679fef189bcbfdf9e82abfb0263686721fcabb4ddeca8d2a3d4e209
size 199655
oid sha256:c8943194bce27da10d2f047e5617cbb45548170cc1f8c9606e62dae20fde44f5
size 194104

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fa118c2f28fe2c7bd3a194cf80cb25ece8c61fd15edd407d93ee76816c362fe1
size 199975
oid sha256:dc4c738cf6e3c8961d0e97b8adc24d0ba8765cd8a8d1799b9783a5b1f098fc25
size 194152

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a46df297336d5224b7e08a52038999ad31d947ecf980b644f3ac988a69de773
size 61818
oid sha256:67c69a22096cc69d482515703fa698556cf5a1ae5ab684f2fbde129520b6728e
size 61439

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2c420df941878750c090726a8f9a6a2e6f7fdb2ac85aa63321f9efe77032213f
size 73234
oid sha256:a048206eb3aed22388997fc12fdbd214a7dfa16eb4166f5db77af186bb64fbc3
size 71575

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:51120566fc91498097a2e68232f04342ade84d4aee702d5cc06ee5ff4bc17460
size 42551
oid sha256:e22d7dc0107732f7f65ceacd6da2d6af1dc99fa70074c8b397f1ff94baf24908
size 42183

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:548566862bbb0da3e13b43aee882b28656ea544b9341d6152d4d1f5c526ed3f2
size 55292
oid sha256:5596ef9921b302bb570b30f2c0b1e696a83134af8c1e130eb66a7be41bda6074
size 54607

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:092598b99ed8d53381f80352c357b13b159dd65cb23ef54d277bfa862de28263
size 38928
oid sha256:65906ae512b10cfe1bcf45bf336239fdee5e7516c04693b6f86aeeae8b0ba742
size 38580

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0dd943e910de80c7a36db12acb17b0ee116228181ddb58a45c8ec9252e85e435
size 56491
oid sha256:fdaec7990337c59354c0ac0aeac3fa73cb238cbdd025794dcc3074e5eccef24f
size 55837

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7fbb93faeae669493b42bc5831b1c5bb67b25ed688d582e01249a9e23e03425a
size 47340
oid sha256:a1f5fb612b002328b3dbafdb2488a480fdbb36899d4424bf143288d4e1d022fe
size 47230

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e5e5ac66335825c321666fe9564d1dbbd00ebbfe67f39d89ac133fcbd2b36b70
size 47473
oid sha256:94c5b0a4b0ba95247e499e8486a9de37107e0f00f4edfba91b73d22425970852
size 46926

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:72bc2d1171ca0d80bfc4522bbbb15c5973dbae362351c344f9b25382da4831d0
size 47701
oid sha256:63da79a57a3c37f92e0de0c11ea8553ebfdfac763ea22cee5b0ce34eb4980c62
size 47585

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:603a9bc343feceb5c1f86a36dcfdca7edf71a150237419a16895d12247b032d2
size 46271
oid sha256:a7a8e5c404e03382319357a3277b5ed84817579016da77c358334fa6a314933c
size 45939

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b06f5cdf95f2850a488e71c24c9857eca7b62d147b46b77b3c2ffece75789491
size 46682
oid sha256:18e9322a664e8db71b6762e5c295457a91b08da4f9269a1b85d91a325e435760
size 45814

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4a13a0332f1d5ce24824434cb909de2d2bf4af601e6924155d2a550d9e03ec0
size 46634
oid sha256:4cd1575b6f37ad2ced37b7a20c699eb0771a38a06a319eac133926086691d0f0
size 46279