Merge pull request #2078 from element-hq/feature/bma/reactionOffsetInDm

Reaction offset in dm
This commit is contained in:
Benoit Marty 2023-12-20 17:32:13 +01:00 committed by GitHub
commit f65ef7daf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
68 changed files with 143 additions and 134 deletions

View file

@ -48,7 +48,7 @@ import io.element.android.libraries.designsystem.theme.messageFromMeBackground
import io.element.android.libraries.designsystem.theme.messageFromOtherBackground
private val BUBBLE_RADIUS = 12.dp
private val BUBBLE_INCOMING_OFFSET = 16.dp
internal val BUBBLE_INCOMING_OFFSET = 16.dp
// Design says: The maximum width of a bubble is still 3/4 of the screen width. But try with 85% now.
private const val BUBBLE_WIDTH_RATIO = 0.85f

View file

@ -345,7 +345,16 @@ private fun TimelineItemEventRowContent(
linkStartOrEnd(event)
}
.zIndex(1f)
.padding(start = if (event.isMine) 16.dp else 36.dp, end = 16.dp)
.padding(
// Note: due to the applied constraints, start is left for other's message and right for mine
// In design we want a offset of 6.dp compare to the bubble, so start is 22.dp (16 + 6)
start = when {
event.isMine -> 22.dp
timelineRoomInfo.isDirect -> 22.dp
else -> 22.dp + BUBBLE_INCOMING_OFFSET
},
end = 16.dp
)
)
}
}

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1ca195029059318ae3c0d78982024f026546e9ecbbe3484262c459541a72b0d4
size 139498
oid sha256:bee7c8c0c233a2ef943e8804c77597f70672c2fe23f697295889ce06f8ba7a07
size 139476

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:056f97085265006349952cab7ce090cf613ffd2d99e6b1746f0274228d8f85f9
size 135870
oid sha256:b780f7b6ade56b031f25829bbe313c1e71d53f3554ebdee61faa46b2f92c218f
size 135788

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f1f40fec45293d7676e851a2d9ea1b3a1e29770a01aa72c74013a8e36ec8e6f2
size 18213
oid sha256:c691a70d0111d0b395e76e7ba94b382ffd470ea066e229bf182f8fbf631c899b
size 18242

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:14175334e7709d8971910fbbd4458b83321bd8aa15faf162eff4aa29d23f11d5
size 85186
oid sha256:f9c4c522daf904898d38b32196dc43628697816381c210ba404321df0b409f2c
size 85265

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:272d5e1283b32c12377b6199e7cfa343b15fdb973e52476f8fff0383ed561eed
size 81343
oid sha256:9717496e144f7a27919723d037d61668289b5349f2885bd5fc1489606c726625
size 81546

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1173aed6e70d09e8c8c8db2032e28464caee6da101c0fe7fc160482d477f7d18
size 190846
oid sha256:c4b726ff874141615824c929c22518245cd9ddcee331a2d1b1e953ce98940627
size 190995

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e15bf90ad85964a4365eaf0cb47e2856ef8c2846047e22302497014059aca11f
size 187016
oid sha256:b3a8db4dab06f907fd3a83de9c9dd81a9c6671a6e7e77d4af78e1ef1795336db
size 187116

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1350c74dc3bb028c7f8ab437328512e5059dd06be91946a1272bb86437b1054e
size 56595
oid sha256:d261ba035401e1624a48911f1f9072a07e134e5d3b870fe488e8bfdb681c092c
size 56591

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5ea3e710d467877ccdb4842055ce36602675ad378bc6d135ee5c64edb21a89c6
size 52864
oid sha256:94be80f7b3f2a4fb3cc7f89c5e013e1eb99154862a46420ab6d30cd18fb6587d
size 53018

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a8d8205687fd1c5a7579b3c426ea9547dae4250ba4261cec36f1ef2ea588c982
size 74730
oid sha256:47bc7cc50be3b70e1441debf5e140fd637b457e237d09b421e0fc3a7a8181da2
size 74753

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:404d6881c71caf5a5755a8641b3269b05fcfa9ca467fd7bfb73c32a80f1cf262
size 347771
oid sha256:5d434fca6c31c1048f9e9c1beccb70e13ed444a3fd08d82202774183f3574d25
size 347891

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dccaa610597021f57c436110cc501f999f6d19b08639fa30975e77849dac59bf
size 80235
oid sha256:254cef5f8a455f62f334fa396b86b81d46459eb9b0e54355cb051214cc76b70e
size 80188

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d2dd830883481bd3ed598bed06b3ca03573097adfa453f2fd889413e972244cd
size 54500
oid sha256:cc02bbef3944a10d19d926107ae27e1ce5abb82aa8532ff3f49e16d4239ef638
size 54649

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:28266d8283d1e453832c3c88f223edc4be28d84406981f5fe87f254aecc736ca
size 66910
oid sha256:68bbb20edcec05fc3675ef998a90058c5cb9ea831656676c7f316be4c7ce03a6
size 66909

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1427b32623dbcd384fae8819174936e13589457be7da88801ea48162752948cb
size 50630
oid sha256:3f9b93c292973432b32c53e33a621e7d7626fe838653550738a6a9dd3925cc82
size 50687

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8ef232876e00b2c9b1448973a0fa5856f4574ce340d4035c9a3f60e41fa99fcb
size 67758
oid sha256:f7b1f9f6f91e2b4824270af423cfa637822462c21b2aa1660d61a64821084d28
size 67754

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a65f7df1be94e2d77b0eab49c3025779c0a0e11afa428ddec651652a97335f19
size 57833
oid sha256:f8c841112673d692b508315a9b73132ec38abe9a2b3f0aea43859d5cebcdb970
size 57976

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2489cb6ab856106d527134b51b90342885b21585cb3f7a929385a187eef2f12c
size 208912
oid sha256:cf97bbee3772485bb2abf707bccc29693c478a5f723dfb3bbf9f35aa9d3e0cc2
size 208907

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f38480a36ab69497fa1d7a5b92ce581f422bf834961d336343662f9024a43d19
size 209748
oid sha256:f25388c4d203cee75790b473bcb46c49ea5bdf97f10b8a11a278e889dfb2fc49
size 209768

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dabe55acc4f18170c9f040980723ca75f81942df098d031d36955609a47e5be7
size 72720
oid sha256:8b0304f8178f2c1812f4ba9495597f2671a19c8c06864269557458e5b952a89c
size 72699

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8f43922435333a4b0e505be20723a8a19d62f38ff0b9d7ccdba18ea7204265d0
size 88540
oid sha256:bc9394387d75232efad1f6a571c40d1fba5f5d5de1c85a0f004c4a52e8ef2428
size 88489

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:db6f0f1128a6372c4165cafd4255314216dc1aba3a48cafd043819bea4e573cb
size 74400
oid sha256:e6d3d23219a9cae2a751e4f279fd2537bb6d90147d010bb60ecd0eabccf93af9
size 74378

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ca184c77dc8a2d786321f03fcf3078a70ae42c347e5ac21f9b19a19bfee0da68
size 106909
oid sha256:e2723ba9980e32cc50b2850f2656ef4cc206328cd53dfeb98618eae3fced13a1
size 106852

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e39e18ebdcd6ed0fb1ca53cf46b990920d26426489c5a4ae904977299beae6e4
size 57867
oid sha256:0c7c683e5fb9ff7d073d0bc91ac575f214d4c45a98e5ae8622a8a613f28f8ab7
size 57861

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e33fe55223d1f63690df18ba8c403743f8410bb75fbab30cff7217638c709482
size 393368
oid sha256:c6bf57830c8e8766e8209eec18cd245fb3a49f2698dfffb60ec5475c95fc4bea
size 393334

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:eb3be77004838a03b9e3f17e0b060775dcd876d0249a01c343c94a64edc05c2a
size 51218
oid sha256:77c5f301bdff94528b1153318838a84bb85032cad0bc2ecfdd90fe0e7fb869bc
size 51266

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:62a81a4f33a8a76a2a9864fc522b6fe15765237a96663c8ecc8aca230642a771
size 71545
oid sha256:b41f17e7a2b5a167defabf689ec260f0efe44307d2a422f8c543897f7fea14c8
size 71634

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c4564125d6c91ec5b6266048300316ac87eb351654646b7d895105423226740
size 178180
oid sha256:9c6e037d1085366ca0212bdb7570c6c5d1c161e92d8929257699c12f3329846c
size 178233

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ddb9d92e2ef02226a2468d4876230b91e7368cedd416e1ab8a5e18e23185c297
size 79201
oid sha256:9d22db0588d9a6a355246cad3f94fa3a425b80b2624081e976977990c331b3a6
size 79274

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:029144f5977e38f7a088f49acb6cd31aad68579975f2b5641cf44f385721ec13
size 52848
oid sha256:2193a11873fdf07b1d6fe990154c8506153b0beef7d971dcefe78d1e1b63a0a7
size 52888

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e472556771fa5cc4253706bce70775664ba85b73566f34542aa580121583f153
size 64185
oid sha256:54d20d4100b8ba70d76c236abd0be7ccf9dfb2bd432fe552b8a18bfce1ef5b84
size 64244

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c49f2fbd209374af8e379ec4339dfbbcff3f89c0dc1766cb30b570845e339bca
size 48996
oid sha256:1680c3164c780dafd46462d6770a6a84c29ea46e5a7adb6d834164cbc2bd14b1
size 48945

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0f483afa9110508d712f9ba0d6640b23e64d4ce7441506662c278e39b2213dc6
size 64926
oid sha256:da410a09335165b25ee3ce4fe6b7f03a5bc67dc546a85ab45c06ce78a7adf56c
size 65011

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:50698141b3f660e5424b20fa7999df8ff09ce23cd072fc041bfc49511283ecd6
size 55777
oid sha256:c94aab9ca99a3cc6b04ce1041251c2f666619728c6421c3dd12e691cfb3bb365
size 55787

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bb3d9e761e12a8038b5dbd7b4e6c66c9e4cc65c798f79944a5626a6e205458c7
size 208390
oid sha256:8a5fa5cda7c17fd99d1e8ab27c37bc9e53ef9ef42288f140ee438d03bdda45de
size 208480

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:de0a4c9214993a733998f638c257556203369a506947ba5ec9042648347bd978
size 209261
oid sha256:55392b7f740c5074750fb4b807f1e1e4ca6dea9b2601742596251bd52bd098d1
size 209337

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8333ae717f272947e4c904adb13913a6af952dbf7576153dfb41da5f2d854ff5
size 69865
oid sha256:bae3ea763fdf8d118909f2c22d4eafda5ad4ceda3b24c846002e10e6032c196e
size 69826

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:03421bd79ed9fb2feda9ebc8112aeee8514d95d2e7d05efa3cac22076ca11de0
size 83885
oid sha256:a1b12ee386b4cd9601fae1b1c4ed1779defd7a10ca929bb5cd683f7039cf9fc1
size 83922

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:24b48d07cb841f6fa038b856e30b19da7c96e1435b6b71ca25800911f05de53a
size 72219
oid sha256:12642b59eb842993428ae31724cf885647e243eb36e37778350879bac9571b0e
size 72187

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3d4e028e9a5991204c49d135b7d2e42dc4ae618199f6a8350e1ec6873b42fe31
size 100807
oid sha256:7200a3147b8b0dab653bf225e8b3e1d93963b79852d02d3948194d50ffafb6ab
size 100870

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a6c73969522738d052b253abad1f8090702923f9cbcbee5935791e61bbcf40fe
size 56240
oid sha256:e58e65b4640768a496d4e22168a759c1e95720c646235943961e07ecfd33b857
size 56312

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1bfeda5eeea95292da1e7a9049736783b09b1580787b35d706d102408b92210b
size 189518
oid sha256:45c8a459dc025a00345b34b41fb3051722f9fd6875ec77afe301c653ee905fd8
size 189462

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:37646d8dba6f98c3a968a3bbe43b1db78acf2d5c3a25414f6da5cbecd8c4fef0
size 56933
oid sha256:1ae7adc273af3149682e7b6a30b3a3044a1693fff31cd8a4ffe1adeb0c1ff54b
size 56912

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f481314b733bcf9ab303cb2f82266db4eb9a189ab65bc6d8523f895271306a16
size 55869
oid sha256:35618f8204604670a2e5eaba6063833b4192b38049e2986cee016557d5db5807
size 55846

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:961bf2a4b81212c54750ffc66b2b72aebfbc56d880c376d6e06769fcea902e4d
size 58632
oid sha256:db01b29a5ceae4caa681408cf878aaade2c6c8ed8fc5766708f57fc5c846530c
size 58599

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c663f2eed56ad24d4af5ee218c9c0557b7b0ec3d56aca3244ad934b5f05071e4
size 53315
oid sha256:3e9cdf721d50044840fbd88777ac9111eb386681d1aa5ec1a5c0f83ce7d50129
size 52694

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92b5802745e5fab7bb9a7116965c1ab91aaa733f4a5df37b41f6043a5eb5e5f6
size 56887
oid sha256:0d8ff30d779238b8e619b5463eef61b17a53248b898d66011a8d487d6c2e2d38
size 56869

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7defaa404dcffce62e76ebdf958caa0b5b6c3450f02638c8510dc5bed36fc794
size 59135
oid sha256:102c1f50dfb82e059baa9db7d42afa996f57cc7b4928dd3e41ff234e63ea60ee
size 59002

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:40e7658ea9ab037d289392b42a458c2ec1c8626e3e852ba844eed508ad0c3787
size 58121
oid sha256:4d32df8893f943e9995f4ac7968d107a5f848a7d4deb643b1f6460c360a2eabd
size 57449

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b43fb4f3732d6931c7d146d1324d7bde87d06cc4a659fb37846415dbb8717ccd
size 54713
oid sha256:63c9c16b51641d39d1c70162873b339ace79522f0fe8f7127ff493de84979c30
size 54690

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:27ccfb35105589c692e03fa6e84a2bf3f1cc2c817cb61011272c848bcedcf144
size 54606
oid sha256:b388021522ac54c65dc605cf80b7723d5c9e4a1a485e98f7ad51e21725213c8f
size 54599

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d33e50e7bff509e933a1b90c69906bd2a2d9b490dcd001e66134b7e6a9226f73
size 61911
oid sha256:c2b065381bb58fb65d546b072b26f095818f5d4f848a67b18997b232f03701db
size 61708

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6e2001cf66bd7906715f3b75c40f82e7a982a4dbe5a597f001bb36931b485f56
size 43080
oid sha256:160ee6cee352c31006159d4e1a1953122a598a7d2259646173a7bf22c1f50c8e
size 42956

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c1a3f0aed0571fddc5d64bd7481368570663a574e69371a973801594c8b3881d
size 42233
oid sha256:da2ba4bcb554a5dbd61bd3b183deb37b1df790bf743dd540e6219836f9c5f8ad
size 42120

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c940c77785392976a3508f0a926f3e33ead3b84c360ad52a93bce787f26d5528
size 55051
oid sha256:49e56f9b48225196d28c3c4354c735061e9a8b200949ee7b8d240a20cac03c1a
size 54925

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:263f5a77469e574ffab73db2e5507c428da92a53980e1aacdfefbd499e8e0f4d
size 53983
oid sha256:07f54ebf66119e95fe69e1461ea4aa869db03fa322f21989078c55dee9057d2e
size 53853

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d8471b4298b5e08af217e625e95ce5811888f82d2f565b9e679ef14e5b0ae4e7
size 56492
oid sha256:600fca3d9844a0e54121667c3e141ff586d107d392d921d6adb131e9183be831
size 56360

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ad8864df2310acbd286b5299db6b123a5fc26876b22f5b99bb27a1b2ef75f945
size 47785
oid sha256:d09fae98a6f38f4f28c52e9ce10005d7defcc7deb2196af710aa3ce978b062c5
size 47270

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b1f6f34a04f6a0ea1673a981b95b8d9552bbb0f5f95fe6e6f48ff3c79ed5a8d
size 55014
oid sha256:d84b82999c357dcf5983ec3f7fa3f4886ed63b6b29c1901eb2d3db652ce0b35e
size 54885

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8689e497ff2befc2692b53ef9a1fe9705db17c894152eb3f631b567fe36d2067
size 57319
oid sha256:d59b34fdbb0962efc60ded1a43bc54ae3ca802b8e7fc25794fd767181af8cd97
size 57255

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c7c9c081424187e535522de66d80d9d7fbf7716ab73b43b17ee805aa791e7f39
size 52995
oid sha256:5b8d5771374d265b5c66c256342b17b811289c0455f5a7c597382f30a96fa587
size 52419

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43b4017b5b73f377baacb5c5f97ffa1909df36dc95368b15d51b103d006e740b
size 52655
oid sha256:f910d50d5917b11e06820cecd2cb6c50342de72888bff8ca640298c37ba06ab9
size 52516

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ce93b1482eadaf8555aae3f65e30dc8b21ec210dbab33dffeb0ad7108bed1c8e
size 52598
oid sha256:76cfafcbb3dfb7ec32f734846d2f61d394deddfbb39dfd9cb23eda34658a3ad2
size 52531

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1e272aed6081f1687219144b23e2f8a12709179a4251022c8bc307970a173d5d
size 56557
oid sha256:99b36486a99703dbf32b21afdddaab4b5e2f5144e97248993e3273e0e9b325b1
size 56413

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d3102b568a3c54e71c7b2fe8a36dcbf49330edc15bb797bd98ff6f7fedb1b762
size 39825
oid sha256:b9c238ae9c74477dc694b27283f2f0fb61e45ea3bdb8e2c6d3c4d9b97ef622fb
size 39669

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:976ebdcbc2c883c9385747a098355845c65b44e1625e6713de09307917040da6
size 39039
oid sha256:32e222f2370fd5b7ab758a58c76f58d992ee2b279505a385e8aab338df5140de
size 38881