Per-contact colours

Closes #1120
This commit is contained in:
Moez Bhatti
2019-12-15 20:46:33 -05:00
parent 5d62912508
commit 76e0f775d6
35 changed files with 315 additions and 153 deletions
@@ -38,7 +38,9 @@ import kotlinx.android.synthetic.main.theme_picker_controller.*
import kotlinx.android.synthetic.main.theme_picker_hsv.*
import javax.inject.Inject
class ThemePickerController(val threadId: Long = 0L) : QkController<ThemePickerView, ThemePickerState, ThemePickerPresenter>(), ThemePickerView {
class ThemePickerController(
val recipientId: Long = 0L
) : QkController<ThemePickerView, ThemePickerState, ThemePickerPresenter>(), ThemePickerView {
@Inject override lateinit var presenter: ThemePickerPresenter
@@ -107,7 +109,7 @@ class ThemePickerController(val threadId: Long = 0L) : QkController<ThemePickerV
override fun viewQksmsPlusClicks(): Observable<*> = viewQksmsPlusSubject
override fun render(state: ThemePickerState) {
tabs.setThreadId(state.threadId)
tabs.setRecipientId(state.recipientId)
hex.setText(Integer.toHexString(state.newColor).takeLast(6))
@@ -34,14 +34,14 @@ import javax.inject.Named
class ThemePickerPresenter @Inject constructor(
prefs: Preferences,
@Named("threadId") private val threadId: Long,
@Named("recipientId") private val recipientId: Long,
private val billingManager: BillingManager,
private val colors: Colors,
private val navigator: Navigator,
private val widgetManager: WidgetManager
) : QkPresenter<ThemePickerView, ThemePickerState>(ThemePickerState(threadId = threadId)) {
) : QkPresenter<ThemePickerView, ThemePickerState>(ThemePickerState(recipientId = recipientId)) {
private val theme: Preference<Int> = prefs.theme(threadId)
private val theme: Preference<Int> = prefs.theme(recipientId)
override fun bindIntents(view: ThemePickerView) {
super.bindIntents(view)
@@ -55,7 +55,7 @@ class ThemePickerPresenter @Inject constructor(
.autoDisposable(view.scope())
.subscribe { color ->
theme.set(color)
if (threadId == 0L) {
if (recipientId == 0L) {
widgetManager.updateTheme()
}
}
@@ -81,7 +81,7 @@ class ThemePickerPresenter @Inject constructor(
view.showQksmsPlusSnackbar()
} else {
theme.set(color)
if (threadId == 0L) {
if (recipientId == 0L) {
widgetManager.updateTheme()
}
}
@@ -19,7 +19,7 @@
package com.moez.QKSMS.feature.themepicker
data class ThemePickerState(
val threadId: Long = 0,
val recipientId: Long = 0,
val applyThemeVisible: Boolean = false,
val newColor: Int = -1,
val newTextColor: Int = -1
@@ -29,7 +29,7 @@ class ThemePickerModule(private val controller: ThemePickerController) {
@Provides
@ControllerScope
@Named("threadId")
fun provideThreadId(): Long = controller.threadId
@Named("recipientId")
fun provideThreadId(): Long = controller.recipientId
}