Skip to content

Commit 8f188aa

Browse files
committed
Simplifying pinned messages
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
1 parent 4f10ecc commit 8f188aa

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

app/src/main/java/com/nextcloud/talk/ui/PinnedMessage.kt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ import androidx.compose.foundation.clickable
1313
import androidx.compose.foundation.layout.Arrangement
1414
import androidx.compose.foundation.layout.Box
1515
import androidx.compose.foundation.layout.Column
16+
import androidx.compose.foundation.layout.Row
17+
import androidx.compose.foundation.layout.fillMaxWidth
1618
import androidx.compose.foundation.layout.heightIn
1719
import androidx.compose.foundation.layout.offset
1820
import androidx.compose.foundation.layout.padding
@@ -71,7 +73,7 @@ fun PinnedMessageView(
7173
val pinnedBy = stringResource(R.string.pinned_by)
7274

7375
message.actorDisplayName = remember(message.pinnedActorDisplayName) {
74-
"${message.actorDisplayName}\n$pinnedBy ${message.pinnedActorDisplayName}"
76+
"$pinnedBy ${message.pinnedActorDisplayName}"
7577
}
7678
val scrollState = rememberScrollState()
7779

@@ -97,10 +99,6 @@ fun PinnedMessageView(
9799
ConversationUtils.isParticipantOwnerOrModerator(currentConversation!!)
98100
}
99101

100-
val adapter = remember {
101-
ComposeChatAdapter()
102-
}
103-
104102
Column(
105103
verticalArrangement = Arrangement.spacedBy((-SPACE_16).dp),
106104
modifier = Modifier
@@ -117,7 +115,14 @@ fun PinnedMessageView(
117115
}
118116

119117
) {
120-
adapter.GetComposableForMessage(message)
118+
Column {
119+
message.actorDisplayName?.let {
120+
Text(it)
121+
}
122+
Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Start) {
123+
Text(message.text)
124+
}
125+
}
121126
}
122127

123128
var expanded by remember { mutableStateOf(false) }

0 commit comments

Comments
 (0)