Show message title
This commit is contained in:
1 parent
af24378fa9
commit
c5e6a8b0b6
2 files changed
+14
-6
No files matched your search
+14
-4
@@ -1,6 +1,7 @@
|
|||||||
package ac.cord.auxiliary.compose.ui.composable
|
package ac.cord.auxiliary.compose.ui.composable
|
||||||
|
|
||||||
import ac.cord.auxiliary.compose.database.model.ChatRoom
|
import ac.cord.auxiliary.compose.database.model.ChatRoom
|
||||||
|
import ac.cord.auxiliary.compose.database.model.Participant
|
||||||
import ac.cord.auxiliary.compose.database.model.intermdiate.LocalChatRoom
|
import ac.cord.auxiliary.compose.database.model.intermdiate.LocalChatRoom
|
||||||
import ac.cord.auxiliary.compose.repository.ChatRepository
|
import ac.cord.auxiliary.compose.repository.ChatRepository
|
||||||
import ac.cord.auxiliary.compose.repository.NostrRepository
|
import ac.cord.auxiliary.compose.repository.NostrRepository
|
||||||
@@ -70,7 +71,16 @@ fun ChatRoomDetailScreen(
|
|||||||
topBar = {
|
topBar = {
|
||||||
TopAppBar(
|
TopAppBar(
|
||||||
title = {
|
title = {
|
||||||
Text(chatRoomDetailUIState.localChatRoom.chatRoom.subject ?: "Message")
|
val messageTitle = chatRoomDetailUIState.localChatRoom.chatRoom.subject ?: if (chatRoomDetailUIState.localChatRoom.participants.size == 1) {
|
||||||
|
"Note to Self (${chatRoomDetailUIState.localChatRoom.participants.first().profile?.humanReadableNameOrPubkey()})"
|
||||||
|
} else {
|
||||||
|
// Remove the active user publicKey from participants...
|
||||||
|
chatRoomDetailUIState.localChatRoom.participants.filter { it.participant.participantPublicKey != chatRoomDetailUIState.localChatRoom.chatRoom.userPublicKey }.map { it.profile?.humanReadableNameOrPubkey() ?: "unknown participant" }.joinToString()
|
||||||
|
}
|
||||||
|
|
||||||
|
Text(
|
||||||
|
text = messageTitle
|
||||||
|
)
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
@@ -133,7 +143,7 @@ fun ChatRoomDetailScreen(
|
|||||||
|
|
||||||
@Preview
|
@Preview
|
||||||
@Composable
|
@Composable
|
||||||
private fun UnqueuedProfileSynchronizationScreenPreview() {
|
private fun ChatRoomDetailScreenPreview() {
|
||||||
AuxTheme {
|
AuxTheme {
|
||||||
Surface(
|
Surface(
|
||||||
modifier = Modifier.fillMaxSize()
|
modifier = Modifier.fillMaxSize()
|
||||||
@@ -145,9 +155,9 @@ private fun UnqueuedProfileSynchronizationScreenPreview() {
|
|||||||
chatRoom = ChatRoom(
|
chatRoom = ChatRoom(
|
||||||
id = "",
|
id = "",
|
||||||
userPublicKey = "",
|
userPublicKey = "",
|
||||||
subject = "sdfa",
|
subject = "Message title",
|
||||||
initialGiftWrapUnsignedId = ""
|
initialGiftWrapUnsignedId = ""
|
||||||
)
|
),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
nostrRepository = NostrRepository.NO_OP_NOSTR_REPOSITORY,
|
nostrRepository = NostrRepository.NO_OP_NOSTR_REPOSITORY,
|
||||||
|
|||||||
-2
@@ -152,8 +152,6 @@ class ChatRoomListViewModel(
|
|||||||
modifier = Modifier.padding(20.dp),
|
modifier = Modifier.padding(20.dp),
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
) {
|
) {
|
||||||
// TODO: Remove active user pubKey
|
|
||||||
|
|
||||||
if (localChatRoom.participants.size == 1) {
|
if (localChatRoom.participants.size == 1) {
|
||||||
Text(
|
Text(
|
||||||
text = "Note to Self (${localChatRoom.participants.first().profile?.humanReadableNameOrPubkey()})"
|
text = "Note to Self (${localChatRoom.participants.first().profile?.humanReadableNameOrPubkey()})"
|
||||||
|
|||||||
Reference in new issue
Block a user