mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 11:38:51 +01:00
Enable auto night mode for QKSMS+
This commit is contained in:
@@ -27,6 +27,7 @@ import android.media.RingtoneManager
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import android.support.design.widget.Snackbar
|
||||
import android.support.v7.widget.LinearLayoutManager
|
||||
import android.support.v7.widget.RecyclerView
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
@@ -54,6 +55,7 @@ class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
|
||||
override val viewModelClass = SettingsViewModel::class
|
||||
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
|
||||
override val nightModeSelectedIntent by lazy { nightModeAdapter.menuItemClicks }
|
||||
override val viewQksmsPlusIntent: Subject<Unit> = PublishSubject.create()
|
||||
override val startTimeSelectedIntent: Subject<Pair<Int, Int>> = PublishSubject.create()
|
||||
override val endTimeSelectedIntent: Subject<Pair<Int, Int>> = PublishSubject.create()
|
||||
override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
|
||||
@@ -146,6 +148,13 @@ class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
|
||||
nightModeDialog = null
|
||||
}
|
||||
|
||||
override fun showQksmsPlusSnackbar() {
|
||||
Snackbar.make(content, R.string.toast_qksms_plus, Snackbar.LENGTH_LONG).run {
|
||||
setAction(R.string.button_more, { viewQksmsPlusIntent.onNext(Unit) })
|
||||
show()
|
||||
}
|
||||
}
|
||||
|
||||
override fun showStartTimePicker(hour: Int, minute: Int) {
|
||||
TimePickerDialog(this, TimePickerDialog.OnTimeSetListener { _, hour, minute ->
|
||||
startTimeSelectedIntent.onNext(Pair(hour, minute))
|
||||
|
||||
@@ -28,6 +28,7 @@ interface SettingsView : QkView<SettingsState> {
|
||||
|
||||
val preferenceClickIntent: Subject<PreferenceView>
|
||||
val nightModeSelectedIntent: Observable<Int>
|
||||
val viewQksmsPlusIntent: Subject<Unit>
|
||||
val startTimeSelectedIntent: Subject<Pair<Int, Int>>
|
||||
val endTimeSelectedIntent: Subject<Pair<Int, Int>>
|
||||
val ringtoneSelectedIntent: Observable<String>
|
||||
@@ -35,6 +36,7 @@ interface SettingsView : QkView<SettingsState> {
|
||||
|
||||
fun showNightModeDialog()
|
||||
fun dismissNightModeDialog()
|
||||
fun showQksmsPlusSnackbar()
|
||||
fun showStartTimePicker(hour: Int, minute: Int)
|
||||
fun showEndTimePicker(hour: Int, minute: Int)
|
||||
fun showRingtonePicker(default: Uri)
|
||||
|
||||
@@ -24,11 +24,13 @@ import com.moez.QKSMS.R
|
||||
import com.uber.autodispose.android.lifecycle.scope
|
||||
import com.uber.autodispose.kotlin.autoDisposable
|
||||
import common.di.appComponent
|
||||
import common.util.BillingManager
|
||||
import common.util.DateFormatter
|
||||
import common.util.NightModeManager
|
||||
import common.util.Preferences
|
||||
import interactor.FullSync
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import io.reactivex.rxkotlin.withLatestFrom
|
||||
import presentation.common.Navigator
|
||||
import presentation.common.base.QkViewModel
|
||||
import timber.log.Timber
|
||||
@@ -38,6 +40,7 @@ import javax.inject.Inject
|
||||
class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState()) {
|
||||
|
||||
@Inject lateinit var context: Context
|
||||
@Inject lateinit var billingManager: BillingManager
|
||||
@Inject lateinit var dateFormatter: DateFormatter
|
||||
@Inject lateinit var navigator: Navigator
|
||||
@Inject lateinit var nightModeManager: NightModeManager
|
||||
@@ -148,8 +151,19 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
||||
|
||||
view.nightModeSelectedIntent
|
||||
.doOnNext { view.dismissNightModeDialog() }
|
||||
.withLatestFrom(billingManager.plusStatus, { mode, plusStatus ->
|
||||
if (plusStatus == BillingManager.UpgradeStatus.REGULAR && mode == Preferences.NIGHT_MODE_AUTO) {
|
||||
view.showQksmsPlusSnackbar()
|
||||
} else {
|
||||
nightModeManager.updateNightMode(mode)
|
||||
}
|
||||
})
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { nightMode -> nightModeManager.updateNightMode(nightMode) }
|
||||
.subscribe()
|
||||
|
||||
view.viewQksmsPlusIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { navigator.showQksmsPlusActivity() }
|
||||
|
||||
view.startTimeSelectedIntent
|
||||
.doOnNext { nightModeManager.updateAlarms() }
|
||||
|
||||
Reference in New Issue
Block a user