Expose ViewContract intents as functions rather than fields

This commit is contained in:
Moez Bhatti
2018-07-29 16:59:41 -04:00
parent b261ca824b
commit d502cf0d8c
10 changed files with 137 additions and 122 deletions
@@ -27,12 +27,13 @@ import com.uber.autodispose.kotlin.autoDisposable
import io.reactivex.Observable
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.settings_activity.*
import kotlinx.android.synthetic.main.settings_activity.view.*
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
import kotlinx.android.synthetic.main.settings_theme_widget.view.*
import kotlinx.android.synthetic.main.settings_theme_widget.*
import javax.inject.Inject
class SettingsController : QkController(), SettingsView {
class SettingsController : QkController<SettingsView, SettingsState, SettingsPresenter>(), SettingsView {
@Inject lateinit var context: Context
@Inject lateinit var colors: Colors
@@ -41,16 +42,11 @@ class SettingsController : QkController(), SettingsView {
@Inject lateinit var sendDelayDialog: QkDialog
@Inject lateinit var mmsSizeDialog: QkDialog
@Inject lateinit var presenter: SettingsPresenter
@Inject override lateinit var presenter: SettingsPresenter
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
override val viewQksmsPlusIntent: Subject<Unit> = PublishSubject.create()
override val nightModeSelectedIntent by lazy { nightModeDialog.adapter.menuItemClicks }
override val startTimeSelectedIntent: Subject<Pair<Int, Int>> = PublishSubject.create()
override val endTimeSelectedIntent: Subject<Pair<Int, Int>> = PublishSubject.create()
override val textSizeSelectedIntent by lazy { textSizeDialog.adapter.menuItemClicks }
override val sendDelayChangedIntent by lazy { sendDelayDialog.adapter.menuItemClicks }
override val mmsSizeSelectedIntent: Subject<Int> by lazy { mmsSizeDialog.adapter.menuItemClicks }
private val viewQksmsPlusSubject: Subject<Unit> = PublishSubject.create()
private val startTimeSelectedSubject: Subject<Pair<Int, Int>> = PublishSubject.create()
private val endTimeSelectedSubject: Subject<Pair<Int, Int>> = PublishSubject.create()
// TODO remove this
private val progressDialog by lazy {
@@ -63,7 +59,6 @@ class SettingsController : QkController(), SettingsView {
init {
appComponent.inject(this)
presenter.onCreate(this)
retainViewMode = RetainViewMode.RETAIN_DETACH
colors.themeObservable()
@@ -81,63 +76,72 @@ class SettingsController : QkController(), SettingsView {
mmsSizeDialog.adapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
about.summary = context.getString(R.string.settings_version, BuildConfig.VERSION_NAME)
// Listen to clicks for all of the preferences
(0 until preferences.childCount)
.map { index -> preferences.getChildAt(index) }
.mapNotNull { view -> view as? PreferenceView }
.map { preference -> preference.clicks().map { preference } }
.let { preferences -> Observable.merge(preferences) }
.subscribe(preferenceClickIntent::onNext)
}
}
override fun onAttach(view: View) {
super.onAttach(view)
presenter.onAttach(this)
presenter.bindIntents(this)
setTitle(R.string.title_settings)
showBackButton(true)
}
override fun preferenceClicks(): Observable<PreferenceView> = (0 until preferences.childCount)
.map { index -> preferences.getChildAt(index) }
.mapNotNull { view -> view as? PreferenceView }
.map { preference -> preference.clicks().map { preference } }
.let { preferences -> Observable.merge(preferences) }
override fun viewQksmsPlusClicks(): Observable<*> = viewQksmsPlusSubject
override fun nightModeSelected(): Observable<Int> = nightModeDialog.adapter.menuItemClicks
override fun nightStartSelected(): Observable<Pair<Int, Int>> = startTimeSelectedSubject
override fun nightEndSelected(): Observable<Pair<Int, Int>> = endTimeSelectedSubject
override fun textSizeSelected(): Observable<Int> = textSizeDialog.adapter.menuItemClicks
override fun sendDelaySelected(): Observable<Int> = sendDelayDialog.adapter.menuItemClicks
override fun mmsSizeSelected(): Observable<Int> = mmsSizeDialog.adapter.menuItemClicks
override fun render(state: SettingsState) {
if (progressDialog.isShowing && !state.syncing) progressDialog.dismiss()
else if (!progressDialog.isShowing && state.syncing) progressDialog.show()
view?.run {
themePreview.setBackgroundTint(state.theme)
night.summary = state.nightModeSummary
nightModeDialog.adapter.selectedItem = state.nightModeId
nightStart.setVisible(state.nightModeId == Preferences.NIGHT_MODE_AUTO)
nightStart.summary = state.nightStart
nightEnd.setVisible(state.nightModeId == Preferences.NIGHT_MODE_AUTO)
nightEnd.summary = state.nightEnd
themePreview.setBackgroundTint(state.theme)
night.summary = state.nightModeSummary
nightModeDialog.adapter.selectedItem = state.nightModeId
nightStart.setVisible(state.nightModeId == Preferences.NIGHT_MODE_AUTO)
nightStart.summary = state.nightStart
nightEnd.setVisible(state.nightModeId == Preferences.NIGHT_MODE_AUTO)
nightEnd.summary = state.nightEnd
black.setVisible(state.nightModeId != Preferences.NIGHT_MODE_OFF)
black.checkbox.isChecked = state.black
black.setVisible(state.nightModeId != Preferences.NIGHT_MODE_OFF)
black.checkbox.isChecked = state.black
autoEmoji.checkbox.isChecked = state.autoEmojiEnabled
autoEmoji.checkbox.isChecked = state.autoEmojiEnabled
delayed.summary = state.sendDelaySummary
sendDelayDialog.adapter.selectedItem = state.sendDelayId
delayed.summary = state.sendDelaySummary
sendDelayDialog.adapter.selectedItem = state.sendDelayId
delivery.checkbox.isChecked = state.deliveryEnabled
delivery.checkbox.isChecked = state.deliveryEnabled
textSize.summary = state.textSizeSummary
textSizeDialog.adapter.selectedItem = state.textSizeId
systemFont.checkbox.isChecked = state.systemFontEnabled
textSize.summary = state.textSizeSummary
textSizeDialog.adapter.selectedItem = state.textSizeId
systemFont.checkbox.isChecked = state.systemFontEnabled
unicode.checkbox.isChecked = state.stripUnicodeEnabled
unicode.checkbox.isChecked = state.stripUnicodeEnabled
mmsSize.summary = state.maxMmsSizeSummary
mmsSizeDialog.adapter.selectedItem = state.maxMmsSizeId
}
mmsSize.summary = state.maxMmsSizeSummary
mmsSizeDialog.adapter.selectedItem = state.maxMmsSizeId
}
override fun showQksmsPlusSnackbar() {
view?.run {
Snackbar.make(contentView, R.string.toast_qksms_plus, Snackbar.LENGTH_LONG).run {
setAction(R.string.button_more) { viewQksmsPlusIntent.onNext(Unit) }
setAction(R.string.button_more) { viewQksmsPlusSubject.onNext(Unit) }
show()
}
}
@@ -148,13 +152,13 @@ class SettingsController : QkController(), SettingsView {
override fun showStartTimePicker(hour: Int, minute: Int) {
TimePickerDialog(activity, TimePickerDialog.OnTimeSetListener { _, newHour, newMinute ->
startTimeSelectedIntent.onNext(Pair(newHour, newMinute))
startTimeSelectedSubject.onNext(Pair(newHour, newMinute))
}, hour, minute, DateFormat.is24HourFormat(activity)).show()
}
override fun showEndTimePicker(hour: Int, minute: Int) {
TimePickerDialog(activity, TimePickerDialog.OnTimeSetListener { _, newHour, newMinute ->
endTimeSelectedIntent.onNext(Pair(newHour, newMinute))
endTimeSelectedSubject.onNext(Pair(newHour, newMinute))
}, hour, minute, DateFormat.is24HourFormat(activity)).show()
}
@@ -11,6 +11,7 @@ import com.moez.QKSMS.interactor.SyncMessages
import com.moez.QKSMS.util.NightModeManager
import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.kotlin.autoDisposable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
import timber.log.Timber
import java.util.*
@@ -27,76 +28,70 @@ class SettingsPresenter @Inject constructor(
private val syncMessages: SyncMessages
) : QkPresenter<SettingsView, SettingsState>(SettingsState(theme = colors.theme().theme)) {
override fun onCreate(view: SettingsView) {
super.onCreate(view)
init {
newState { copy(theme = colors.theme().theme) }
val nightModeLabels = context.resources.getStringArray(R.array.night_modes)
prefs.nightMode.asObservable()
.autoDisposable(view.scope())
disposables += prefs.nightMode.asObservable()
.subscribe { nightMode ->
newState { copy(nightModeSummary = nightModeLabels[nightMode], nightModeId = nightMode) }
}
prefs.nightStart.asObservable()
disposables += prefs.nightStart.asObservable()
.map { time -> nightModeManager.parseTime(time) }
.map { calendar -> calendar.timeInMillis }
.map { millis -> dateFormatter.getTimestamp(millis) }
.autoDisposable(view.scope())
.subscribe { nightStart -> newState { copy(nightStart = nightStart) } }
prefs.nightEnd.asObservable()
disposables += prefs.nightEnd.asObservable()
.map { time -> nightModeManager.parseTime(time) }
.map { calendar -> calendar.timeInMillis }
.map { millis -> dateFormatter.getTimestamp(millis) }
.autoDisposable(view.scope())
.subscribe { nightEnd -> newState { copy(nightEnd = nightEnd) } }
prefs.black.asObservable()
.autoDisposable(view.scope())
disposables += prefs.black.asObservable()
.subscribe { black -> newState { copy(black = black) } }
prefs.notifications().asObservable()
.autoDisposable(view.scope())
disposables += prefs.notifications().asObservable()
.subscribe { enabled -> newState { copy(notificationsEnabled = enabled) } }
prefs.autoEmoji.asObservable()
.autoDisposable(view.scope())
disposables += prefs.autoEmoji.asObservable()
.subscribe { enabled -> newState { copy(autoEmojiEnabled = enabled) } }
val delayedSendingLabels = context.resources.getStringArray(R.array.delayed_sending_labels)
prefs.sendDelay.asObservable()
.autoDisposable(view.scope())
disposables += prefs.sendDelay.asObservable()
.subscribe { id -> newState { copy(sendDelaySummary = delayedSendingLabels[id], sendDelayId = id) } }
prefs.delivery.asObservable()
.autoDisposable(view.scope())
disposables += prefs.delivery.asObservable()
.subscribe { enabled -> newState { copy(deliveryEnabled = enabled) } }
val textSizeLabels = context.resources.getStringArray(R.array.text_sizes)
prefs.textSize.asObservable()
.autoDisposable(view.scope())
disposables += prefs.textSize.asObservable()
.subscribe { textSize ->
newState { copy(textSizeSummary = textSizeLabels[textSize], textSizeId = textSize) }
}
prefs.systemFont.asObservable()
.autoDisposable(view.scope())
disposables += prefs.systemFont.asObservable()
.subscribe { enabled -> newState { copy(systemFontEnabled = enabled) } }
prefs.unicode.asObservable()
.autoDisposable(view.scope())
disposables += prefs.unicode.asObservable()
.subscribe { enabled -> newState { copy(stripUnicodeEnabled = enabled) } }
val mmsSizeLabels = context.resources.getStringArray(R.array.mms_sizes)
val mmsSizeIds = context.resources.getIntArray(R.array.mms_sizes_ids)
prefs.mmsSize.asObservable()
.autoDisposable(view.scope())
disposables += prefs.mmsSize.asObservable()
.subscribe { maxMmsSize ->
val index = mmsSizeIds.indexOf(maxMmsSize)
newState { copy(maxMmsSizeSummary = mmsSizeLabels[index], maxMmsSizeId = maxMmsSize) }
}
view.preferenceClickIntent
disposables += syncMessages
}
override fun bindIntents(view: SettingsView) {
super.bindIntents(view)
view.preferenceClicks()
.autoDisposable(view.scope())
.subscribe {
Timber.v("Preference click: ${context.resources.getResourceName(it.id)}")
@@ -145,7 +140,7 @@ class SettingsPresenter @Inject constructor(
}
}
view.nightModeSelectedIntent
view.nightModeSelected()
.withLatestFrom(billingManager.upgradeStatus) { mode, upgraded ->
if (!upgraded && mode == Preferences.NIGHT_MODE_AUTO) {
view.showQksmsPlusSnackbar()
@@ -156,23 +151,23 @@ class SettingsPresenter @Inject constructor(
.autoDisposable(view.scope())
.subscribe()
view.viewQksmsPlusIntent
view.viewQksmsPlusClicks()
.autoDisposable(view.scope())
.subscribe { navigator.showQksmsPlusActivity("settings_night") }
view.startTimeSelectedIntent
view.nightStartSelected()
.autoDisposable(view.scope())
.subscribe { nightModeManager.setNightStart(it.first, it.second) }
view.endTimeSelectedIntent
view.nightEndSelected()
.autoDisposable(view.scope())
.subscribe { nightModeManager.setNightEnd(it.first, it.second) }
view.textSizeSelectedIntent
view.textSizeSelected()
.autoDisposable(view.scope())
.subscribe { prefs.textSize.set(it) }
view.sendDelayChangedIntent
view.sendDelaySelected()
.withLatestFrom(billingManager.upgradeStatus) { duration, upgraded ->
if (!upgraded && duration != 0) {
view.showQksmsPlusSnackbar()
@@ -183,7 +178,7 @@ class SettingsPresenter @Inject constructor(
.autoDisposable(view.scope())
.subscribe()
view.mmsSizeSelectedIntent
view.mmsSizeSelected()
.autoDisposable(view.scope())
.subscribe { prefs.mmsSize.set(it) }
}
@@ -18,21 +18,20 @@
*/
package com.moez.QKSMS.feature.settings
import com.moez.QKSMS.common.base.QkConductorView
import com.moez.QKSMS.common.base.QkViewContract
import com.moez.QKSMS.common.widget.PreferenceView
import io.reactivex.Observable
import io.reactivex.subjects.Subject
interface SettingsView : QkConductorView<SettingsState> {
interface SettingsView : QkViewContract<SettingsState> {
val preferenceClickIntent: Subject<PreferenceView>
val viewQksmsPlusIntent: Subject<Unit>
val nightModeSelectedIntent: Observable<Int>
val startTimeSelectedIntent: Subject<Pair<Int, Int>>
val endTimeSelectedIntent: Subject<Pair<Int, Int>>
val textSizeSelectedIntent: Subject<Int>
val sendDelayChangedIntent: Observable<Int>
val mmsSizeSelectedIntent: Observable<Int>
fun preferenceClicks(): Observable<PreferenceView>
fun viewQksmsPlusClicks(): Observable<*>
fun nightModeSelected(): Observable<Int>
fun nightStartSelected(): Observable<Pair<Int, Int>>
fun nightEndSelected(): Observable<Pair<Int, Int>>
fun textSizeSelected(): Observable<Int>
fun sendDelaySelected(): Observable<Int>
fun mmsSizeSelected(): Observable<Int>
fun showQksmsPlusSnackbar()
fun showNightModeDialog()
@@ -10,46 +10,39 @@ import com.moez.QKSMS.common.base.QkController
import com.moez.QKSMS.common.widget.PreferenceView
import com.moez.QKSMS.injection.appComponent
import io.reactivex.Observable
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.about_activity.*
import kotlinx.android.synthetic.main.about_activity.view.*
import javax.inject.Inject
class AboutController : QkController(), AboutView {
class AboutController : QkController<AboutView, Unit, AboutPresenter>(), AboutView {
@Inject lateinit var presenter: AboutPresenter
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
@Inject override lateinit var presenter: AboutPresenter
init {
appComponent.inject(this)
presenter.onCreate(this)
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View {
return inflater.inflate(R.layout.about_activity, container, false).apply {
version.summary = BuildConfig.VERSION_NAME
// Listen to clicks for all of the preferences
(0 until preferences.childCount)
.map { index -> preferences.getChildAt(index) }
.mapNotNull { view -> view as? PreferenceView }
.map { preference -> preference.clicks().map { preference } }
.let { preferences -> Observable.merge(preferences) }
.subscribe(preferenceClickIntent::onNext)
}
}
override fun onAttach(view: View) {
super.onAttach(view)
presenter.onAttach(this)
presenter.bindIntents(this)
setTitle(R.string.about_title)
showBackButton(true)
}
override fun preferenceClicks(): Observable<PreferenceView> = (0 until preferences.childCount)
.map { index -> preferences.getChildAt(index) }
.mapNotNull { view -> view as? PreferenceView }
.map { preference -> preference.clicks().map { preference } }
.let { preferences -> Observable.merge(preferences) }
override fun render(state: Unit) {
// No special rendering required
}
}
@@ -28,10 +28,10 @@ class AboutPresenter @Inject constructor(
private val navigator: Navigator
) : QkPresenter<AboutView, Unit>(Unit) {
override fun onCreate(view: AboutView) {
super.onCreate(view)
override fun bindIntents(view: AboutView) {
super.bindIntents(view)
view.preferenceClickIntent
view.preferenceClicks()
.autoDisposable(view.scope())
.subscribe { preference ->
when (preference.id) {
@@ -18,12 +18,12 @@
*/
package com.moez.QKSMS.feature.settings.about
import com.moez.QKSMS.common.base.QkConductorView
import com.moez.QKSMS.common.base.QkViewContract
import com.moez.QKSMS.common.widget.PreferenceView
import io.reactivex.subjects.Subject
import io.reactivex.Observable
interface AboutView : QkConductorView<Unit> {
interface AboutView : QkViewContract<Unit> {
val preferenceClickIntent: Subject<PreferenceView>
fun preferenceClicks(): Observable<PreferenceView>
}