forked from upstream-mirrors/quik
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.net.Uri
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
|
import android.support.design.widget.Snackbar
|
||||||
import android.support.v7.widget.LinearLayoutManager
|
import android.support.v7.widget.LinearLayoutManager
|
||||||
import android.support.v7.widget.RecyclerView
|
import android.support.v7.widget.RecyclerView
|
||||||
import com.jakewharton.rxbinding2.view.clicks
|
import com.jakewharton.rxbinding2.view.clicks
|
||||||
@@ -54,6 +55,7 @@ class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
|
|||||||
override val viewModelClass = SettingsViewModel::class
|
override val viewModelClass = SettingsViewModel::class
|
||||||
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
|
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
|
||||||
override val nightModeSelectedIntent by lazy { nightModeAdapter.menuItemClicks }
|
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 startTimeSelectedIntent: Subject<Pair<Int, Int>> = PublishSubject.create()
|
||||||
override val endTimeSelectedIntent: Subject<Pair<Int, Int>> = PublishSubject.create()
|
override val endTimeSelectedIntent: Subject<Pair<Int, Int>> = PublishSubject.create()
|
||||||
override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
|
override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
|
||||||
@@ -146,6 +148,13 @@ class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
|
|||||||
nightModeDialog = null
|
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) {
|
override fun showStartTimePicker(hour: Int, minute: Int) {
|
||||||
TimePickerDialog(this, TimePickerDialog.OnTimeSetListener { _, hour, minute ->
|
TimePickerDialog(this, TimePickerDialog.OnTimeSetListener { _, hour, minute ->
|
||||||
startTimeSelectedIntent.onNext(Pair(hour, minute))
|
startTimeSelectedIntent.onNext(Pair(hour, minute))
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ interface SettingsView : QkView<SettingsState> {
|
|||||||
|
|
||||||
val preferenceClickIntent: Subject<PreferenceView>
|
val preferenceClickIntent: Subject<PreferenceView>
|
||||||
val nightModeSelectedIntent: Observable<Int>
|
val nightModeSelectedIntent: Observable<Int>
|
||||||
|
val viewQksmsPlusIntent: Subject<Unit>
|
||||||
val startTimeSelectedIntent: Subject<Pair<Int, Int>>
|
val startTimeSelectedIntent: Subject<Pair<Int, Int>>
|
||||||
val endTimeSelectedIntent: Subject<Pair<Int, Int>>
|
val endTimeSelectedIntent: Subject<Pair<Int, Int>>
|
||||||
val ringtoneSelectedIntent: Observable<String>
|
val ringtoneSelectedIntent: Observable<String>
|
||||||
@@ -35,6 +36,7 @@ interface SettingsView : QkView<SettingsState> {
|
|||||||
|
|
||||||
fun showNightModeDialog()
|
fun showNightModeDialog()
|
||||||
fun dismissNightModeDialog()
|
fun dismissNightModeDialog()
|
||||||
|
fun showQksmsPlusSnackbar()
|
||||||
fun showStartTimePicker(hour: Int, minute: Int)
|
fun showStartTimePicker(hour: Int, minute: Int)
|
||||||
fun showEndTimePicker(hour: Int, minute: Int)
|
fun showEndTimePicker(hour: Int, minute: Int)
|
||||||
fun showRingtonePicker(default: Uri)
|
fun showRingtonePicker(default: Uri)
|
||||||
|
|||||||
@@ -24,11 +24,13 @@ import com.moez.QKSMS.R
|
|||||||
import com.uber.autodispose.android.lifecycle.scope
|
import com.uber.autodispose.android.lifecycle.scope
|
||||||
import com.uber.autodispose.kotlin.autoDisposable
|
import com.uber.autodispose.kotlin.autoDisposable
|
||||||
import common.di.appComponent
|
import common.di.appComponent
|
||||||
|
import common.util.BillingManager
|
||||||
import common.util.DateFormatter
|
import common.util.DateFormatter
|
||||||
import common.util.NightModeManager
|
import common.util.NightModeManager
|
||||||
import common.util.Preferences
|
import common.util.Preferences
|
||||||
import interactor.FullSync
|
import interactor.FullSync
|
||||||
import io.reactivex.rxkotlin.plusAssign
|
import io.reactivex.rxkotlin.plusAssign
|
||||||
|
import io.reactivex.rxkotlin.withLatestFrom
|
||||||
import presentation.common.Navigator
|
import presentation.common.Navigator
|
||||||
import presentation.common.base.QkViewModel
|
import presentation.common.base.QkViewModel
|
||||||
import timber.log.Timber
|
import timber.log.Timber
|
||||||
@@ -38,6 +40,7 @@ import javax.inject.Inject
|
|||||||
class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState()) {
|
class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState()) {
|
||||||
|
|
||||||
@Inject lateinit var context: Context
|
@Inject lateinit var context: Context
|
||||||
|
@Inject lateinit var billingManager: BillingManager
|
||||||
@Inject lateinit var dateFormatter: DateFormatter
|
@Inject lateinit var dateFormatter: DateFormatter
|
||||||
@Inject lateinit var navigator: Navigator
|
@Inject lateinit var navigator: Navigator
|
||||||
@Inject lateinit var nightModeManager: NightModeManager
|
@Inject lateinit var nightModeManager: NightModeManager
|
||||||
@@ -148,8 +151,19 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
|||||||
|
|
||||||
view.nightModeSelectedIntent
|
view.nightModeSelectedIntent
|
||||||
.doOnNext { view.dismissNightModeDialog() }
|
.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())
|
.autoDisposable(view.scope())
|
||||||
.subscribe { nightMode -> nightModeManager.updateNightMode(nightMode) }
|
.subscribe()
|
||||||
|
|
||||||
|
view.viewQksmsPlusIntent
|
||||||
|
.autoDisposable(view.scope())
|
||||||
|
.subscribe { navigator.showQksmsPlusActivity() }
|
||||||
|
|
||||||
view.startTimeSelectedIntent
|
view.startTimeSelectedIntent
|
||||||
.doOnNext { nightModeManager.updateAlarms() }
|
.doOnNext { nightModeManager.updateAlarms() }
|
||||||
|
|||||||
@@ -27,6 +27,7 @@
|
|||||||
<include layout="@layout/toolbar" />
|
<include layout="@layout/toolbar" />
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
|
android:id="@+id/content"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="0dp"
|
||||||
android:layout_weight="1">
|
android:layout_weight="1">
|
||||||
|
|||||||
@@ -120,10 +120,12 @@
|
|||||||
|
|
||||||
<string name="button_undo">Undo</string>
|
<string name="button_undo">Undo</string>
|
||||||
<string name="button_cancel">Cancel</string>
|
<string name="button_cancel">Cancel</string>
|
||||||
|
<string name="button_more">More</string>
|
||||||
|
|
||||||
<string name="toast_copied">Copied</string>
|
<string name="toast_copied">Copied</string>
|
||||||
<string name="toast_archived">Archived conversation</string>
|
<string name="toast_archived">Archived conversation</string>
|
||||||
<string name="toast_unarchived">Moved to inbox</string>
|
<string name="toast_unarchived">Moved to inbox</string>
|
||||||
|
<string name="toast_qksms_plus">You must unlock QKSMS+ to use this</string>
|
||||||
|
|
||||||
<string-array name="message_options">
|
<string-array name="message_options">
|
||||||
<item>Copy text</item>
|
<item>Copy text</item>
|
||||||
|
|||||||
Reference in New Issue
Block a user