forked from upstream-mirrors/quik
Add automatic night mode support
This commit is contained in:
@@ -74,9 +74,9 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
||||
})
|
||||
}
|
||||
|
||||
private val menuArchive = MenuItem(R.string.menu_archive, 0)
|
||||
private val menuUnarchive = MenuItem(R.string.menu_unarchive, 1)
|
||||
private val menuDelete = MenuItem(R.string.menu_delete, 2)
|
||||
private val menuArchive by lazy { MenuItem(context.getString(R.string.menu_archive), 0) }
|
||||
private val menuUnarchive by lazy { MenuItem(context.getString(R.string.menu_unarchive), 1) }
|
||||
private val menuDelete by lazy { MenuItem(context.getString(R.string.menu_delete), 2) }
|
||||
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
|
||||
@@ -21,6 +21,7 @@ package presentation.feature.settings
|
||||
import android.app.Activity
|
||||
import android.app.AlertDialog
|
||||
import android.app.ProgressDialog
|
||||
import android.app.TimePickerDialog
|
||||
import android.content.Intent
|
||||
import android.media.RingtoneManager
|
||||
import android.net.Uri
|
||||
@@ -33,9 +34,9 @@ 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.Preferences
|
||||
import common.util.extensions.dpToPx
|
||||
import common.util.extensions.setVisible
|
||||
import data.model.MenuItem
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.settings_activity.*
|
||||
@@ -47,12 +48,16 @@ import javax.inject.Inject
|
||||
|
||||
class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
|
||||
|
||||
@Inject lateinit var menuItemAdapter: MenuItemAdapter
|
||||
@Inject lateinit var nightModeAdapter: MenuItemAdapter
|
||||
@Inject lateinit var mmsSizeAdapter: MenuItemAdapter
|
||||
|
||||
override val viewModelClass = SettingsViewModel::class
|
||||
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
|
||||
override val nightModeSelectedIntent by lazy { nightModeAdapter.menuItemClicks }
|
||||
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()
|
||||
override val mmsSizeSelectedIntent: Subject<Int> by lazy { menuItemAdapter.menuItemClicks }
|
||||
override val mmsSizeSelectedIntent: Subject<Int> by lazy { mmsSizeAdapter.menuItemClicks }
|
||||
|
||||
// TODO remove this
|
||||
private val progressDialog by lazy {
|
||||
@@ -63,26 +68,8 @@ class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
|
||||
}
|
||||
}
|
||||
|
||||
private val mmsSizeDialog by lazy {
|
||||
menuItemAdapter.data = arrayListOf(
|
||||
MenuItem(R.string.menu_mms_size_100kb, 100),
|
||||
MenuItem(R.string.menu_mms_size_200kb, 200),
|
||||
MenuItem(R.string.menu_mms_size_300kb, 300),
|
||||
MenuItem(R.string.menu_mms_size_600kb, 600),
|
||||
MenuItem(R.string.menu_mms_size_1000kb, 1000),
|
||||
MenuItem(R.string.menu_mms_size_no_limit, 0))
|
||||
|
||||
val recyclerView = RecyclerView(this)
|
||||
recyclerView.layoutManager = LinearLayoutManager(this)
|
||||
recyclerView.adapter = menuItemAdapter
|
||||
recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this))
|
||||
AlertDialog.Builder(this)
|
||||
.setTitle(R.string.settings_mms_size_title)
|
||||
.setMessage(R.string.settings_mms_size_summary)
|
||||
.setNegativeButton(R.string.button_cancel, null)
|
||||
.setView(recyclerView)
|
||||
.create()
|
||||
}
|
||||
private var nightModeDialog: AlertDialog? = null
|
||||
private var mmsSizeDialog: AlertDialog? = null
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
appComponent.inject(this)
|
||||
@@ -98,6 +85,9 @@ class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
|
||||
vibration.setVisible(!supportsNotificationChannels)
|
||||
ringtone.setVisible(!supportsNotificationChannels)
|
||||
|
||||
nightModeAdapter.setData(R.array.night_modes)
|
||||
mmsSizeAdapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
|
||||
|
||||
colors.background
|
||||
.autoDisposable(scope())
|
||||
.subscribe { color -> window.decorView.setBackgroundColor(color) }
|
||||
@@ -122,21 +112,50 @@ class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
|
||||
else -> R.string.settings_default_sms_summary_false
|
||||
})
|
||||
|
||||
dark.checkbox.isChecked = state.darkModeEnabled
|
||||
night.summary = state.nightModeSummary
|
||||
nightStart.setVisible(state.nightModeId == Preferences.NIGHT_MODE_AUTO)
|
||||
nightStart.summary = state.nightStart
|
||||
nightEnd.setVisible(state.nightModeId == Preferences.NIGHT_MODE_AUTO)
|
||||
nightEnd.summary = state.nightEnd
|
||||
|
||||
autoEmoji.checkbox.isChecked = state.autoEmojiEnabled
|
||||
|
||||
notifications.checkbox.isChecked = state.notificationsEnabled
|
||||
|
||||
vibration.checkbox.isChecked = state.vibrationEnabled
|
||||
|
||||
delivery.checkbox.isChecked = state.deliveryEnabled
|
||||
|
||||
unicode.checkbox.isChecked = state.stripUnicodeEnabled
|
||||
|
||||
mms.checkbox.isChecked = state.mmsEnabled
|
||||
|
||||
menuItemAdapter.selectedItem = state.maxMmsSize
|
||||
mmsSize.summary = state.maxMmsSizeSummary
|
||||
mmsSizeAdapter.selectedItem = state.maxMmsSizeId
|
||||
}
|
||||
|
||||
// TODO change this to a PopupWindow
|
||||
override fun showNightModeDialog() {
|
||||
val recyclerView = RecyclerView(this)
|
||||
recyclerView.layoutManager = LinearLayoutManager(this)
|
||||
recyclerView.adapter = nightModeAdapter
|
||||
recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this))
|
||||
nightModeDialog = AlertDialog.Builder(this)
|
||||
.setTitle(R.string.settings_night_title)
|
||||
.setView(recyclerView)
|
||||
.create().apply { show() }
|
||||
}
|
||||
|
||||
override fun dismissNightModeDialog() {
|
||||
nightModeDialog?.dismiss()
|
||||
nightModeDialog = null
|
||||
}
|
||||
|
||||
override fun showStartTimePicker(hour: Int, minute: Int) {
|
||||
TimePickerDialog(this, TimePickerDialog.OnTimeSetListener { _, hour, minute ->
|
||||
startTimeSelectedIntent.onNext(Pair(hour, minute))
|
||||
}, hour, minute, false).show()
|
||||
}
|
||||
|
||||
override fun showEndTimePicker(hour: Int, minute: Int) {
|
||||
TimePickerDialog(this, TimePickerDialog.OnTimeSetListener { _, hour, minute ->
|
||||
endTimeSelectedIntent.onNext(Pair(hour, minute))
|
||||
}, hour, minute, false).show()
|
||||
}
|
||||
|
||||
override fun showRingtonePicker(default: Uri) {
|
||||
@@ -148,9 +167,22 @@ class SettingsActivity : QkActivity<SettingsViewModel>(), SettingsView {
|
||||
startActivityForResult(intent, 123)
|
||||
}
|
||||
|
||||
override fun showMmsSizePicker() = mmsSizeDialog.show()
|
||||
override fun showMmsSizePicker() {
|
||||
val recyclerView = RecyclerView(this)
|
||||
recyclerView.layoutManager = LinearLayoutManager(this)
|
||||
recyclerView.adapter = mmsSizeAdapter
|
||||
recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this))
|
||||
mmsSizeDialog = AlertDialog.Builder(this)
|
||||
.setTitle(R.string.settings_mms_size_title)
|
||||
.setNegativeButton(R.string.button_cancel, null)
|
||||
.setView(recyclerView)
|
||||
.create().apply { show() }
|
||||
}
|
||||
|
||||
override fun dismissMmsSizePicker() = mmsSizeDialog.dismiss()
|
||||
override fun dismissMmsSizePicker() {
|
||||
mmsSizeDialog?.dismiss()
|
||||
mmsSizeDialog = null
|
||||
}
|
||||
|
||||
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
|
||||
super.onActivityResult(requestCode, resultCode, data)
|
||||
|
||||
@@ -18,11 +18,16 @@
|
||||
*/
|
||||
package presentation.feature.settings
|
||||
|
||||
import common.util.Preferences
|
||||
|
||||
data class SettingsState(
|
||||
val syncing: Boolean = false,
|
||||
|
||||
val isDefaultSmsApp: Boolean = false,
|
||||
val darkModeEnabled: Boolean = false,
|
||||
val nightModeSummary: String = "",
|
||||
val nightModeId: Int = Preferences.NIGHT_MODE_OFF,
|
||||
val nightStart: String = "",
|
||||
val nightEnd: String = "",
|
||||
val autoEmojiEnabled: Boolean = true,
|
||||
val notificationsEnabled: Boolean = true,
|
||||
val vibrationEnabled: Boolean = true,
|
||||
@@ -30,5 +35,6 @@ data class SettingsState(
|
||||
val splitSmsEnabled: Boolean = false,
|
||||
val stripUnicodeEnabled: Boolean = false,
|
||||
val mmsEnabled: Boolean = true,
|
||||
val maxMmsSize: Int = 100
|
||||
val maxMmsSizeSummary: String = "100KB",
|
||||
val maxMmsSizeId: Int = 100
|
||||
)
|
||||
@@ -27,9 +27,16 @@ import presentation.common.widget.PreferenceView
|
||||
interface SettingsView : QkView<SettingsState> {
|
||||
|
||||
val preferenceClickIntent: Subject<PreferenceView>
|
||||
val nightModeSelectedIntent: Observable<Int>
|
||||
val startTimeSelectedIntent: Subject<Pair<Int, Int>>
|
||||
val endTimeSelectedIntent: Subject<Pair<Int, Int>>
|
||||
val ringtoneSelectedIntent: Observable<String>
|
||||
val mmsSizeSelectedIntent: Observable<Int>
|
||||
|
||||
fun showNightModeDialog()
|
||||
fun dismissNightModeDialog()
|
||||
fun showStartTimePicker(hour: Int, minute: Int)
|
||||
fun showEndTimePicker(hour: Int, minute: Int)
|
||||
fun showRingtonePicker(default: Uri)
|
||||
fun showMmsSizePicker()
|
||||
fun dismissMmsSizePicker()
|
||||
|
||||
@@ -24,18 +24,23 @@ 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.DateFormatter
|
||||
import common.util.NightModeManager
|
||||
import common.util.Preferences
|
||||
import interactor.FullSync
|
||||
import io.reactivex.rxkotlin.plusAssign
|
||||
import presentation.common.Navigator
|
||||
import presentation.common.base.QkViewModel
|
||||
import timber.log.Timber
|
||||
import java.util.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState()) {
|
||||
|
||||
@Inject lateinit var context: Context
|
||||
@Inject lateinit var dateFormatter: DateFormatter
|
||||
@Inject lateinit var navigator: Navigator
|
||||
@Inject lateinit var nightModeManager: NightModeManager
|
||||
@Inject lateinit var prefs: Preferences
|
||||
@Inject lateinit var fullSync: FullSync
|
||||
|
||||
@@ -48,8 +53,17 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
||||
newState { it.copy(isDefaultSmsApp = isDefaultSmsApp) }
|
||||
}
|
||||
|
||||
disposables += prefs.dark.asObservable().subscribe { darkModeEnabled ->
|
||||
newState { it.copy(darkModeEnabled = darkModeEnabled) }
|
||||
val nightModeLabels = context.resources.getStringArray(R.array.night_modes)
|
||||
disposables += prefs.nightMode.asObservable().subscribe { nightMode ->
|
||||
newState { it.copy(nightModeSummary = nightModeLabels[nightMode], nightModeId = nightMode) }
|
||||
}
|
||||
|
||||
disposables += prefs.nightStart.asObservable().subscribe { nightStart ->
|
||||
newState { it.copy(nightStart = nightStart) }
|
||||
}
|
||||
|
||||
disposables += prefs.nightEnd.asObservable().subscribe { nightEnd ->
|
||||
newState { it.copy(nightEnd = nightEnd) }
|
||||
}
|
||||
|
||||
disposables += prefs.autoEmoji.asObservable().subscribe { autoEmojiEnabled ->
|
||||
@@ -76,8 +90,11 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
||||
newState { it.copy(mmsEnabled = mmsEnabled) }
|
||||
}
|
||||
|
||||
val mmsSizeLabels = context.resources.getStringArray(R.array.mms_sizes)
|
||||
val mmsSizeIds = context.resources.getIntArray(R.array.mms_sizes_ids)
|
||||
disposables += prefs.mmsSize.asObservable().subscribe { maxMmsSize ->
|
||||
newState { it.copy(maxMmsSize = maxMmsSize) }
|
||||
val index = mmsSizeIds.indexOf(maxMmsSize)
|
||||
newState { it.copy(maxMmsSizeSummary = mmsSizeLabels[index], maxMmsSizeId = maxMmsSize) }
|
||||
}
|
||||
|
||||
disposables += fullSync
|
||||
@@ -96,7 +113,17 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
||||
|
||||
R.id.theme -> navigator.showThemePicker()
|
||||
|
||||
R.id.dark -> prefs.dark.set(!prefs.dark.get())
|
||||
R.id.night -> view.showNightModeDialog()
|
||||
|
||||
R.id.nightStart -> {
|
||||
val date = dateFormatter.parseTime(prefs.nightStart.get())
|
||||
view.showStartTimePicker(date.get(Calendar.HOUR_OF_DAY), date.get(Calendar.MINUTE))
|
||||
}
|
||||
|
||||
R.id.nightEnd -> {
|
||||
val date = dateFormatter.parseTime(prefs.nightEnd.get())
|
||||
view.showEndTimePicker(date.get(Calendar.HOUR_OF_DAY), date.get(Calendar.MINUTE))
|
||||
}
|
||||
|
||||
R.id.autoEmoji -> prefs.autoEmoji.set(!prefs.autoEmoji.get())
|
||||
|
||||
@@ -125,6 +152,23 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
|
||||
}
|
||||
}
|
||||
|
||||
view.nightModeSelectedIntent
|
||||
.doOnNext { view.dismissNightModeDialog() }
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { nightMode -> nightModeManager.updateNightMode(nightMode) }
|
||||
|
||||
view.startTimeSelectedIntent
|
||||
.doOnNext { nightModeManager.updateAlarms() }
|
||||
.map { dateFormatter.formatTime(it.first, it.second) }
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { prefs.nightStart.set(it) }
|
||||
|
||||
view.endTimeSelectedIntent
|
||||
.doOnNext { nightModeManager.updateAlarms() }
|
||||
.map { dateFormatter.formatTime(it.first, it.second) }
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { prefs.nightEnd.set(it) }
|
||||
|
||||
view.ringtoneSelectedIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { ringtone -> prefs.ringtone.set(ringtone) }
|
||||
|
||||
Reference in New Issue
Block a user