Merge pull request #5339 from nextcloud/style/noid/reply-messages

AndyScherzinger · web-flow · commit 921b41c83a7c · 2025-09-08T18:03:59.000+02:00
Add a rounded background to reply message part
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingDeckCardViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingDeckCardViewHolder.kt
@@ -229,7 +229,7 @@ class IncomingDeckCardViewHolder(incomingView: View, payload: Any) :
                     viewThemeUtils.talk.themeParentMessage(
                         parentChatMessage,
                         message,
-                        binding.messageQuote.quoteColoredView
+                        binding.messageQuote.quotedChatMessageView
                     )
 
                     binding.messageQuote.quotedChatMessageView.visibility =
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt
@@ -221,7 +221,7 @@ class IncomingLinkPreviewMessageViewHolder(incomingView: View, payload: Any) :
                     viewThemeUtils.talk.themeParentMessage(
                         parentChatMessage,
                         message,
-                        binding.messageQuote.quoteColoredView
+                        binding.messageQuote.quotedChatMessageView
                     )
 
                     binding.messageQuote.quotedChatMessageView.visibility =
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt
@@ -189,7 +189,7 @@ class IncomingLocationMessageViewHolder(incomingView: View, payload: Any) :
                     viewThemeUtils.talk.themeParentMessage(
                         parentChatMessage,
                         message,
-                        binding.messageQuote.quoteColoredView
+                        binding.messageQuote.quotedChatMessageView
                     )
 
                     binding.messageQuote.quotedChatMessageView.visibility =
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt
@@ -224,7 +224,7 @@ class IncomingPollMessageViewHolder(incomingView: View, payload: Any) :
                     viewThemeUtils.talk.themeParentMessage(
                         parentChatMessage,
                         message,
-                        binding.messageQuote.quoteColoredView
+                        binding.messageQuote.quotedChatMessageView
                     )
                     binding.messageQuote.quotedChatMessageView.visibility =
                         if (!message.isDeleted &&
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
@@ -395,7 +395,7 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
                     viewThemeUtils.talk.themeParentMessage(
                         parentChatMessage,
                         message,
-                        binding.messageQuote.quoteColoredView,
+                        binding.messageQuote.quotedChatMessageView,
                         R.color.high_emphasis_text
                     )
 
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt
@@ -351,7 +351,7 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) :
                     viewThemeUtils.talk.themeParentMessage(
                         parentChatMessage,
                         message,
-                        binding.messageQuote.quoteColoredView
+                        binding.messageQuote.quotedChatMessageView
                     )
 
                     binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingDeckCardViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingDeckCardViewHolder.kt
@@ -217,7 +217,7 @@ class OutcomingDeckCardViewHolder(outcomingView: View) :
                     viewThemeUtils.talk.themeParentMessage(
                         parentChatMessage,
                         message,
-                        binding.messageQuote.quoteColoredView
+                        binding.messageQuote.quotedChatMessageView
                     )
 
                     binding.messageQuote.quotedChatMessageView.visibility =
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt
@@ -205,7 +205,11 @@ class OutcomingLinkPreviewMessageViewHolder(outcomingView: View, payload: Any) :
                         )
                     viewThemeUtils.talk.colorOutgoingQuoteText(binding.messageQuote.quotedMessage)
                     viewThemeUtils.talk.colorOutgoingQuoteAuthorText(binding.messageQuote.quotedMessageAuthor)
-                    viewThemeUtils.talk.colorOutgoingQuoteBackground(binding.messageQuote.quoteColoredView)
+                    viewThemeUtils.talk.themeParentMessage(
+                        parentChatMessage,
+                        message,
+                        binding.messageQuote.quotedChatMessageView
+                    )
 
                     binding.messageQuote.quotedChatMessageView.visibility =
                         if (!message.isDeleted &&
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLocationMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLocationMessageViewHolder.kt
@@ -238,7 +238,11 @@ class OutcomingLocationMessageViewHolder(incomingView: View) :
                         )
                     viewThemeUtils.talk.colorOutgoingQuoteText(binding.messageQuote.quotedMessage)
                     viewThemeUtils.talk.colorOutgoingQuoteAuthorText(binding.messageQuote.quotedMessageAuthor)
