Merge branch 'develop' of ssh://github.com/vector-im/element-x-android-poc into develop

2022-12-02 16:09:59 +01:00 · 2022-12-02 16:09:59 +01:00 · 3d25464bdc
commit 3d25464bdc
parent a24c88032a 537ff96992
3 changed files with 23 additions and 9 deletions
--- a/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
+++ b/features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt
@ -240,9 +240,9 @@ fun MessagesContent(
                .fillMaxWidth()
                .let {
                    if (composerFullScreen) {
-                        it.weight(1f)
+                        it.weight(1f, fill = false)
                    } else {
-                        it.height(COMPOSER_HEIGHT)
+                        it.wrapContentHeight(Alignment.Bottom)
                    }
                },
        )