Use Observable instead of Int for theme color

This commit is contained in:
Moez Bhatti
2017-11-29 23:30:45 -05:00
parent 9df4610c83
commit fd5af2714b
8 changed files with 154 additions and 41 deletions
@@ -71,7 +71,7 @@ class NotificationManager @Inject constructor(
val readAction = NotificationCompat.Action(R.drawable.ic_done_black_24dp, context.getString(R.string.notification_read), readPI) val readAction = NotificationCompat.Action(R.drawable.ic_done_black_24dp, context.getString(R.string.notification_read), readPI)
val notification = NotificationCompat.Builder(context, "channel_1") val notification = NotificationCompat.Builder(context, "channel_1")
.setColor(themeManager.color) .setColor(themeManager.color.blockingFirst())
.setSmallIcon(R.mipmap.ic_launcher) .setSmallIcon(R.mipmap.ic_launcher)
.setNumber(messages.size) .setNumber(messages.size)
.setAutoCancel(true) .setAutoCancel(true)
@@ -1,16 +1,41 @@
package com.moez.QKSMS.common.util package com.moez.QKSMS.common.util
import android.animation.ValueAnimator
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
import java.util.concurrent.TimeUnit
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@Singleton @Singleton
class ThemeManager @Inject constructor() { class ThemeManager @Inject constructor() {
val color = 0xFF008389.toInt() val color: Observable<Int>
val bubbleColor = 0xFFFFFFFF.toInt() val bubbleColor = 0xFFFFFFFF.toInt()
val textPrimary = 0xFF49555F.toInt() val textPrimary = 0xFF49555F.toInt()
val textSecondary = 0xFF70808D.toInt() val textSecondary = 0xFF70808D.toInt()
val textTertiary = 0xFFB7B9C0.toInt() val textTertiary = 0xFFB7B9C0.toInt()
init {
val colorSubject: Subject<Int> = BehaviorSubject.createDefault(0xFF008389.toInt())
color = colorSubject
.buffer(80, TimeUnit.MILLISECONDS)
.filter { it.isNotEmpty() }
.map { it.last() }
.observeOn(AndroidSchedulers.mainThread())
ValueAnimator.ofArgb(0xFF444444.toInt(), 0xFF008389.toInt()).run {
repeatMode = ValueAnimator.REVERSE
repeatCount = ValueAnimator.INFINITE
duration = 1500
addUpdateListener { animation -> colorSubject.onNext(animation.animatedValue as Int) }
start()
}
}
} }
@@ -1,6 +1,7 @@
package com.moez.QKSMS.presentation.compose package com.moez.QKSMS.presentation.compose
import android.app.AlertDialog import android.app.AlertDialog
import android.content.res.ColorStateList
import android.os.Bundle import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView import android.support.v7.widget.RecyclerView
@@ -10,13 +11,14 @@ import com.jakewharton.rxbinding2.widget.textChanges
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.util.ThemeManager import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.common.util.extensions.setTint
import com.moez.QKSMS.common.util.extensions.setVisible import com.moez.QKSMS.common.util.extensions.setVisible
import com.moez.QKSMS.common.util.extensions.showKeyboard import com.moez.QKSMS.common.util.extensions.showKeyboard
import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Contact
import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.presentation.base.QkActivity import com.moez.QKSMS.presentation.base.QkActivity
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.compose_activity.* import kotlinx.android.synthetic.main.compose_activity.*
@@ -45,6 +47,8 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
private val contactsAdapter by lazy { ContactAdapter(this) } private val contactsAdapter by lazy { ContactAdapter(this) }
private val messageAdapter by lazy { MessagesAdapter() } private val messageAdapter by lazy { MessagesAdapter() }
private val disposables = CompositeDisposable()
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
@@ -66,9 +70,23 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
messageList.layoutManager = layoutManager messageList.layoutManager = layoutManager
messageList.adapter = messageAdapter messageList.adapter = messageAdapter
val states = arrayOf(
intArrayOf(android.R.attr.state_enabled),
intArrayOf(-android.R.attr.state_enabled))
disposables += themeManager.color
.map { color -> ColorStateList(states, intArrayOf(color, themeManager.textTertiary)) }
.subscribe { tintList -> send.imageTintList = tintList }
window.callback = ComposeWindowCallback(window.callback, this) window.callback = ComposeWindowCallback(window.callback, this)
} }
override fun onDestroy() {
super.onDestroy()
disposables.clear()
}
override fun render(state: ComposeState) { override fun render(state: ComposeState) {
toolbarTitle.setVisible(!state.editingMode) toolbarTitle.setVisible(!state.editingMode)
chips.setVisible(state.editingMode) chips.setVisible(state.editingMode)
@@ -94,7 +112,6 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
if (title != state.title) title = state.title if (title != state.title) title = state.title
if (message.text.toString() != state.draft) message.setText(state.draft) if (message.text.toString() != state.draft) message.setText(state.draft)
send.setTint(if (state.canSend) themeManager.color else resources.getColor(R.color.textTertiary))
send.isEnabled = state.canSend send.isEnabled = state.canSend
} }
@@ -9,6 +9,8 @@ import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.util.ThemeManager import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.setBackgroundTint
import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Contact
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import kotlinx.android.synthetic.main.contact_chip_detailed.view.* import kotlinx.android.synthetic.main.contact_chip_detailed.view.*
import javax.inject.Inject import javax.inject.Inject
@@ -17,11 +19,12 @@ class DetailedChipView(context: Context) : RelativeLayout(context) {
@Inject lateinit var themeManager: ThemeManager @Inject lateinit var themeManager: ThemeManager
private val disposables = CompositeDisposable()
init { init {
View.inflate(context, R.layout.contact_chip_detailed, this) View.inflate(context, R.layout.contact_chip_detailed, this)
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
card.setBackgroundTint(themeManager.color)
setOnClickListener { hide() } setOnClickListener { hide() }
visibility = View.GONE visibility = View.GONE
@@ -30,6 +33,17 @@ class DetailedChipView(context: Context) : RelativeLayout(context) {
isFocusableInTouchMode = true isFocusableInTouchMode = true
} }
override fun onAttachedToWindow() {
super.onAttachedToWindow()
disposables += themeManager.color
.subscribe { color -> card.setBackgroundTint(color) }
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
disposables.clear()
}
fun setContact(contact: Contact) { fun setContact(contact: Contact) {
avatar.contact = contact avatar.contact = contact
name.text = contact.name name.text = contact.name
@@ -1,6 +1,7 @@
package com.moez.QKSMS.presentation.compose package com.moez.QKSMS.presentation.compose
import android.content.Context import android.content.Context
import android.support.v7.widget.RecyclerView
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
@@ -15,6 +16,8 @@ import com.moez.QKSMS.common.util.extensions.setPadding
import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Contact
import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.presentation.base.QkViewHolder import com.moez.QKSMS.presentation.base.QkViewHolder
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject import io.reactivex.subjects.Subject
import io.realm.RealmRecyclerViewAdapter import io.realm.RealmRecyclerViewAdapter
@@ -37,29 +40,28 @@ class MessagesAdapter : RealmRecyclerViewAdapter<Message, QkViewHolder>(null, tr
val longClicks: Subject<Message> = PublishSubject.create<Message>() val longClicks: Subject<Message> = PublishSubject.create<Message>()
private val people = ArrayList<String>() private val people = ArrayList<String>()
private val disposables = CompositeDisposable()
init { init {
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
} }
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder { override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder {
val layoutRes: Int
val bubbleColor: Int
when (viewType) {
VIEWTYPE_ME -> {
layoutRes = R.layout.message_list_item_out
bubbleColor = themeManager.bubbleColor
}
else -> {
layoutRes = R.layout.message_list_item_in
bubbleColor = themeManager.color
}
}
val layoutInflater = LayoutInflater.from(context) val layoutInflater = LayoutInflater.from(context)
val view = layoutInflater.inflate(layoutRes, parent, false) val view: View
view.body.setBackgroundTint(bubbleColor) when (viewType) {
VIEWTYPE_ME -> {
view = layoutInflater.inflate(R.layout.message_list_item_out, parent, false)
view.body.setBackgroundTint(themeManager.bubbleColor)
}
else -> {
view = layoutInflater.inflate(R.layout.message_list_item_in, parent, false)
disposables += themeManager.color
.subscribe { color -> view.body.setBackgroundTint(color) }
}
}
if (viewType != VIEWTYPE_ME) { if (viewType != VIEWTYPE_ME) {
val contact = Contact() val contact = Contact()
@@ -70,6 +72,11 @@ class MessagesAdapter : RealmRecyclerViewAdapter<Message, QkViewHolder>(null, tr
return QkViewHolder(view) return QkViewHolder(view)
} }
override fun onDetachedFromRecyclerView(recyclerView: RecyclerView?) {
super.onDetachedFromRecyclerView(recyclerView)
disposables.clear()
}
override fun onBindViewHolder(viewHolder: QkViewHolder, position: Int) { override fun onBindViewHolder(viewHolder: QkViewHolder, position: Int) {
val message = getItem(position)!! val message = getItem(position)!!
val view = viewHolder.itemView val view = viewHolder.itemView
@@ -1,6 +1,7 @@
package com.moez.QKSMS.presentation.main package com.moez.QKSMS.presentation.main
import android.content.Context import android.content.Context
import android.support.v7.widget.RecyclerView
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
import com.jakewharton.rxbinding2.view.RxView import com.jakewharton.rxbinding2.view.RxView
@@ -14,6 +15,8 @@ import com.moez.QKSMS.presentation.Navigator
import com.moez.QKSMS.presentation.base.FlowableAdapter import com.moez.QKSMS.presentation.base.FlowableAdapter
import com.moez.QKSMS.presentation.base.QkViewHolder import com.moez.QKSMS.presentation.base.QkViewHolder
import io.reactivex.Flowable import io.reactivex.Flowable
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import kotlinx.android.synthetic.main.conversation_list_item.view.* import kotlinx.android.synthetic.main.conversation_list_item.view.*
import javax.inject.Inject import javax.inject.Inject
@@ -25,6 +28,8 @@ class ConversationsAdapter(flowable: Flowable<List<ConversationMessagePair>>) :
@Inject lateinit var dateFormatter: DateFormatter @Inject lateinit var dateFormatter: DateFormatter
@Inject lateinit var themeManager: ThemeManager @Inject lateinit var themeManager: ThemeManager
private val disposables = CompositeDisposable()
init { init {
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
} }
@@ -39,12 +44,18 @@ class ConversationsAdapter(flowable: Flowable<List<ConversationMessagePair>>) :
val view = layoutInflater.inflate(layoutRes, parent, false) val view = layoutInflater.inflate(layoutRes, parent, false)
if (viewType == 1) { if (viewType == 1) {
view.date.setTextColor(themeManager.color) disposables += themeManager.color
.subscribe { color -> view.date.setTextColor(color) }
} }
return QkViewHolder(view) return QkViewHolder(view)
} }
override fun onDetachedFromRecyclerView(recyclerView: RecyclerView?) {
super.onDetachedFromRecyclerView(recyclerView)
disposables.clear()
}
override fun onBindViewHolder(viewHolder: QkViewHolder, position: Int) { override fun onBindViewHolder(viewHolder: QkViewHolder, position: Int) {
val conversation = getItem(position).conversation val conversation = getItem(position).conversation
val message = getItem(position).message val message = getItem(position).message
@@ -2,6 +2,8 @@ package com.moez.QKSMS.presentation.main
import android.Manifest import android.Manifest
import android.content.Intent import android.content.Intent
import android.content.res.ColorStateList
import android.graphics.drawable.StateListDrawable
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.ActionBarDrawerToggle import android.support.v7.app.ActionBarDrawerToggle
import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.LinearLayoutManager
@@ -18,9 +20,10 @@ import com.moez.QKSMS.R
import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.util.ThemeManager import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.setBackgroundTint
import com.moez.QKSMS.common.util.extensions.setTint
import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.Navigator
import com.moez.QKSMS.presentation.base.QkActivity import com.moez.QKSMS.presentation.base.QkActivity
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import kotlinx.android.synthetic.main.drawer_view.* import kotlinx.android.synthetic.main.drawer_view.*
import kotlinx.android.synthetic.main.main_activity.* import kotlinx.android.synthetic.main.main_activity.*
import kotlinx.android.synthetic.main.toolbar.* import kotlinx.android.synthetic.main.toolbar.*
@@ -45,6 +48,8 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) } private val itemTouchHelper by lazy { ItemTouchHelper(itemTouchCallback) }
private val disposables = CompositeDisposable()
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
@@ -55,10 +60,39 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
conversationList.layoutManager = LinearLayoutManager(this) conversationList.layoutManager = LinearLayoutManager(this)
compose.setBackgroundTint(themeManager.color)
// Don't allow clicks to pass through the drawer layout // Don't allow clicks to pass through the drawer layout
drawer.clicks().subscribe() drawer.clicks().subscribe()
val states = arrayOf(
intArrayOf(android.R.attr.state_selected),
intArrayOf(-android.R.attr.state_selected))
val rowBackground = {
StateListDrawable().apply {
addState(intArrayOf(android.R.attr.state_selected), getDrawable(R.color.row_selected))
addState(intArrayOf(-android.R.attr.state_selected), getDrawable(R.drawable.ripple))
mutate()
}
}
disposables += themeManager.color
.doOnNext { color -> compose.setBackgroundTint(color) }
.map { color -> ColorStateList(states, intArrayOf(color, themeManager.textSecondary)) }
.doOnNext { tintList -> inboxIcon.imageTintList = tintList }
.doOnNext { tintList -> archivedIcon.imageTintList = tintList }
.doOnNext { tintList -> scheduledIcon.imageTintList = tintList }
.doOnNext { tintList -> blockedIcon.imageTintList = tintList }
.subscribe()
inbox.background = rowBackground()
archived.background = rowBackground()
scheduled.background = rowBackground()
blocked.background = rowBackground()
}
override fun onDestroy() {
super.onDestroy()
disposables.clear()
} }
override fun onNewIntent(intent: Intent?) { override fun onNewIntent(intent: Intent?) {
@@ -74,27 +108,19 @@ class MainActivity : QkActivity<MainViewModel>(), MainView {
itemTouchHelper.attachToRecyclerView(if (state.page == MainPage.INBOX) conversationList else null) itemTouchHelper.attachToRecyclerView(if (state.page == MainPage.INBOX) conversationList else null)
} }
inbox.setBackgroundResource(getRowBackground(state.page == MainPage.INBOX)) inbox.isSelected = state.page == MainPage.INBOX
inboxIcon.setTint(getIconColor(state.page == MainPage.INBOX)) inboxIcon.isSelected = state.page == MainPage.INBOX
archived.setBackgroundResource(getRowBackground(state.page == MainPage.ARCHIVED)) archived.isSelected = state.page == MainPage.ARCHIVED
archivedIcon.setTint(getIconColor(state.page == MainPage.ARCHIVED)) archivedIcon.isSelected = state.page == MainPage.ARCHIVED
scheduled.setBackgroundResource(getRowBackground(state.page == MainPage.SCHEDULED)) scheduled.isSelected = state.page == MainPage.SCHEDULED
scheduledIcon.setTint(getIconColor(state.page == MainPage.SCHEDULED)) scheduledIcon.isSelected = state.page == MainPage.SCHEDULED
blocked.setBackgroundResource(getRowBackground(state.page == MainPage.BLOCKED)) blocked.isSelected = state.page == MainPage.BLOCKED
blockedIcon.setTint(getIconColor(state.page == MainPage.BLOCKED)) blockedIcon.isSelected = state.page == MainPage.BLOCKED
if (drawerLayout.isDrawerOpen(Gravity.START) && !state.drawerOpen) drawerLayout.closeDrawer(Gravity.START) if (drawerLayout.isDrawerOpen(Gravity.START) && !state.drawerOpen) drawerLayout.closeDrawer(Gravity.START)
else if (!drawerLayout.isDrawerVisible(Gravity.START) && state.drawerOpen) drawerLayout.openDrawer(Gravity.START) else if (!drawerLayout.isDrawerVisible(Gravity.START) && state.drawerOpen) drawerLayout.openDrawer(Gravity.START)
} }
private fun getIconColor(selected: Boolean): Int {
return if (selected) themeManager.color else themeManager.textSecondary
}
private fun getRowBackground(selected: Boolean): Int {
return if (selected) R.color.row_selected else R.drawable.ripple
}
private fun requestPermissions() { private fun requestPermissions() {
Dexter.withActivity(this) Dexter.withActivity(this)
.withPermissions(arrayListOf(Manifest.permission.READ_CONTACTS, Manifest.permission.READ_SMS)) .withPermissions(arrayListOf(Manifest.permission.READ_CONTACTS, Manifest.permission.READ_SMS))
@@ -1,7 +1,6 @@
package com.moez.QKSMS.presentation.view package com.moez.QKSMS.presentation.view
import android.content.Context import android.content.Context
import android.content.res.ColorStateList
import android.telephony.PhoneNumberUtils import android.telephony.PhoneNumberUtils
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
@@ -11,6 +10,8 @@ import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.common.util.GlideApp import com.moez.QKSMS.common.util.GlideApp
import com.moez.QKSMS.common.util.ThemeManager import com.moez.QKSMS.common.util.ThemeManager
import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Contact
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.rxkotlin.plusAssign
import kotlinx.android.synthetic.main.avatar_view.view.* import kotlinx.android.synthetic.main.avatar_view.view.*
import javax.inject.Inject import javax.inject.Inject
@@ -18,6 +19,8 @@ class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : Fr
@Inject lateinit var themeManager: ThemeManager @Inject lateinit var themeManager: ThemeManager
private val disposables = CompositeDisposable()
var contact: Contact? = null var contact: Contact? = null
set(value) { set(value) {
field = value field = value
@@ -33,7 +36,17 @@ class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : Fr
setBackgroundResource(R.drawable.circle) setBackgroundResource(R.drawable.circle)
clipToOutline = true clipToOutline = true
backgroundTintList = ColorStateList.valueOf(themeManager.color) }
override fun onAttachedToWindow() {
super.onAttachedToWindow()
disposables += themeManager.color
.subscribe { color -> background.setTint(color) }
}
override fun onDetachedFromWindow() {
super.onDetachedFromWindow()
disposables.clear()
} }
override fun onFinishInflate() { override fun onFinishInflate() {