Set up dumb ThemeManager, don't rely on color resources for themed assets

This commit is contained in:
Moez Bhatti
2017-09-25 23:44:33 -04:00
parent 5633af8aab
commit bea81ce7b8
12 changed files with 77 additions and 20 deletions
@@ -5,7 +5,9 @@ import com.moez.QKSMS.receiver.SmsReceiver
import com.moez.QKSMS.ui.conversations.ConversationAdapter
import com.moez.QKSMS.ui.conversations.ConversationListViewModel
import com.moez.QKSMS.ui.messages.MessageAdapter
import com.moez.QKSMS.ui.messages.MessageListActivity
import com.moez.QKSMS.ui.messages.MessageListViewModel
import com.moez.QKSMS.util.NotificationManager
import dagger.Component
import javax.inject.Singleton
@@ -16,10 +18,14 @@ interface AppComponent {
fun inject(receiver: SmsReceiver)
fun inject(receiver: MessageSentReceiver)
fun inject(activity: MessageListActivity)
fun inject(viewModel: ConversationListViewModel)
fun inject(viewModel: MessageListViewModel)
fun inject(adapter: MessageAdapter)
fun inject(adapter: ConversationAdapter)
fun inject(manager: NotificationManager)
}
@@ -7,6 +7,7 @@ import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.data.sync.SyncManager
import com.moez.QKSMS.util.DateFormatter
import com.moez.QKSMS.util.NotificationManager
import com.moez.QKSMS.util.ThemeManager
import dagger.Module
import dagger.Provides
import javax.inject.Singleton
@@ -32,6 +33,12 @@ class AppModule(var application: Application) {
return SyncManager(context, contacts)
}
@Provides
@Singleton
fun provideThemeMaager(): ThemeManager {
return ThemeManager()
}
@Provides
@Singleton
fun provideNotificationHelper(context: Context, messageRepository: MessageRepository): NotificationManager {
@@ -9,7 +9,9 @@ import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.data.model.Contact
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.util.DateFormatter
import com.moez.QKSMS.util.ThemeManager
import com.moez.QKSMS.util.extensions.dpToPx
import com.moez.QKSMS.util.extensions.setBackgroundTint
import com.moez.QKSMS.util.extensions.setMargins
import io.realm.OrderedRealmCollection
import io.realm.RealmRecyclerViewAdapter
@@ -27,6 +29,7 @@ class MessageAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerView
}
@Inject lateinit var context: Context
@Inject lateinit var themeManager: ThemeManager
@Inject lateinit var dateFormatter: DateFormatter
init {
@@ -34,12 +37,23 @@ class MessageAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerView
}
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): MessageViewHolder {
val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
val layoutRes = when (viewType) {
VIEWTYPE_IN -> R.layout.message_list_item_in
else -> R.layout.message_list_item_out
val layoutRes: Int
val bubbleColor: Int
when (viewType) {
VIEWTYPE_IN -> {
layoutRes = R.layout.message_list_item_in
bubbleColor = themeManager.bubbleColor
}
else -> {
layoutRes = R.layout.message_list_item_out
bubbleColor = themeManager.color
}
}
return MessageViewHolder(layoutInflater.inflate(layoutRes, parent, false))
val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
val viewHolder = MessageViewHolder(layoutInflater.inflate(layoutRes, parent, false))
viewHolder.body.setBackgroundTint(bubbleColor)
return viewHolder
}
override fun onBindViewHolder(viewHolder: MessageViewHolder, position: Int) {
@@ -8,20 +8,25 @@ import android.support.v7.widget.RecyclerView
import com.jakewharton.rxbinding2.view.RxView
import com.jakewharton.rxbinding2.widget.RxTextView
import com.moez.QKSMS.R
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.ui.base.QkActivity
import com.moez.QKSMS.util.ThemeManager
import com.moez.QKSMS.util.extensions.setTint
import io.realm.RealmResults
import kotlinx.android.synthetic.main.message_list_activity.*
import javax.inject.Inject
class MessageListActivity : QkActivity(), Observer<MessageListViewState> {
private lateinit var viewModel: MessageListViewModel
@Inject lateinit var themeManager: ThemeManager
private lateinit var viewModel: MessageListViewModel
private lateinit var layoutManager: LinearLayoutManager
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
AppComponentManager.appComponent.inject(this)
setContentView(R.layout.message_list_activity)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
@@ -29,6 +34,8 @@ class MessageListActivity : QkActivity(), Observer<MessageListViewState> {
viewModel.threadId = intent.getLongExtra("threadId", 0)
viewModel.state.observe(this, this)
attach.setTint(themeManager.color)
layoutManager = LinearLayoutManager(this)
layoutManager.stackFromEnd = true
messageList.layoutManager = layoutManager
@@ -45,7 +52,7 @@ class MessageListActivity : QkActivity(), Observer<MessageListViewState> {
if (message.text.toString() != state.draft) message.setText(state.draft)
if (state.hasError) finish()
val color = if (state.canSend) R.color.colorPrimary else R.color.textTertiary
val color = if (state.canSend) themeManager.color else R.color.textTertiary
send.setTint(resources.getColor(color))
send.isEnabled = state.canSend
}
@@ -8,14 +8,20 @@ import android.os.Build
import android.support.v4.app.NotificationCompat
import android.support.v4.app.NotificationManagerCompat
import com.moez.QKSMS.R
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.data.repository.MessageRepository
import javax.inject.Inject
class NotificationManager(val context: Context, val messageRepo: MessageRepository) {
@Inject lateinit var themeManager: ThemeManager
private val notificationManager = NotificationManagerCompat.from(context)
init {
AppComponentManager.appComponent.inject(this)
if (Build.VERSION.SDK_INT >= 26) {
val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -46,7 +52,7 @@ class NotificationManager(val context: Context, val messageRepo: MessageReposito
}
val notification = NotificationCompat.Builder(context, "channel_1")
.setColor(context.resources.getColor(R.color.colorPrimary))
.setColor(themeManager.color)
.setSmallIcon(R.mipmap.ic_launcher)
.setStyle(style)
@@ -0,0 +1,8 @@
package com.moez.QKSMS.util
class ThemeManager {
val color = 0xFF0BAE9F.toInt()
val bubbleColor = 0xFFF4F4F4.toInt()
}
@@ -9,6 +9,10 @@ fun ImageView.setTint(color: Int) {
imageTintList = ColorStateList.valueOf(color)
}
fun View.setBackgroundTint(color: Int) {
backgroundTintList = ColorStateList.valueOf(color)
}
fun View.setMargins(left: Int? = null, top: Int? = null, right: Int? = null, bottom: Int? = null) {
val lp = layoutParams as? ViewGroup.MarginLayoutParams ?: return