Fix setting y offset to -12.dp can overlap a state event displayed above. Rework how the vertical offset are applied.

This commit is contained in:
Benoit Marty 2023-05-26 16:56:13 +02:00 committed by Benoit Marty
parent c590a32942
commit 25e432d24e
56 changed files with 110 additions and 103 deletions

View file

@ -247,14 +247,16 @@ fun TimelineItemEventRow(
) {
Row {
if (!event.isMine) {
Spacer(modifier = Modifier.width(16.dp))
Spacer(modifier = Modifier.width(4.dp))
}
Column(horizontalAlignment = contentAlignment) {
if (event.showSenderInformation) {
MessageSenderInformation(
event.safeSenderName,
event.senderAvatar,
Modifier.zIndex(1f)
Modifier
.zIndex(1f)
.offset(y = 12.dp)
)
}
val bubbleState = BubbleState(
@ -282,7 +284,7 @@ fun TimelineItemEventRow(
reactionsState = event.reactionsState,
modifier = Modifier
.zIndex(1f)
.offset(x = if (event.isMine) 0.dp else 20.dp, y = -(16.dp))
.offset(x = if (event.isMine) 0.dp else 20.dp, y = -(4.dp))
)
}
if (event.isMine) {

View file

@ -86,10 +86,9 @@ fun MessageEventBubble(
fun Modifier.offsetForItem(): Modifier {
return if (state.isMine) {
// FIXME setting y offset to -12.dp can overlap a state event displayed above.
offset(y = -(12.dp))
this
} else {
offset(x = 20.dp, y = -(12.dp))
offset(x = 20.dp)
}
}
@ -132,7 +131,7 @@ internal fun MessageEventBubbleDarkPreview(@PreviewParameter(BubbleStateProvider
@Composable
private fun ContentToPreview(state: BubbleState) {
// Due to y offset, surround with a Box
// Due to position offset, surround with a Box
Box(
modifier = Modifier
.size(width = 240.dp, height = 64.dp)

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:16b26c7ab2061dcc99daafef6507524969b942a39fa4f183325aa562ec76909a
size 329
oid sha256:5cfe099bf35a5b6ccb106577036b5b1de21795ed1bbd0912051e8ac230945251
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4f82e5a6048cdcf803073af9a8c108f81ec4c6f70be2696182239fccd3cce2a3
size 329
oid sha256:e3a95beb2f39a13eeb8f179cfd25b2aa4bc13151dbef64fdb7e19da03bc85078
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0bdcdccd0ae75d5a36bcf41e6421d912086ef520fc5ad5ddee8343290be42aa5
size 329
oid sha256:1cbf9779779729213e799514ac3a042751548faf0742c983715f9aa52581620a
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:294dca25a706fd0dc56e4997196e77ec1ce65d88f41f2a1ee1a4d27e75105a48
size 329
oid sha256:e3eb56cfdf843fb119398aeeebffb0d84fc37eb285157f1339d21421890b362f
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bccda39ab7124622f388f186f86ec203f91c721e397b0d23aa900c8272e574f4
oid sha256:aabb896501fb8f1010c0aba1041ef27b69ae91124bfb376286b483424ed89a3d
size 4550

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bc0f8753e58d9487a7c08bad4aa360f2aeae03b9309621b8f28a8eb8d8e03aba
oid sha256:8c7f71b105cbf5aa0012ab3a5fda593b7337a390a9a0ff3724efa65e4b7e438e
size 5272

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:95a92355a64b63d223a45a99283ff4d9939a90a3da96387c0f6605cc3b0593cd
oid sha256:751407c98563bf29a2da279e69cbe799b37979a19ba2e23adcd9b896249bfdc3
size 5011

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4dc33b8578f34ad99e198897d80d2e9b6de7141bbc29bc2b39ee99376c2059f
oid sha256:a95f16b287ceab493798abc44399282b6e5d802a09c426d34a314dcdd23f3433
size 4940

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:708dd91f3622dfee4f569010a58dda1aed1866b1b4e13dd47af0c8dbacd33698
size 329
oid sha256:4e0274af196e662b30da662f5183106693d45afd763ca734542daf28c21b0659
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b126e4d6d9087ca246f9b3a70d93bdfb953052cbdf2089eca67513b6cb04d40a
size 329
oid sha256:e53107dda370a166e3562a855c4d5d6084eb57b9ee95527e50fc2c4c038a7611
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cfec26d03db4df611e20908d3b5765497fcba74077070af80bbb16332f68c922
size 329
oid sha256:34097a007b55152de80c509a7ad213bee1137ad6741bb2ca4c5fef918320f80c
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:57af2ecc51482b53d331cf20b553dbaa580d9f472cf0db72c6e0f8ab3d51711f
size 329
oid sha256:5aafe84b9920988d206fd9350092148ca50d1281a7d80c3cd12b90149ede39c2
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:84efea63cf1faebc110c6b194411a9568c91c6e38eaf6c0b5df49bc2b105a0e1
size 329
oid sha256:f4109ddeaa1b14f3d7f9183ba13f6c30fed6a507b3cccd26ae3d94e1189f5247
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:971214d459626ff3e6cad74be7506a16d9ef33e97fcb428fc76fab9dc28f38f9
size 329
oid sha256:962009a787b9c55d8a48fd1f0e104727a1c8e331ffeb87f9696b9e2b29118037
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0bf72e3bd9955500764925e339673ccf70889fb003550116e9a611b8ac4702f6
size 329
oid sha256:62da79ae3017c3abae148d73dcb4fac4f2624b5331c69dc971c1515ef2fa2dc2
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5d1d06501e11adca85e4755ebcb8823aafa09ecd1fdd29765ca1971a130c8e5b
size 329
oid sha256:2af8578e0a63ec0322c628aa08293ad4709aa9496a9f9e84a5c305cb569b5af0
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:891218a3de22a8de7e8a28ea316190dfd9250e43ccd0a26f6f5ff0a92e8bba88
size 329
oid sha256:5ca0cfe51c16a5a7122f6f9b1977ff7744bfc17d91cefbb6850a54e2e7c9636f
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1bfc2475f2f6b142a8674d44bfb27bd62d5972f7a9ee443c0cc57be300790464
size 329
oid sha256:23d8cfa92569c8e61a2aa970630e91574c6c3e2bf754102edba36c599ddec099
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9f215f708626e853d1baf778c0a952881bf06c7981123a7bd27ac56df437658e
size 329
oid sha256:986b9ce971dd579a739113132475eac81c05dcdcc9cb8d07b32d18f80e6aee23
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea44be04299641b1f525105b1fbafcb7ba46d97d2a9807efbb9bc63f0e29dc4d
size 329
oid sha256:606e1069eca1facbbb5b78d80b9a6a377f7933ffef451cf43f3935cbd075d968
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e816c683a931a21519eaa4e82b1ca3510b0e4d6f1dc6bd43487974bf0982a0b5
oid sha256:d8daf9315cd752d290111c1d4cb8d26945b3584073af63e2402411c0d66f6c59
size 4917

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7909e03ee9d6e2811863ed9b93df5cd00814765c8421443606df425b80be7670
oid sha256:a8af1f9406db93eb3791e193c35e9ff67d6443498fd1ef9ef65f16434efdb76e
size 5428

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5351ec4553c3650c52553f753d966ea9c726bb2ce949225be363891ab7d667c2
oid sha256:d3d5818b55720aa211e9db20e84b49e7a548246be358f3d5dc30dbf8c194ec3f
size 5188

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:74f0a3e254f9c34212ca93c17efca0b3a7edff6912c8f559f8ba276bd74946f0
oid sha256:4f8ac8dd3d06f02f2470a4c322db41bbfe7f90c3befb1a71221096cc575ce296
size 5065

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a71faa0aee58b977af48b5f8d8df0edf9b0bc4d21c6d5f65bdb54de0065906a2
size 329
oid sha256:2228db8b530ee59aa08697b90485cb39ed245de75e36fcb27a50471feddeffb7
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:11296725ee57a3ba87f5c89e76253d964808c9991faa50369f3483b0b846299b
size 329
oid sha256:4074c82d1e98c484abf997ed07b8e56274d3fb213e98db5a72f3d6c2001215a8
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d88fd626137d1793981906989a1922193941b2367c59ff0c6bdc5e2d15cda97b
size 329
oid sha256:a47281c07d1821618b03dcc08fd8b10154c2fa368fa84a924f9e6834b321a26d
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5c7248dd717838956900527431f8dda4aff2717a2c9238a80a828aaea2a4f9cf
size 329
oid sha256:9901fc0ec796a0e4d7c30a8d44a94bbb8759714ee2f8672d782926c945ffdb43
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:49e1f398b462cb05907142a14416e039faaf20bfc4c1733f36d63e69286525f3
size 329
oid sha256:5d03540cc3ed64cb1d6baea27cda2a13f9f01a326d49f7a48e32a055544e0e6f
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0a8caac9c140941bd71b8e9b36cd15df8ec37ef85755b3de8a3353cd602e0797
size 329
oid sha256:40dd3ea2ae03be9ef1edd14613a4a71126dd5d290e9296b1631de8d29bfe0c4e
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7d2be4bed342f82cd180f7dd31d8be9719e59123b991e9a804f5586a3a943ce1
size 329
oid sha256:387c101f7706c27d2cb25a4d7fef9d8c84626b860d1f74fab12f5d21116495ed
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0bc50249a165de79de671860657998f771ec26ef8a4d07a78004423b2a44a82e
size 329
oid sha256:a7949d19caf0c8ba0f7ca9a46e07de5694639dabcf6860cd1aa1f95f53eb4e28
size 364

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0e7e30c460d75815023ed02cd6b0fcff4a15881916f0056e47d9fd034bf3a181
size 41125
oid sha256:a511056320bb3acbffbd91e2511f299c56bddaeb9998386ee83a6c8c846af333
size 367

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:81b126a3d322d70f06db15622e560a146cea2c81f5873987550aba0a5c5efffa
size 53314
oid sha256:31c8bd05947cbe3f74d217aac06b06a08b7ba328f5e3dbdac0c87ca3afe87732
size 367

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b0ede4470399e2c7e6f3c99e59191a857c1e14254789307777359802980c59a1
size 193735
oid sha256:9143abd810ae66b73f7a42084146ec40a68a4e4112f7ca62ed220bc6473cf77d
size 368

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c9fe22528aad68a5dffc8489fd1ec3138a8edde44fb23a1391f6e53a07d44fff
size 193966
oid sha256:f5aefb5101926948e4526f776a40ee4f0e9e9577880ef015393fe274791b57ae
size 368

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d559a454af6dfe367d1256dcd7ceeb32ae6fe168b76b1b5d8860d328e9752fb3
size 51433
oid sha256:a48c409916255498c1e47440354c0009107858028559eb90cc6c591d57cb0ded
size 367

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1e45ec17c6353f96f0f777f8c638da010dbd062c680175d8ae80f6e700a6f928
size 72941
oid sha256:fd56a902b27629ea24fd11f163d347df6375dd597590d163d59b733a1538c0ec
size 367

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:572d6f11354e2b1f02cb0979b35e2c798abe2d3b63f852ca6b868471ceecaed0
size 42964
oid sha256:8982700ec1f20d066594715a664ac7333b603feeca02a2b024314843c88559c6
size 367

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a01bde6db3ce00e84e9bb5d6a8179c8d97af9dde939f6e31aa81c955dbdbf3a3
size 40586
oid sha256:d94bad50b1bc10151122baf37f0ceb37806d2116decbd0e8cc8634da13ccd48a
size 367

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f12a13dd0fb3b569ce332ebc4e00fb55a6402bbf2b2a927b02abb4056c5e5c3
size 53043
oid sha256:4ae1583a5d4b2ae3a5a8dfe4f4f7809b6b46687ad33aa0a12ade7b18bf04eabe
size 367

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c0f6c785a1e20160355c72356744dedba65bda3d453fbd9772390350eaf6cc6e
size 195504
oid sha256:4256dc3623b650038262f227d56b598d06214fa5831e89105c08bea452e7a792
size 368

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:37c702936170a0e4b37d608cf62b92c3b60b93950d4e9f32633af77e3ce4fdc9
size 195775
oid sha256:b3ad71dfc03acfc3b4a865305dda532213e8ff5f3183eb976fbc0739ede74ee7
size 368

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e0b885810087916d3fefe699e5abc5125138ad74c6377f560e010e7fe68892da
size 51388
oid sha256:b83ed834c1335ad917019656ed042b2fde17403e739066df1d29bc322f01ff36
size 367

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:adcb71f4b9639287beabf35c9e91837bebee8f6b070fa77c0e6520fdf24faaae
size 73679
oid sha256:cc174a97059882be652fcfb87a033091ecdbe84a4e0e8a1ef3eff29101bc6b4c
size 367

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cb24bbba2e17417f4f3459353ee2c762517acfae2eada90c47b559828bad16a0
size 42411
oid sha256:0ec4528874e237526821edffebe957682399d5941cd502239f7f0c7044ba0cd2
size 367

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c2c642f1595f503a1deb1c241f14543d7f15221baa1d0937595aa023f36a874
size 44765
oid sha256:5c1fc2f6bde122e2a7b603bcc02ace39044be876debcf06d8d649d3ee9a052b9
size 367

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1afd2c42012017f154fdf031d4a5fc7384fa5f239b56cf4567f42fd579806c9a
size 45363
oid sha256:7d43ca1f19ca846cdcab60ba2ded0b7f502ee414e6273eb724496ba506c70e99
size 367

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9481f2994885a7649aa54d1c0043c44fe390004a7b58db4fc9d0e3e70bfc258a
size 43537
oid sha256:a3bdd036cd704d8e9e2b227a363b0d2147a4b0c8a0db8f04d11e0a6189c988d7
size 367

View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6fc67d78ba2a31540c1cbe949572fdcd98850dab0d8242146d6d73ab02dae572
size 41017

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:220b9ac66b74724887d7b0bbc082b4d0240d9fc25a068d33491eb83fe76e45fd
size 43958
oid sha256:609f2538ab4c9d9bc6a84f6218604c5b8752d227a33205765e83f5d36b828c8a
size 367

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9aa83ed14fb23495e79500a1e7d9dee8215efe67eec89e65e382d4f695eac68b
size 44871
oid sha256:2c63d90fd878182e29b1205d8d4c007994407f9879a1ddfb0c79c3a3c6a5cd9e
size 367

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:aa4970f995c6ee618be3d868ff5a34442352a7f4493cad345093b889daf0d4c2
size 42042
oid sha256:da7edea058b6a8c1f6c224dd9bda45fbe0fe344610c6f2d5588ae268116fa0b2
size 367

View file

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e9073c23bec50592107aa7a3b05d770c8fbf35db211578c9ca4cae399b9ba78d
size 40319