Merge branch 'develop' of https://github.com/vector-im/element-x-android into dla/feature/room_list_decoration

This commit is contained in:
David Langley 2023-09-15 10:26:24 +01:00
commit 90fc5366d8
49 changed files with 717 additions and 88 deletions

View file

@ -100,6 +100,7 @@ private fun ContentToPreview() {
"placeholderBackground" to ElementTheme.colors.placeholderBackground,
"messageFromMeBackground" to ElementTheme.colors.messageFromMeBackground,
"messageFromOtherBackground" to ElementTheme.colors.messageFromOtherBackground,
"progressIndicatorTrackColor" to ElementTheme.colors.progressIndicatorTrackColor,
"temporaryColorBgSpecial" to ElementTheme.colors.temporaryColorBgSpecial,
)
)