-                    viewThemeUtils.talk.colorOutgoingQuoteBackground(binding.messageQuote.quoteColoredView)
+                    viewThemeUtils.talk.themeParentMessage(
+                        parentChatMessage,
+                        message,
+                        binding.messageQuote.quotedChatMessageView
+                    )
 
                     binding.messageQuote.quotedChatMessageView.visibility =
                         if (!message.isDeleted &&
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt
@@ -214,7 +214,11 @@ class OutcomingPollMessageViewHolder(outcomingView: View, payload: Any) :
                         )
                     viewThemeUtils.talk.colorOutgoingQuoteText(binding.messageQuote.quotedMessage)
                     viewThemeUtils.talk.colorOutgoingQuoteAuthorText(binding.messageQuote.quotedMessageAuthor)
-                    viewThemeUtils.talk.colorOutgoingQuoteBackground(binding.messageQuote.quoteColoredView)
+                    viewThemeUtils.talk.themeParentMessage(
+                        parentChatMessage,
+                        message,
+                        binding.messageQuote.quotedChatMessageView
+                    )
 
                     binding.messageQuote.quotedChatMessageView.visibility =
                         if (!message.isDeleted &&
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt
@@ -413,7 +413,11 @@ class OutcomingTextMessageViewHolder(itemView: View) :
 
                     viewThemeUtils.talk.colorOutgoingQuoteText(binding.messageQuote.quotedMessage)
                     viewThemeUtils.talk.colorOutgoingQuoteAuthorText(binding.messageQuote.quotedMessageAuthor)
-                    viewThemeUtils.talk.colorOutgoingQuoteBackground(binding.messageQuote.quoteColoredView)
+                    viewThemeUtils.talk.themeParentMessage(
+                        parentChatMessage,
+                        message,
+                        binding.messageQuote.quotedChatMessageView
+                    )
 
                     binding.messageQuote.quotedChatMessageView.setOnClickListener {
                         chatActivity.jumpToQuotedMessage(parentChatMessage)
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt
@@ -349,7 +349,11 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) :
                         )
                     viewThemeUtils.talk.colorOutgoingQuoteText(binding.messageQuote.quotedMessage)
                     viewThemeUtils.talk.colorOutgoingQuoteAuthorText(binding.messageQuote.quotedMessageAuthor)
-                    viewThemeUtils.talk.colorOutgoingQuoteBackground(binding.messageQuote.quoteColoredView)
+                    viewThemeUtils.talk.themeParentMessage(
+                        parentChatMessage,
+                        message,
+                        binding.messageQuote.quotedChatMessageView
+                    )
 
                     binding.messageQuote.quotedChatMessageView.visibility =
                         if (!message.isDeleted &&
diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt
@@ -14,6 +14,7 @@ import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.graphics.Typeface
 import android.graphics.drawable.Drawable
+import android.graphics.drawable.GradientDrawable
 import android.graphics.drawable.LayerDrawable
 import android.text.Spannable
 import android.text.Spanned
@@ -131,12 +132,6 @@ class TalkSpecificViewThemeUtils @Inject constructor(
         }
     }
 
