nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Animating chat reply appearance.

Browse Source
This commit is contained in:
Vitor Pamplona
2023-02-25 19:39:03 -05:00
parent 81f9edf00c
commit afc43ccd28
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt
+5 -4
View File
@@ -1,5 +1,6 @@
package com.vitorpamplona.amethyst.ui.screen package com.vitorpamplona.amethyst.ui.screen
import androidx.compose.animation.animateContentSize
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
@@ -144,9 +145,9 @@ fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, accoun
Spacer(modifier = Modifier.height(10.dp)) Spacer(modifier = Modifier.height(10.dp))
val replyingNote = replyTo.value Row(Modifier.padding(horizontal = 10.dp).animateContentSize(), verticalAlignment = Alignment.CenterVertically) {
if (replyingNote != null) { val replyingNote = replyTo.value
Row(Modifier.padding(horizontal = 10.dp), verticalAlignment = Alignment.CenterVertically) { if (replyingNote != null) {
Column(Modifier.weight(1f)) { Column(Modifier.weight(1f)) {
ChatroomMessageCompose( ChatroomMessageCompose(
baseNote = replyingNote, baseNote = replyingNote,
@@ -177,7 +178,7 @@ fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, accoun
} }
//LAST ROW //LAST ROW
Row(modifier = Modifier.padding(start = 10.dp, end = 10.dp, bottom = 10.dp).fillMaxWidth(), Row(modifier = Modifier.padding(start = 10.dp, end = 10.dp, bottom = 10.dp, top= 5.dp).fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween, horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically verticalAlignment = Alignment.CenterVertically
) { ) {
app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
+4 -3
View File
@@ -1,5 +1,6 @@
package com.vitorpamplona.amethyst.ui.screen package com.vitorpamplona.amethyst.ui.screen
import androidx.compose.animation.animateContentSize
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
@@ -120,9 +121,9 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr
Spacer(modifier = Modifier.height(10.dp)) Spacer(modifier = Modifier.height(10.dp))
val replyingNote = replyTo.value Row(Modifier.padding(horizontal = 10.dp).animateContentSize(), verticalAlignment = Alignment.CenterVertically) {
if (replyingNote != null) { val replyingNote = replyTo.value
Row(Modifier.padding(horizontal = 10.dp), verticalAlignment = Alignment.CenterVertically) { if (replyingNote != null) {
Column(Modifier.weight(1f)) { Column(Modifier.weight(1f)) {
ChatroomMessageCompose( ChatroomMessageCompose(
baseNote = replyingNote, baseNote = replyingNote,