gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-08-12 06:25:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5225 from nextcloud/fix/noid/systemMessageTextSize

Browse Source 
Ensure system messages are 14sp text sized
This commit is contained in:
Andy Scherzinger 2025-08-06 11:15:20 +02:00 committed by GitHub
commit 615975a5ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageViewHolder.kt
View File

@ -14,6 +14,7 @@ import android.text.SpannableString
import android.text.TextPaint
import android.text.method.LinkMovementMethod
import android.text.style.ClickableSpan
import android.util.TypedValue
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
@ -76,6 +77,10 @@ class SystemMessageViewHolder(itemView: View) :
R.drawable.shape_grouped_incoming_message
)
ViewCompat.setBackground(background, bubbleDrawable)
binding.messageText.setTextSize(
TypedValue.COMPLEX_UNIT_PX,
resources.getDimension(R.dimen.chat_system_message_text_size)
)
var messageString: Spannable = SpannableString(message.text)
if (message.messageParameters != null && message.messageParameters!!.size > 0) {
for (key in message.messageParameters!!.keys) {
@ -89,7 +94,13 @@ class SystemMessageViewHolder(itemView: View) :
} else {
individualMap["name"]
}
messageString = DisplayUtils.searchAndColor(messageString, searchText!!, mentionColor)
messageString =
DisplayUtils.searchAndColor(
messageString,
searchText!!,
mentionColor,
resources.getDimensionPixelSize(R.dimen.chat_system_message_text_size)
)
if (individualMap["link"] != null) {
val displayName = individualMap["name"] ?: ""
val link = (user.baseUrl + individualMap["link"])

3
app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt
View File

@ -292,7 +292,7 @@ object DisplayUtils {
return spannableString
}
fun searchAndColor(text: Spannable, searchText: String, @ColorInt color: Int): Spannable {
fun searchAndColor(text: Spannable, searchText: String, @ColorInt color: Int, textSize: Int): Spannable {
val spannableString: Spannable = SpannableString(text)
val stringText = text.toString()
if (TextUtils.isEmpty(text) || TextUtils.isEmpty(searchText)) {
@ -303,7 +303,6 @@ object DisplayUtils {
Pattern.CASE_INSENSITIVE or Pattern.LITERAL or Pattern.MULTILINE
)
.matcher(spannableString)
val textSize = sharedApplication!!.resources.getDimensionPixelSize(R.dimen.chat_text_size)
var lastStartIndex = -1
while (m.find()) {
val start = stringText.indexOf(m.group(), lastStartIndex)

3
app/src/main/res/values/dimens.xml
View File

@ -26,8 +26,9 @@
<dimen name="avatar_size_open_conversation_list">52dp</dimen>
<dimen name="chat_text_size">16sp</dimen>
<dimen name="chat_system_message_text_size">14sp</dimen>
<dimen name="message_bubble_corners_radius">20dp</dimen>
<dimen name="message_bubble_corners_horizontal_padding">16dp</dimen>
<dimen name="message_bubble_corners_horizontal_padding">14dp</dimen>
<dimen name="message_bubble_corners_vertical_padding">12dp</dimen>
<dimen name="message_bubble_checkmark_height">18dp</dimen>