-    fun colorOutgoingQuoteBackground(view: View) {
-        withScheme(view) { scheme ->
-            view.setBackgroundColor(dynamicColor.onSurfaceVariant().getArgb(scheme))
-        }
-    }
-
     fun colorContactChatItemName(contactName: androidx.emoji2.widget.EmojiTextView) {
         withScheme(contactName) { scheme ->
             contactName.setTextColor(dynamicColor.onPrimaryContainer().getArgb(scheme))
@@ -379,11 +374,18 @@ class TalkSpecificViewThemeUtils @Inject constructor(
         @ColorRes quoteColorNonSelf: Int = R.color.textColorMaxContrast
     ) {
         withScheme(quoteColoredView) { scheme ->
+            val shapeRectangle = ContextCompat.getDrawable(
+                quoteColoredView.context,
+                R.drawable.reply_background
+            )
+                as LayerDrawable
+            val gradient = shapeRectangle.findDrawableByLayerId(R.id.quoteLine) as GradientDrawable
             if (parentChatMessage.actorId?.equals(message.activeUser!!.userId) == true) {
-                quoteColoredView.setBackgroundColor(dynamicColor.primary().getArgb(scheme))
+                gradient.setColor(dynamicColor.primary().getArgb(scheme))
             } else {
-                quoteColoredView.setBackgroundResource(quoteColorNonSelf)
+                gradient.setColor(dynamicColor.onSurfaceVariant().getArgb(scheme))
             }
+            quoteColoredView.background = shapeRectangle
         }
     }
 
diff --git a/app/src/main/res/drawable/reply_background.xml b/app/src/main/res/drawable/reply_background.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Nextcloud Talk - Android Client
+  ~
+  ~ SPDX-FileCopyrightText: 2025 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-License-Identifier: GPL-3.0-or-later
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/quoteLine" android:width="4dp">
+        <shape android:shape="rectangle">
+            <corners
+                android:bottomLeftRadius="8dp"
+                android:bottomRightRadius="0dp"
+                android:topLeftRadius="8dp"
+                android:topRightRadius="0dp" />
+            <solid android:color="@color/textColorMaxContrast" />
+        </shape>
+    </item>
+    <item
+        android:bottom="0dp"
+        android:left="4dp"
+        android:right="0dp"
+        android:top="0dp">
+        <shape android:shape="rectangle">
+            <corners
+                android:bottomLeftRadius="0dp"
+                android:bottomRightRadius="8dp"
+                android:topLeftRadius="0dp"
+                android:topRightRadius="8dp" />
+            <solid android:color="@color/reply_background" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/app/src/main/res/layout/item_message_quote.xml b/app/src/main/res/layout/item_message_quote.xml
@@ -12,24 +12,19 @@
     android:id="@+id/quotedChatMessageView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@drawable/reply_background"
+    android:paddingStart="12dp"
+    android:paddingEnd="12dp"
+    android:paddingBottom="4dp"
+    android:paddingTop="4dp"
     android:layout_marginBottom="8dp">
 
-    <View
-        android:id="@+id/quoteColoredView"
-        android:layout_width="2dp"
-        android:layout_height="match_parent"
-        android:layout_alignBottom="@id/flexboxQuoted"
-        android:layout_alignParentStart="true"
-        android:layout_marginEnd="8dp"
-        android:background="@color/high_emphasis_text" />
-
     <androidx.emoji2.widget.EmojiTextView
         android:id="@+id/quotedMessageAuthor"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
         android:layout_marginEnd="8dp"
-        android:layout_toEndOf="@id/quoteColoredView"
         android:alpha="0.6"
         android:ellipsize="end"
         android:textAlignment="viewStart"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -13,7 +13,6 @@
     <color name="colorAccent">@color/colorPrimary</color>
     <color name="disabled_text">#ff6F6F6F</color>
 
-
     <!-- App bar -->
     <color name="appbar">#1E1E1E</color>
     <color name="fontAppbar">#FFFFFF</color>
@@ -40,6 +39,9 @@
 
     <color name="chat_separator">#484848</color>
 
+    <!-- Background for replied messages -->
+    <color name="reply_background">#33000000</color>
+
     <!-- Chat window incoming message text & informational -->
     <color name="bg_bottom_sheet">#121212</color>
     <color name="bg_message_list_incoming_bubble">#2A2A2A</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -14,8 +14,6 @@
     <color name="textColorOnPrimaryBackground">#ffffff</color> <!-- white/black depending on primary color -->
     <color name="nc_login_text_color">#B3FFFFFF</color>
 
-
-
     <!-- App bar -->
     <color name="appbar">@android:color/white</color>
     <color name="fontAppbar">#666666</color>
@@ -39,6 +37,8 @@
     <color name="nc_outcoming_text_default">#FFFFFF</color>
     <!-- Text color of received messages -->
     <color name="nc_incoming_text_default">@color/high_emphasis_text</color>
+    <!-- Background for replied messages -->
+    <color name="reply_background">#55FFFFFF</color>
 
     <!-- Name of person or group for the chat conversation -->
     <color name="conversation_item_header">@color/high_emphasis_text</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -27,8 +27,8 @@
 
     <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">14dp</dimen>
+    <dimen name="message_bubble_corners_radius">18dp</dimen>
+    <dimen name="message_bubble_corners_horizontal_padding">12dp</dimen>
     <dimen name="message_bubble_corners_vertical_padding">12dp</dimen>
     <dimen name="message_bubble_checkmark_height">18dp</dimen>
 
diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 101 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 99 warnings</span>

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ class IncomingDeckCardViewHolder(incomingView: View, payload: Any) :`
`229`	`229`	`viewThemeUtils.talk.themeParentMessage(`
`230`	`230`	`parentChatMessage,`
`231`	`231`	`message,`
`232`		`- binding.messageQuote.quoteColoredView`
	`232`	`+ binding.messageQuote.quotedChatMessageView`
`233`	`233`	`)`
`234`	`234`
`235`	`235`	`binding.messageQuote.quotedChatMessageView.visibility =`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ class IncomingLinkPreviewMessageViewHolder(incomingView: View, payload: Any) :`
`221`	`221`	`viewThemeUtils.talk.themeParentMessage(`
`222`	`222`	`parentChatMessage,`
`223`	`223`	`message,`
`224`		`- binding.messageQuote.quoteColoredView`
	`224`	`+ binding.messageQuote.quotedChatMessageView`
`225`	`225`	`)`
`226`	`226`
`227`	`227`	`binding.messageQuote.quotedChatMessageView.visibility =`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ class IncomingLocationMessageViewHolder(incomingView: View, payload: Any) :`
`189`	`189`	`viewThemeUtils.talk.themeParentMessage(`
`190`	`190`	`parentChatMessage,`
`191`	`191`	`message,`
`192`		`- binding.messageQuote.quoteColoredView`
	`192`	`+ binding.messageQuote.quotedChatMessageView`
`193`	`193`	`)`
`194`	`194`
`195`	`195`	`binding.messageQuote.quotedChatMessageView.visibility =`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ class IncomingPollMessageViewHolder(incomingView: View, payload: Any) :`
`224`	`224`	`viewThemeUtils.talk.themeParentMessage(`
`225`	`225`	`parentChatMessage,`
`226`	`226`	`message,`
`227`		`- binding.messageQuote.quoteColoredView`
	`227`	`+ binding.messageQuote.quotedChatMessageView`
`228`	`228`	`)`
`229`	`229`	`binding.messageQuote.quotedChatMessageView.visibility =`
`230`	`230`	`if (!message.isDeleted &&`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :`
`395`	`395`	`viewThemeUtils.talk.themeParentMessage(`
`396`	`396`	`parentChatMessage,`
`397`	`397`	`message,`
`398`		`- binding.messageQuote.quoteColoredView,`
	`398`	`+ binding.messageQuote.quotedChatMessageView,`
`399`	`399`	`R.color.high_emphasis_text`
`400`	`400`	`)`
`401`	`401`
Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) :`
`351`	`351`	`viewThemeUtils.talk.themeParentMessage(`
`352`	`352`	`parentChatMessage,`
`353`	`353`	`message,`
`354`		`- binding.messageQuote.quoteColoredView`
	`354`	`+ binding.messageQuote.quotedChatMessageView`
`355`	`355`	`)`
`356`	`356`
`357`	`357`	`binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ class OutcomingDeckCardViewHolder(outcomingView: View) :`
`217`	`217`	`viewThemeUtils.talk.themeParentMessage(`
`218`	`218`	`parentChatMessage,`
`219`	`219`	`message,`
`220`		`- binding.messageQuote.quoteColoredView`
	`220`	`+ binding.messageQuote.quotedChatMessageView`
`221`	`221`	`)`
`222`	`222`
`223`	`223`	`binding.messageQuote.quotedChatMessageView.visibility =`