Move all notification related prefs to separate activity for all API versions

This commit is contained in:
Moez Bhatti
2018-04-18 23:32:12 -04:00
parent 8cb733c013
commit 0027dfd8e0
12 changed files with 173 additions and 136 deletions
@@ -19,16 +19,22 @@
package feature.notificationprefs
import android.app.Activity
import android.app.AlertDialog
import android.content.Intent
import android.media.RingtoneManager
import android.net.Uri
import android.os.Build
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.MenuItemAdapter
import common.base.QkThemedActivity
import common.util.extensions.dpToPx
import common.util.extensions.setVisible
import common.widget.PreferenceView
import injection.appComponent
import io.reactivex.subjects.PublishSubject
@@ -39,11 +45,11 @@ import javax.inject.Inject
class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>(), NotificationPrefsView {
@Inject lateinit var nightModeAdapter: MenuItemAdapter
@Inject lateinit var mmsSizeAdapter: MenuItemAdapter
@Inject lateinit var notificationPreviewModeAdapter: MenuItemAdapter
override val viewModelClass = NotificationPrefsViewModel::class
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
override val notificationPreviewModeSelectedIntent by lazy { notificationPreviewModeAdapter.menuItemClicks }
override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
init {
@@ -57,8 +63,14 @@ class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>()
showBackButton(true)
viewModel.bindView(this)
nightModeAdapter.setData(R.array.night_modes)
mmsSizeAdapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
val hasOreo = Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
notificationsO.setVisible(hasOreo)
notifications.setVisible(!hasOreo)
vibration.setVisible(!hasOreo)
ringtone.setVisible(!hasOreo)
notificationPreviewModeAdapter.setData(R.array.notification_preview_options)
colors.background
.autoDisposable(scope())
@@ -81,8 +93,28 @@ class NotificationPrefsActivity : QkThemedActivity<NotificationPrefsViewModel>()
}
notifications.checkbox.isChecked = state.notificationsEnabled
notificationPreviews.summary = state.notificationPreviewSummary
vibration.checkbox.isChecked = state.vibrationEnabled
ringtone.summary = state.ringtoneName
qkreply.checkbox.isChecked = state.qkReplyEnabled
qkreplyTapDismiss.setVisible(state.qkReplyEnabled)
qkreplyTapDismiss.checkbox.isChecked = state.qkReplyTapDismiss
}
override fun showNotificationPreviewModeDialog() {
val recyclerView = RecyclerView(this)
recyclerView.layoutManager = LinearLayoutManager(this)
recyclerView.adapter = notificationPreviewModeAdapter
recyclerView.setPadding(0, 8.dpToPx(this), 0, 8.dpToPx(this))
val dialog = AlertDialog.Builder(this)
.setView(recyclerView)
.create()
.apply { show() }
notificationPreviewModeAdapter.menuItemClicks
.autoDisposable(scope())
.subscribe { dialog.dismiss() }
}
override fun showRingtonePicker(default: Uri) {
@@ -18,9 +18,13 @@
*/
package feature.notificationprefs
import android.os.Build
data class NotificationPrefsState(
val conversationTitle: String = "",
val notificationsEnabled: Boolean = true,
val notificationPreviewSummary: String = "",
val vibrationEnabled: Boolean = true,
val ringtoneName: String = ""
)
val ringtoneName: String = "",
val qkReplyEnabled: Boolean = Build.VERSION.SDK_INT < Build.VERSION_CODES.N,
val qkReplyTapDismiss: Boolean = true)
@@ -19,15 +19,17 @@
package feature.notificationprefs
import android.net.Uri
import io.reactivex.Observable
import io.reactivex.subjects.Subject
import common.base.QkView
import common.widget.PreferenceView
import io.reactivex.Observable
import io.reactivex.subjects.Subject
interface NotificationPrefsView : QkView<NotificationPrefsState> {
val preferenceClickIntent: Subject<PreferenceView>
val notificationPreviewModeSelectedIntent: Subject<Int>
val ringtoneSelectedIntent: Observable<String>
fun showNotificationPreviewModeDialog()
fun showRingtonePicker(default: Uri)
}
@@ -27,15 +27,14 @@ import com.f2prateek.rx.preferences2.Preference
import com.moez.QKSMS.R
import com.uber.autodispose.android.lifecycle.scope
import com.uber.autodispose.kotlin.autoDisposable
import common.Navigator
import common.base.QkViewModel
import injection.appComponent
import util.Preferences
import io.reactivex.Flowable
import io.reactivex.rxkotlin.plusAssign
import io.reactivex.schedulers.Schedulers
import common.Navigator
import common.base.QkViewModel
import repository.MessageRepository
import timber.log.Timber
import util.Preferences
import util.extensions.mapNotNull
import javax.inject.Inject
@@ -68,6 +67,10 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel<NotificationPrefs
disposables += notifications.asObservable()
.subscribe { enabled -> newState { it.copy(notificationsEnabled = enabled) } }
val notificationPreviewLabels = context.resources.getStringArray(R.array.notification_preview_options)
disposables += prefs.notificationPreviews().asObservable()
.subscribe { nightMode -> newState { it.copy(notificationPreviewSummary = notificationPreviewLabels[nightMode]) } }
disposables += vibration.asObservable()
.subscribe { enabled -> newState { it.copy(vibrationEnabled = enabled) } }
@@ -75,6 +78,12 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel<NotificationPrefs
.map { uri -> uri.toUri() }
.map { uri -> RingtoneManager.getRingtone(context, uri).getTitle(context) }
.subscribe { title -> newState { it.copy(ringtoneName = title) } }
disposables += prefs.qkreply.asObservable()
.subscribe { enabled -> newState { it.copy(qkReplyEnabled = enabled) } }
disposables += prefs.qkreplyTapDismiss.asObservable()
.subscribe { enabled -> newState { it.copy(qkReplyTapDismiss = enabled) } }
}
override fun bindView(view: NotificationPrefsView) {
@@ -83,17 +92,27 @@ class NotificationPrefsViewModel(intent: Intent) : QkViewModel<NotificationPrefs
view.preferenceClickIntent
.autoDisposable(view.scope())
.subscribe {
Timber.v("Preference click: ${context.resources.getResourceName(it.id)}")
when (it.id) {
R.id.notificationsO -> navigator.showNotificationChannel(threadId)
R.id.notifications -> notifications.set(!notifications.get())
R.id.notificationPreviews -> view.showNotificationPreviewModeDialog()
R.id.vibration -> vibration.set(!vibration.get())
R.id.ringtone -> view.showRingtonePicker(Uri.parse(ringtone.get()))
R.id.qkreply -> prefs.qkreply.set(!prefs.qkreply.get())
R.id.qkreplyTapDismiss -> prefs.qkreplyTapDismiss.set(!prefs.qkreplyTapDismiss.get())
}
}
view.notificationPreviewModeSelectedIntent
.autoDisposable(view.scope())
.subscribe { prefs.notificationPreviews().set(it) }
view.ringtoneSelectedIntent
.autoDisposable(view.scope())
.subscribe { ringtone -> this.ringtone.set(ringtone) }