From 6fe8b55acc5162d93d5069fb41dfddf5d7e7605e Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 6 Jul 2018 15:17:46 -0400 Subject: [PATCH] Fixed compose bar tint on Android 5.0 --- .../main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt | 2 +- .../main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index f9a135ac..51153719 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -138,7 +138,6 @@ class ComposeActivity : QkThemedActivity(), ComposeView { attachments.adapter = attachmentAdapter - messageBackground.backgroundTintMode = PorterDuff.Mode.MULTIPLY message.supportsInputContent = true theme @@ -153,6 +152,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { // These theme attributes don't apply themselves on API 21 if (Build.VERSION.SDK_INT <= 22) { + messageBackground.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor)) composeBackground.setBackgroundTint(resolveThemeColor(R.attr.composeBackground)) } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt index 09ef827c..de72ba7b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/qkreply/QkReplyActivity.kt @@ -77,6 +77,7 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView { if (Build.VERSION.SDK_INT <= 22) { toolbar.setBackgroundTint(resolveThemeColor(R.attr.colorPrimary)) background.setBackgroundTint(resolveThemeColor(R.attr.composeBackground)) + messageBackground.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor)) composeBackground.setBackgroundTint(resolveThemeColor(R.attr.composeBackground)) composeBackground2.setBackgroundTint(resolveThemeColor(R.attr.composeBackground)) }