Skip to content

Commit 533b0d5

Browse files
committed
set searchresult subline if available
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
1 parent 0276720 commit 533b0d5

3 files changed

Lines changed: 14 additions & 6 deletions

File tree

app/src/main/java/com/nextcloud/talk/contextchat/ContextChatView.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,11 @@ fun ContextChatSuccessView(
134134
)
135135
}
136136
Column(verticalArrangement = Arrangement.Center) {
137-
Text(contextChatRetrieveUiStateSuccess.title ?: "", fontSize = 24.sp)
137+
Text(contextChatRetrieveUiStateSuccess.title ?: "", fontSize = 18.sp)
138+
139+
if (!contextChatRetrieveUiStateSuccess.subTitle.isNullOrEmpty()) {
140+
Text(contextChatRetrieveUiStateSuccess.subTitle, fontSize = 12.sp)
141+
}
138142
}
139143

140144
// This code was written back then but not needed yet, but it's not deleted yet

app/src/main/java/com/nextcloud/talk/contextchat/ContextChatViewModel.kt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,18 @@ class ContextChatViewModel @Inject constructor(private val chatNetworkDataSource
6868
messages = messages.filter { it.id == it.threadId }
6969
}
7070

71-
if (threadId?.isNotEmpty() == true) {
72-
finalTitle = messages.firstOrNull()?.threadTitle
71+
val subTitle = if (threadId?.isNotEmpty() == true) {
72+
messages.firstOrNull()?.threadTitle
73+
} else {
74+
""
7375
}
7476

7577
_getContextChatMessagesState.value = ContextChatRetrieveUiState.Success(
7678
messageId = messageId,
7779
threadId = threadId,
7880
messages = messages,
79-
title = finalTitle
81+
title = finalTitle,
82+
subTitle = subTitle
8083
)
8184
}
8285
}
@@ -91,7 +94,8 @@ class ContextChatViewModel @Inject constructor(private val chatNetworkDataSource
9194
val messageId: String,
9295
val threadId: String?,
9396
val messages: List<ChatMessageJson>,
94-
val title: String?
97+
val title: String?,
98+
val subTitle: String?
9599
) : ContextChatRetrieveUiState()
96100
data object Error : ContextChatRetrieveUiState()
97101
}

app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1541,7 +1541,7 @@ class ConversationsListActivity :
15411541
token = token,
15421542
threadId = item.messageEntry.threadId,
15431543
messageId = item.messageEntry.messageId!!,
1544-
title = conversationName
1544+
title = item.messageEntry.title
15451545
)
15461546
ContextChatView(context, contextChatViewModel)
15471547
}

0 commit comments

Comments
 (0)