From c08aecbc194d6fb9eeeae29d8906506976d269fa Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 2 Oct 2023 20:13:52 +0200 Subject: [PATCH 1/2] Use primary color for quoted, own messages Resolves #3283 Signed-off-by: Andy Scherzinger --- .../adapters/messages/IncomingLinkPreviewMessageViewHolder.kt | 3 ++- .../adapters/messages/IncomingLocationMessageViewHolder.kt | 3 ++- .../talk/adapters/messages/IncomingPollMessageViewHolder.kt | 3 ++- .../talk/adapters/messages/IncomingTextMessageViewHolder.kt | 3 ++- .../talk/adapters/messages/IncomingVoiceMessageViewHolder.kt | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) 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 index 1480c53020..5af8760c51 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt @@ -29,6 +29,7 @@ import android.view.View import androidx.core.content.ContextCompat import autodagger.AutoInjector import coil.load +import com.nextcloud.android.common.ui.theme.utils.ColorRole import com.nextcloud.talk.R import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.application.NextcloudTalkApplication @@ -207,7 +208,7 @@ class IncomingLinkPreviewMessageViewHolder(incomingView: View, payload: Any) : .setTextColor(ContextCompat.getColor(context, R.color.textColorMaxContrast)) if (parentChatMessage.actorId?.equals(message.activeUser!!.userId) == true) { - viewThemeUtils.platform.colorViewBackground(binding.messageQuote.quoteColoredView) + viewThemeUtils.platform.colorViewBackground(binding.messageQuote.quoteColoredView, ColorRole.PRIMARY) } else { binding.messageQuote.quoteColoredView.setBackgroundResource(R.color.textColorMaxContrast) } 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 index 65af408a8c..e34bef7e3d 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt @@ -40,6 +40,7 @@ import android.webkit.WebViewClient import autodagger.AutoInjector import coil.load import com.google.android.material.snackbar.Snackbar +import com.nextcloud.android.common.ui.theme.utils.ColorRole import com.nextcloud.talk.R import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication @@ -191,7 +192,7 @@ class IncomingLocationMessageViewHolder(incomingView: View, payload: Any) : .setTextColor(context.resources.getColor(R.color.textColorMaxContrast, null)) if (parentChatMessage.actorId?.equals(message.activeUser!!.userId) == true) { - viewThemeUtils.platform.colorViewBackground(binding.messageQuote.quoteColoredView) + viewThemeUtils.platform.colorViewBackground(binding.messageQuote.quoteColoredView, ColorRole.PRIMARY) } else { binding.messageQuote.quoteColoredView.setBackgroundResource(R.color.textColorMaxContrast) } 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 index cb0f6de189..15364af132 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt @@ -27,6 +27,7 @@ import android.view.View import androidx.core.content.ContextCompat import autodagger.AutoInjector import coil.load +import com.nextcloud.android.common.ui.theme.utils.ColorRole import com.nextcloud.talk.R import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.application.NextcloudTalkApplication @@ -214,7 +215,7 @@ class IncomingPollMessageViewHolder(incomingView: View, payload: Any) : .setTextColor(ContextCompat.getColor(context, R.color.textColorMaxContrast)) if (parentChatMessage.actorId?.equals(message.activeUser!!.userId) == true) { - viewThemeUtils.platform.colorViewBackground(binding.messageQuote.quoteColoredView) + viewThemeUtils.platform.colorViewBackground(binding.messageQuote.quoteColoredView, ColorRole.PRIMARY) } else { binding.messageQuote.quoteColoredView.setBackgroundResource(R.color.textColorMaxContrast) } 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 index cf97850f4e..17333d452d 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt @@ -33,6 +33,7 @@ import android.view.View import androidx.core.content.ContextCompat import autodagger.AutoInjector import coil.load +import com.nextcloud.android.common.ui.theme.utils.ColorRole import com.nextcloud.talk.R import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication @@ -212,7 +213,7 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) : ) if (parentChatMessage.actorId?.equals(message.activeUser!!.userId) == true) { - viewThemeUtils.platform.colorViewBackground(binding.messageQuote.quoteColoredView) + viewThemeUtils.platform.colorViewBackground(binding.messageQuote.quoteColoredView, ColorRole.PRIMARY) } else { binding.messageQuote.quoteColoredView.setBackgroundColor( ContextCompat.getColor(binding.messageQuote.quoteColoredView.context, 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 index 2ad98ac0b0..53b89be851 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt @@ -312,7 +312,7 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) : .setTextColor(ContextCompat.getColor(context!!, R.color.textColorMaxContrast)) if (parentChatMessage.actorId?.equals(message.activeUser!!.userId) == true) { - viewThemeUtils.platform.colorViewBackground(binding.messageQuote.quoteColoredView) + viewThemeUtils.platform.colorViewBackground(binding.messageQuote.quoteColoredView, ColorRole.PRIMARY) } else { binding.messageQuote.quoteColoredView.setBackgroundResource(R.color.textColorMaxContrast) } From d4654f9f75a63cf67172f7d7bacbce2e6e0bbab4 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 4 Oct 2023 10:40:17 +0200 Subject: [PATCH 2/2] Move analysis to stable branch Signed-off-by: Andy Scherzinger --- scripts/analysis/analysis-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh index 521b71123d..4ede40fdc3 100755 --- a/scripts/analysis/analysis-wrapper.sh +++ b/scripts/analysis/analysis-wrapper.sh @@ -7,7 +7,7 @@ BUILD_NUMBER=$4 PR_NUMBER=$5 -stableBranch="master" +stableBranch="stable-17.1" repository="talk-android" ruby scripts/analysis/lint-up.rb