From a8cc408390ac27afa7b93686f688ca071bf7000a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 24 Nov 2019 02:15:11 -0500 Subject: [PATCH] Fix theme on 5.0 --- .../com/moez/QKSMS/feature/contacts/ContactsActivity.kt | 8 ++++++++ .../main/java/com/moez/QKSMS/feature/main/MainActivity.kt | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt index 5b5863d8..7dda49b5 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/contacts/ContactsActivity.kt @@ -20,6 +20,7 @@ package com.moez.QKSMS.feature.contacts import android.app.Activity import android.content.Intent +import android.os.Build import android.os.Bundle import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProviders @@ -30,6 +31,8 @@ import com.moez.QKSMS.R import com.moez.QKSMS.common.ViewModelFactory import com.moez.QKSMS.common.base.QkThemedActivity import com.moez.QKSMS.common.util.extensions.hideKeyboard +import com.moez.QKSMS.common.util.extensions.resolveThemeColor +import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.showKeyboard import com.moez.QKSMS.common.widget.QkDialog import com.moez.QKSMS.extensions.Optional @@ -86,6 +89,11 @@ class ContactsActivity : QkThemedActivity(), ContactsContract { contacts.itemAnimator = null contacts.adapter = contactsAdapter + + // These theme attributes don't apply themselves on API 21 + if (Build.VERSION.SDK_INT <= 22) { + search.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor)) + } } override fun render(state: ContactsState) { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt index 35ab52d1..0d2665ba 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt @@ -23,6 +23,7 @@ import android.animation.ObjectAnimator import android.app.AlertDialog import android.content.Intent import android.content.res.ColorStateList +import android.os.Build import android.os.Bundle import android.view.Gravity import android.view.Menu @@ -184,6 +185,11 @@ class MainActivity : QkThemedActivity(), MainView { itemTouchCallback.adapter = conversationsAdapter conversationsAdapter.autoScrollToStart(recyclerView) + + // These theme attributes don't apply themselves on API 21 + if (Build.VERSION.SDK_INT <= 22) { + toolbarSearch.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor)) + } } override fun onNewIntent(intent: Intent?) {