Skip to content

Commit 23ef718

Browse files
AndyScherzingerAndyScherzinger
committed
style(search): Theme search field in toolbar
AI-assistant: Claude Code v2.1.138 (Claude Sonnet 4.6) Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
1 parent 6245692 commit 23ef718

2 files changed

Lines changed: 69 additions & 68 deletions

File tree

‎app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3476,6 +3476,7 @@ class ChatActivity :
34763476
actionView.queryHint = getString(R.string.message_search_hint)
34773477
actionView.isIconified = false
34783478
actionView.maxWidth = Int.MAX_VALUE
3479+
viewThemeUtils.talk.themeSearchView(actionView)
34793480
actionView.requestFocus()
34803481
window.decorView.post {
34813482
val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager

‎app/src/main/java/com/nextcloud/talk/ui/chat/ChatMessageView.kt‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -129,84 +129,84 @@ fun ChatMessageView(
129129
)
130130
) {
131131
Box(modifier = Modifier.padding(horizontal = 12.dp)) {
132-
when (val content = message.content) {
133-
MessageTypeContent.RegularText -> {
134-
TextMessage(
135-
uiMessage = message,
136-
isOneToOneConversation = context.isOneToOneConversation,
137-
conversationThreadId = context.conversationThreadId,
138-
highlightSearchTerm = highlightSearchTerm
139-
)
140-
}
132+
when (val content = message.content) {
133+
MessageTypeContent.RegularText -> {
134+
TextMessage(
135+
uiMessage = message,
136+
isOneToOneConversation = context.isOneToOneConversation,
137+
conversationThreadId = context.conversationThreadId,
138+
highlightSearchTerm = highlightSearchTerm
139+
)
140+
}
141141

142-
MessageTypeContent.SystemMessage -> {
143-
SystemMessage(message)
144-
}
142+
MessageTypeContent.SystemMessage -> {
143+
SystemMessage(message)
144+
}
145145

146-
is MessageTypeContent.Media -> {
147-
MediaMessage(
148-
typeContent = content,
149-
message = message,
150-
isOneToOneConversation = context.isOneToOneConversation,
151-
conversationThreadId = context.conversationThreadId,
152-
onImageClick = callbacks.onFileClick
153-
)
154-
}
146+
is MessageTypeContent.Media -> {
147+
MediaMessage(
148+
typeContent = content,
149+
message = message,
150+
isOneToOneConversation = context.isOneToOneConversation,
151+
conversationThreadId = context.conversationThreadId,
152+
onImageClick = callbacks.onFileClick
153+
)
154+
}
155155

156-
is MessageTypeContent.LinkPreview -> {
157-
LinkMessage(
158-
typeContent = content,
159-
message = message,
160-
isOneToOneConversation = context.isOneToOneConversation,
161-
conversationThreadId = context.conversationThreadId
162-
)
163-
}
156+
is MessageTypeContent.LinkPreview -> {
157+
LinkMessage(
158+
typeContent = content,
159+
message = message,
160+
isOneToOneConversation = context.isOneToOneConversation,
161+
conversationThreadId = context.conversationThreadId
162+
)
163+
}
164164

165-
is MessageTypeContent.Geolocation -> {
166-
GeolocationMessage(
167-
typeContent = content,
168-
message = message,
169-
isOneToOneConversation = context.isOneToOneConversation,
170-
conversationThreadId = context.conversationThreadId
171-
)
172-
}
165+
is MessageTypeContent.Geolocation -> {
166+
GeolocationMessage(
167+
typeContent = content,
168+
message = message,
169+
isOneToOneConversation = context.isOneToOneConversation,
170+
conversationThreadId = context.conversationThreadId
171+
)
172+
}
173173

174-
is MessageTypeContent.Voice -> {
175-
VoiceMessage(
176-
typeContent = content,
177-
message = message,
178-
isOneToOneConversation = context.isOneToOneConversation,
179-
conversationThreadId = context.conversationThreadId,
180-
onPlayPauseClick = callbacks.onVoicePlayPauseClick,
181-
onSeek = callbacks.onVoiceSeek,
182-
onSpeedClick = callbacks.onVoiceSpeedClick
183-
)
184-
}
174+
is MessageTypeContent.Voice -> {
175+
VoiceMessage(
176+
typeContent = content,
177+
message = message,
178+
isOneToOneConversation = context.isOneToOneConversation,
179+
conversationThreadId = context.conversationThreadId,
180+
onPlayPauseClick = callbacks.onVoicePlayPauseClick,
181+
onSeek = callbacks.onVoiceSeek,
182+
onSpeedClick = callbacks.onVoiceSpeedClick
183+
)
184+
}
185185

186-
is MessageTypeContent.Poll -> {
187-
PollMessage(
188-
typeContent = content,
189-
message = message,
190-
isOneToOneConversation = context.isOneToOneConversation,
191-
conversationThreadId = context.conversationThreadId,
192-
onPollClick = callbacks.onPollClick
193-
)
194-
}
186+
is MessageTypeContent.Poll -> {
187+
PollMessage(
188+
typeContent = content,
189+
message = message,
190+
isOneToOneConversation = context.isOneToOneConversation,
191+
conversationThreadId = context.conversationThreadId,
192+
onPollClick = callbacks.onPollClick
193+
)
194+
}
195195

196-
is MessageTypeContent.Deck -> {
197-
DeckMessage(
198-
typeContent = content,
199-
message = message,
200-
isOneToOneConversation = context.isOneToOneConversation,
201-
conversationThreadId = context.conversationThreadId
202-
)
203-
}
196+
is MessageTypeContent.Deck -> {
197+
DeckMessage(
198+
typeContent = content,
199+
message = message,
200+
isOneToOneConversation = context.isOneToOneConversation,
201+
conversationThreadId = context.conversationThreadId
202+
)
203+
}
204204

205-
else -> {
206-
Log.d("ChatView", "Unknown message type: ${'$'}content")
205+
else -> {
206+
Log.d("ChatView", "Unknown message type: ${'$'}content")
207+
}
207208
}
208209
}
209-
}
210210
val useContainerHighlight = highlightSearchTerm.isNullOrBlank() || isSelected
211211
if (isSelected && useContainerHighlight) {
212212
Box(

0 commit comments

Comments
 (0)