From fbf10d6e6e4a1e32f540755f847a5dcd0c77efc4 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 24 Nov 2019 02:22:53 -0500 Subject: [PATCH] More 5.0 theme fixes --- .../moez/QKSMS/common/util/extensions/ViewExtensions.kt | 2 +- .../moez/QKSMS/feature/compose/editing/ChipsAdapter.kt | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt index 3dea161c..ab33108f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/extensions/ViewExtensions.kt @@ -64,7 +64,7 @@ fun View.setBackgroundTint(color: Int) { // API 21 doesn't support this if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) { - background?.setColorFilter(color, PorterDuff.Mode.SRC_ATOP) + background?.setColorFilter(color, PorterDuff.Mode.SRC_IN) } backgroundTintList = ColorStateList.valueOf(color) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt index 9c23632a..50cc7eb2 100755 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/editing/ChipsAdapter.kt @@ -19,6 +19,7 @@ package com.moez.QKSMS.feature.compose.editing import android.content.Context +import android.os.Build import android.view.LayoutInflater import android.view.ViewGroup import android.widget.RelativeLayout @@ -27,7 +28,10 @@ import com.moez.QKSMS.R import com.moez.QKSMS.common.base.QkAdapter import com.moez.QKSMS.common.base.QkViewHolder import com.moez.QKSMS.common.util.extensions.dpToPx +import com.moez.QKSMS.common.util.extensions.resolveThemeColor +import com.moez.QKSMS.common.util.extensions.setBackgroundTint import io.reactivex.subjects.PublishSubject +import kotlinx.android.synthetic.main.contact_chip.* import kotlinx.android.synthetic.main.contact_chip.view.* import javax.inject.Inject @@ -40,6 +44,11 @@ class ChipsAdapter @Inject constructor() : QkAdapter() { val inflater = LayoutInflater.from(parent.context) val view = inflater.inflate(R.layout.contact_chip, parent, false) return QkViewHolder(view).apply { + // These theme attributes don't apply themselves on API 21 + if (Build.VERSION.SDK_INT <= 22) { + content.setBackgroundTint(view.context.resolveThemeColor(R.attr.bubbleColor)) + } + view.setOnClickListener { val chip = getItem(adapterPosition) showDetailedChip(view.context, chip)