#1160 - Customize notification actions

This commit is contained in:
Moez Bhatti
2018-07-23 01:34:35 -04:00
parent bdba5ddaa7
commit 1a01171908
14 changed files with 183 additions and 58 deletions
@@ -42,6 +42,12 @@ class Preferences @Inject constructor(private val rxPrefs: RxSharedPreferences)
const val NOTIFICATION_PREVIEWS_NAME = 1 const val NOTIFICATION_PREVIEWS_NAME = 1
const val NOTIFICATION_PREVIEWS_NONE = 2 const val NOTIFICATION_PREVIEWS_NONE = 2
const val NOTIFICATION_ACTION_NONE = 0
const val NOTIFICATION_ACTION_READ = 1
const val NOTIFICATION_ACTION_REPLY = 2
const val NOTIFICATION_ACTION_CALL = 3
const val NOTIFICATION_ACTION_DELETE = 4
const val SEND_DELAY_NONE = 0 const val SEND_DELAY_NONE = 0
const val SEND_DELAY_SHORT = 1 const val SEND_DELAY_SHORT = 1
const val SEND_DELAY_MEDIUM = 2 const val SEND_DELAY_MEDIUM = 2
@@ -63,6 +69,9 @@ class Preferences @Inject constructor(private val rxPrefs: RxSharedPreferences)
val delivery = rxPrefs.getBoolean("delivery", false) val delivery = rxPrefs.getBoolean("delivery", false)
val systemFont = rxPrefs.getBoolean("systemFont", false) val systemFont = rxPrefs.getBoolean("systemFont", false)
val textSize = rxPrefs.getInteger("textSize", TEXT_SIZE_NORMAL) val textSize = rxPrefs.getInteger("textSize", TEXT_SIZE_NORMAL)
val notifAction1 = rxPrefs.getInteger("notifAction1", 1)
val notifAction2 = rxPrefs.getInteger("notifAction2", 2)
val notifAction3 = rxPrefs.getInteger("notifAction3", 0)
val qkreply = rxPrefs.getBoolean("qkreply", Build.VERSION.SDK_INT < Build.VERSION_CODES.N) val qkreply = rxPrefs.getBoolean("qkreply", Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
val qkreplyTapDismiss = rxPrefs.getBoolean("qkreplyTapDismiss", true) val qkreplyTapDismiss = rxPrefs.getBoolean("qkreplyTapDismiss", true)
val unicode = rxPrefs.getBoolean("unicode", false) val unicode = rxPrefs.getBoolean("unicode", false)
@@ -109,10 +109,6 @@ class NotificationManagerImpl @Inject constructor(
val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", threadId) val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", threadId)
val seenPI = PendingIntent.getBroadcast(context, threadId.toInt() + 20000, seenIntent, PendingIntent.FLAG_UPDATE_CURRENT) val seenPI = PendingIntent.getBroadcast(context, threadId.toInt() + 20000, seenIntent, PendingIntent.FLAG_UPDATE_CURRENT)
val readIntent = Intent(context, MarkReadReceiver::class.java).putExtra("threadId", threadId)
val readPI = PendingIntent.getBroadcast(context, threadId.toInt() + 30000, readIntent, PendingIntent.FLAG_UPDATE_CURRENT)
val readAction = NotificationCompat.Action(R.drawable.ic_check_white_24dp, context.getString(R.string.notification_read), readPI)
// We can't store a null preference, so map it to a null Uri if the pref string is empty // We can't store a null preference, so map it to a null Uri if the pref string is empty
val ringtone = prefs.ringtone(threadId).get() val ringtone = prefs.ringtone(threadId).get()
.takeIf { it.isNotEmpty() } .takeIf { it.isNotEmpty() }
@@ -127,17 +123,18 @@ class NotificationManagerImpl @Inject constructor(
.setAutoCancel(true) .setAutoCancel(true)
.setContentIntent(contentPI) .setContentIntent(contentPI)
.setDeleteIntent(seenPI) .setDeleteIntent(seenPI)
.addAction(readAction)
.setSound(ringtone) .setSound(ringtone)
.setLights(Color.WHITE, 500, 2000) .setLights(Color.WHITE, 500, 2000)
.setVibrate(if (prefs.vibration(threadId).get()) VIBRATE_PATTERN else longArrayOf(0)) .setVibrate(if (prefs.vibration(threadId).get()) VIBRATE_PATTERN else longArrayOf(0))
// Tell the notification if it's a group message
val messagingStyle = NotificationCompat.MessagingStyle("Me") val messagingStyle = NotificationCompat.MessagingStyle("Me")
if (conversation.recipients.size >= 2) { if (conversation.recipients.size >= 2) {
messagingStyle.isGroupConversation = true messagingStyle.isGroupConversation = true
messagingStyle.conversationTitle = conversation.getTitle() messagingStyle.conversationTitle = conversation.getTitle()
} }
// Add the messages to the notification
messages.forEach { message -> messages.forEach { message ->
val name = when { val name = when {
message.isMe() -> null message.isMe() -> null
@@ -156,6 +153,7 @@ class NotificationManagerImpl @Inject constructor(
} }
} }
// Set the large icon
val avatar = conversation.recipients.takeIf { it.size == 1 } val avatar = conversation.recipients.takeIf { it.size == 1 }
?.first()?.address ?.first()?.address
?.let { address -> ?.let { address ->
@@ -167,6 +165,7 @@ class NotificationManagerImpl @Inject constructor(
} }
?.let { futureGet -> tryOrNull(false) { futureGet.get() } } ?.let { futureGet -> tryOrNull(false) { futureGet.get() } }
// Bind the notification contents based on the notification preview mode
when (prefs.notificationPreviews(threadId).get()) { when (prefs.notificationPreviews(threadId).get()) {
Preferences.NOTIFICATION_PREVIEWS_ALL -> { Preferences.NOTIFICATION_PREVIEWS_ALL -> {
notification notification
@@ -194,14 +193,40 @@ class NotificationManagerImpl @Inject constructor(
.mapNotNull { recipient -> recipient.contact?.lookupKey } .mapNotNull { recipient -> recipient.contact?.lookupKey }
.forEach { uri -> notification.addPerson(uri) } .forEach { uri -> notification.addPerson(uri) }
if (Build.VERSION.SDK_INT >= 24) { // Add the action buttons
notification.addAction(getReplyAction(threadId)) val actionLabels = context.resources.getStringArray(R.array.notification_actions)
} else { listOf(prefs.notifAction1, prefs.notifAction2, prefs.notifAction3)
val replyIntent = Intent(context, QkReplyActivity::class.java).putExtra("threadId", threadId) .map { preference -> preference.get() }
val replyPI = PendingIntent.getActivity(context, threadId.toInt() + 40000, replyIntent, PendingIntent.FLAG_UPDATE_CURRENT) .distinct()
val replyAction = NotificationCompat.Action(R.drawable.ic_reply_white_24dp, context.getString(R.string.notification_reply), replyPI) .mapNotNull { action ->
notification.addAction(replyAction) when (action) {
} Preferences.NOTIFICATION_ACTION_READ -> {
val intent = Intent(context, MarkReadReceiver::class.java).putExtra("threadId", threadId)
val pi = PendingIntent.getBroadcast(context, threadId.toInt() + 30000, intent, PendingIntent.FLAG_UPDATE_CURRENT)
NotificationCompat.Action(R.drawable.ic_check_white_24dp, actionLabels[action], pi)
}
Preferences.NOTIFICATION_ACTION_REPLY -> {
if (Build.VERSION.SDK_INT >= 24) {
getReplyAction(threadId)
} else {
val intent = Intent(context, QkReplyActivity::class.java).putExtra("threadId", threadId)
val pi = PendingIntent.getActivity(context, threadId.toInt() + 40000, intent, PendingIntent.FLAG_UPDATE_CURRENT)
NotificationCompat.Action(R.drawable.ic_reply_white_24dp, actionLabels[action], pi)
}
}
Preferences.NOTIFICATION_ACTION_CALL -> {
val address = conversation.recipients[0]?.address
val intent = Intent(Intent.ACTION_DIAL, Uri.parse("tel:$address"))
val pi = PendingIntent.getActivity(context, threadId.toInt() + 50000, intent, PendingIntent.FLAG_UPDATE_CURRENT)
NotificationCompat.Action(R.drawable.ic_call_white_24dp, actionLabels[action], pi)
}
else -> null
}
}
.forEach { notification.addAction(it) }
if (prefs.qkreply.get()) { if (prefs.qkreply.get()) {
notification.priority = NotificationCompat.PRIORITY_DEFAULT notification.priority = NotificationCompat.PRIORITY_DEFAULT
@@ -251,15 +276,14 @@ class NotificationManagerImpl @Inject constructor(
val replyIntent = Intent(context, RemoteMessagingReceiver::class.java).putExtra("threadId", threadId) val replyIntent = Intent(context, RemoteMessagingReceiver::class.java).putExtra("threadId", threadId)
val replyPI = PendingIntent.getBroadcast(context, threadId.toInt() + 40000, replyIntent, PendingIntent.FLAG_UPDATE_CURRENT) val replyPI = PendingIntent.getBroadcast(context, threadId.toInt() + 40000, replyIntent, PendingIntent.FLAG_UPDATE_CURRENT)
val title = context.resources.getStringArray(R.array.notification_actions)[Preferences.NOTIFICATION_ACTION_REPLY]
val responseSet = context.resources.getStringArray(R.array.qk_responses) val responseSet = context.resources.getStringArray(R.array.qk_responses)
val remoteInput = RemoteInput.Builder("body") val remoteInput = RemoteInput.Builder("body")
.setLabel(context.getString(R.string.notification_reply)) .setLabel(title)
.setChoices(responseSet) .setChoices(responseSet)
.build() .build()
return NotificationCompat.Action.Builder( return NotificationCompat.Action.Builder(R.drawable.ic_reply_white_24dp, title, replyPI)
R.drawable.ic_reply_white_24dp,
context.getString(R.string.notification_reply), replyPI)
.addRemoteInput(remoteInput) .addRemoteInput(remoteInput)
.build() .build()
} }
@@ -19,21 +19,25 @@
package com.moez.QKSMS.feature.notificationprefs package com.moez.QKSMS.feature.notificationprefs
import android.app.Activity import android.app.Activity
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders
import android.content.Intent import android.content.Intent
import android.media.RingtoneManager 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 androidx.core.view.isVisible
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders
import com.jakewharton.rxbinding2.view.clicks import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.QkDialog import com.moez.QKSMS.common.QkDialog
import com.moez.QKSMS.common.androidxcompat.scope
import com.moez.QKSMS.common.base.QkThemedActivity import com.moez.QKSMS.common.base.QkThemedActivity
import com.moez.QKSMS.common.util.extensions.animateLayoutChanges import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
import com.moez.QKSMS.common.util.extensions.setVisible import com.moez.QKSMS.common.util.extensions.setVisible
import com.moez.QKSMS.common.widget.PreferenceView import com.moez.QKSMS.common.widget.PreferenceView
import com.uber.autodispose.kotlin.autoDisposable
import dagger.android.AndroidInjection import dagger.android.AndroidInjection
import io.reactivex.Observable
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.notification_prefs_activity.* import kotlinx.android.synthetic.main.notification_prefs_activity.*
@@ -43,11 +47,13 @@ import javax.inject.Inject
class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView { class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView {
@Inject lateinit var previewModeDialog: QkDialog @Inject lateinit var previewModeDialog: QkDialog
@Inject lateinit var actionsDialog: QkDialog
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create() override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
override val previewModeSelectedIntent by lazy { previewModeDialog.adapter.menuItemClicks } override val previewModeSelectedIntent by lazy { previewModeDialog.adapter.menuItemClicks }
override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create() override val ringtoneSelectedIntent: Subject<String> = PublishSubject.create()
override val actionsSelectedIntent by lazy { actionsDialog.adapter.menuItemClicks }
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[NotificationPrefsViewModel::class.java] } private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[NotificationPrefsViewModel::class.java] }
@@ -70,30 +76,43 @@ class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView {
previewModeDialog.setTitle(R.string.settings_notification_previews_title) previewModeDialog.setTitle(R.string.settings_notification_previews_title)
previewModeDialog.adapter.setData(R.array.notification_preview_options) previewModeDialog.adapter.setData(R.array.notification_preview_options)
actionsDialog.adapter.setData(R.array.notification_actions)
// Listen to clicks for all of the preferences // Listen to clicks for all of the preferences
(0 until preferences.childCount) (0 until preferences.childCount)
.map { index -> preferences.getChildAt(index) } .map { index -> preferences.getChildAt(index) }
.filter { view -> view is PreferenceView } .mapNotNull { view -> view as? PreferenceView }
.forEach { preference -> .map { preference -> preference.clicks().map { preference } }
preference.clicks().subscribe { .let { Observable.merge(it) }
preferenceClickIntent.onNext(preference as PreferenceView) .autoDisposable(scope())
} .subscribe(preferenceClickIntent)
}
} }
override fun render(state: NotificationPrefsState) { override fun render(state: NotificationPrefsState) {
if (state.conversationTitle.isNotEmpty()) { if (state.threadId != 0L) {
title = state.conversationTitle title = state.conversationTitle
} }
notifications.checkbox.isChecked = state.notificationsEnabled notifications.checkbox.isChecked = state.notificationsEnabled
notificationPreviews.summary = state.previewSummary previews.summary = state.previewSummary
previewModeDialog.adapter.selectedItem = state.previewId previewModeDialog.adapter.selectedItem = state.previewId
vibration.checkbox.isChecked = state.vibrationEnabled vibration.checkbox.isChecked = state.vibrationEnabled
ringtone.summary = state.ringtoneName ringtone.summary = state.ringtoneName
actionsDivider.isVisible = state.threadId == 0L
actionsTitle.isVisible = state.threadId == 0L
action1.isVisible = state.threadId == 0L
action1.summary = state.action1Summary
action2.isVisible = state.threadId == 0L
action2.summary = state.action2Summary
action3.isVisible = state.threadId == 0L
action3.summary = state.action3Summary
qkreplyDivider.isVisible = state.threadId == 0L
qkreplyTitle.isVisible = state.threadId == 0L
qkreply.checkbox.isChecked = state.qkReplyEnabled qkreply.checkbox.isChecked = state.qkReplyEnabled
qkreplyTapDismiss.setVisible(state.qkReplyEnabled) qkreply.isVisible = state.threadId == 0L
qkreplyTapDismiss.setVisible(state.threadId == 0L && state.qkReplyEnabled)
qkreplyTapDismiss.checkbox.isChecked = state.qkReplyTapDismiss qkreplyTapDismiss.checkbox.isChecked = state.qkReplyTapDismiss
} }
@@ -108,6 +127,11 @@ class NotificationPrefsActivity : QkThemedActivity(), NotificationPrefsView {
startActivityForResult(intent, 123) startActivityForResult(intent, 123)
} }
override fun showActionDialog(selected: Int) {
actionsDialog.adapter.selectedItem = selected
actionsDialog.show(this)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data) super.onActivityResult(requestCode, resultCode, data)
if (requestCode == 123 && resultCode == Activity.RESULT_OK) { if (requestCode == 123 && resultCode == Activity.RESULT_OK) {
@@ -1,17 +1,18 @@
package com.moez.QKSMS.feature.notificationprefs package com.moez.QKSMS.feature.notificationprefs
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import android.content.Intent
import com.moez.QKSMS.injection.ViewModelKey import com.moez.QKSMS.injection.ViewModelKey
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import dagger.multibindings.IntoMap import dagger.multibindings.IntoMap
import javax.inject.Named
@Module @Module
class NotificationPrefsActivityModule { class NotificationPrefsActivityModule {
@Provides @Provides
fun provideIntent(activity: NotificationPrefsActivity): Intent = activity.intent @Named("threadId")
fun provideThreadId(activity: NotificationPrefsActivity): Long = activity.intent.extras?.getLong("threadId") ?: 0L
@Provides @Provides
@IntoMap @IntoMap
@@ -22,10 +22,14 @@ import android.os.Build
import com.moez.QKSMS.util.Preferences import com.moez.QKSMS.util.Preferences
data class NotificationPrefsState( data class NotificationPrefsState(
val threadId: Long = 0,
val conversationTitle: String = "", val conversationTitle: String = "",
val notificationsEnabled: Boolean = true, val notificationsEnabled: Boolean = true,
val previewSummary: String = "", val previewSummary: String = "",
val previewId: Int = Preferences.NOTIFICATION_PREVIEWS_ALL, val previewId: Int = Preferences.NOTIFICATION_PREVIEWS_ALL,
val action1Summary: String = "",
val action2Summary: String = "",
val action3Summary: String = "",
val vibrationEnabled: Boolean = true, val vibrationEnabled: Boolean = true,
val ringtoneName: String = "", val ringtoneName: String = "",
val qkReplyEnabled: Boolean = Build.VERSION.SDK_INT < Build.VERSION_CODES.N, val qkReplyEnabled: Boolean = Build.VERSION.SDK_INT < Build.VERSION_CODES.N,
@@ -29,7 +29,9 @@ interface NotificationPrefsView : QkView<NotificationPrefsState> {
val preferenceClickIntent: Subject<PreferenceView> val preferenceClickIntent: Subject<PreferenceView>
val previewModeSelectedIntent: Subject<Int> val previewModeSelectedIntent: Subject<Int>
val ringtoneSelectedIntent: Observable<String> val ringtoneSelectedIntent: Observable<String>
val actionsSelectedIntent: Subject<Int>
fun showPreviewModeDialog() fun showPreviewModeDialog()
fun showRingtonePicker(default: Uri?) fun showRingtonePicker(default: Uri?)
fun showActionDialog(selected: Int)
} }
@@ -19,10 +19,8 @@
package com.moez.QKSMS.feature.notificationprefs package com.moez.QKSMS.feature.notificationprefs
import android.content.Context import android.content.Context
import android.content.Intent
import android.media.RingtoneManager import android.media.RingtoneManager
import android.net.Uri import android.net.Uri
import com.f2prateek.rx.preferences2.Preference
import com.moez.QKSMS.R import com.moez.QKSMS.R
import com.moez.QKSMS.common.Navigator import com.moez.QKSMS.common.Navigator
import com.moez.QKSMS.common.androidxcompat.scope import com.moez.QKSMS.common.androidxcompat.scope
@@ -33,30 +31,25 @@ import com.moez.QKSMS.util.Preferences
import com.uber.autodispose.kotlin.autoDisposable import com.uber.autodispose.kotlin.autoDisposable
import io.reactivex.Flowable import io.reactivex.Flowable
import io.reactivex.rxkotlin.plusAssign import io.reactivex.rxkotlin.plusAssign
import io.reactivex.rxkotlin.withLatestFrom
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Named
class NotificationPrefsViewModel @Inject constructor( class NotificationPrefsViewModel @Inject constructor(
private val intent: Intent, @Named("threadId") private val threadId: Long,
private val context: Context, private val context: Context,
private val conversationRepo: ConversationRepository, private val conversationRepo: ConversationRepository,
private val navigator: Navigator, private val navigator: Navigator,
private val prefs: Preferences private val prefs: Preferences
) : QkViewModel<NotificationPrefsView, NotificationPrefsState>(NotificationPrefsState()) { ) : QkViewModel<NotificationPrefsView, NotificationPrefsState>(NotificationPrefsState(threadId = threadId)) {
private val threadId = intent.extras?.getLong("threadId") ?: 0L private val notifications = prefs.notifications(threadId)
private val previews = prefs.notificationPreviews(threadId)
private val notifications: Preference<Boolean> private val vibration = prefs.vibration(threadId)
private val previews: Preference<Int> private val ringtone = prefs.ringtone(threadId)
private val vibration: Preference<Boolean>
private val ringtone: Preference<String>
init { init {
notifications = prefs.notifications(threadId)
previews = prefs.notificationPreviews(threadId)
vibration = prefs.vibration(threadId)
ringtone = prefs.ringtone(threadId)
disposables += Flowable.just(threadId) disposables += Flowable.just(threadId)
.mapNotNull { threadId -> conversationRepo.getConversation(threadId) } .mapNotNull { threadId -> conversationRepo.getConversation(threadId) }
.map { conversation -> conversation.getTitle() } .map { conversation -> conversation.getTitle() }
@@ -72,6 +65,16 @@ class NotificationPrefsViewModel @Inject constructor(
newState { copy(previewSummary = previewLabels[previewId], previewId = previewId) } newState { copy(previewSummary = previewLabels[previewId], previewId = previewId) }
} }
val actionLabels = context.resources.getStringArray(R.array.notification_actions)
disposables += prefs.notifAction1.asObservable()
.subscribe { previewId -> newState { copy(action1Summary = actionLabels[previewId]) } }
disposables += prefs.notifAction2.asObservable()
.subscribe { previewId -> newState { copy(action2Summary = actionLabels[previewId]) } }
disposables += prefs.notifAction3.asObservable()
.subscribe { previewId -> newState { copy(action3Summary = actionLabels[previewId]) } }
disposables += vibration.asObservable() disposables += vibration.asObservable()
.subscribe { enabled -> newState { copy(vibrationEnabled = enabled) } } .subscribe { enabled -> newState { copy(vibrationEnabled = enabled) } }
@@ -102,12 +105,18 @@ class NotificationPrefsViewModel @Inject constructor(
R.id.notifications -> notifications.set(!notifications.get()) R.id.notifications -> notifications.set(!notifications.get())
R.id.notificationPreviews -> view.showPreviewModeDialog() R.id.previews -> view.showPreviewModeDialog()
R.id.vibration -> vibration.set(!vibration.get()) R.id.vibration -> vibration.set(!vibration.get())
R.id.ringtone -> view.showRingtonePicker(ringtone.get().takeIf { it.isNotEmpty() }?.let(Uri::parse)) R.id.ringtone -> view.showRingtonePicker(ringtone.get().takeIf { it.isNotEmpty() }?.let(Uri::parse))
R.id.action1 -> view.showActionDialog(prefs.notifAction1.get())
R.id.action2 -> view.showActionDialog(prefs.notifAction2.get())
R.id.action3 -> view.showActionDialog(prefs.notifAction3.get())
R.id.qkreply -> prefs.qkreply.set(!prefs.qkreply.get()) R.id.qkreply -> prefs.qkreply.set(!prefs.qkreply.get())
R.id.qkreplyTapDismiss -> prefs.qkreplyTapDismiss.set(!prefs.qkreplyTapDismiss.get()) R.id.qkreplyTapDismiss -> prefs.qkreplyTapDismiss.set(!prefs.qkreplyTapDismiss.get())
@@ -121,5 +130,16 @@ class NotificationPrefsViewModel @Inject constructor(
view.ringtoneSelectedIntent view.ringtoneSelectedIntent
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { ringtone -> this.ringtone.set(ringtone) } .subscribe { ringtone -> this.ringtone.set(ringtone) }
view.actionsSelectedIntent
.withLatestFrom(view.preferenceClickIntent) { action, preference ->
when (preference.id) {
R.id.action1 -> prefs.notifAction1.set(action)
R.id.action2 -> prefs.notifAction2.set(action)
R.id.action3 -> prefs.notifAction3.set(action)
}
}
.autoDisposable(view.scope())
.subscribe()
} }
} }
@@ -22,6 +22,6 @@
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:viewportHeight="24.0"> android:viewportHeight="24.0">
<path <path
android:fillColor="#FF000000" android:fillColor="#FFF"
android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/> android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36 1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0 -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57 0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>
</vector> </vector>
@@ -22,6 +22,6 @@
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:viewportHeight="24.0"> android:viewportHeight="24.0">
<path <path
android:fillColor="#FF000000" android:fillColor="#FFF"
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/> android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
</vector> </vector>
@@ -101,7 +101,7 @@
android:id="@+id/delete" android:id="@+id/delete"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:icon="@drawable/ic_delete_black_24dp" app:icon="@drawable/ic_delete_white_24dp"
app:title="@string/info_delete" /> app:title="@string/info_delete" />
<View <View
@@ -53,7 +53,6 @@
android:id="@+id/notificationsO" android:id="@+id/notificationsO"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:icon="@drawable/ic_notifications_black_24dp"
app:title="@string/settings_notifications_title" app:title="@string/settings_notifications_title"
tools:visibility="gone" /> tools:visibility="gone" />
@@ -61,12 +60,11 @@
android:id="@+id/notifications" android:id="@+id/notifications"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:icon="@drawable/ic_notifications_black_24dp"
app:title="@string/settings_notifications_title" app:title="@string/settings_notifications_title"
app:widget="@layout/settings_switch_widget" /> app:widget="@layout/settings_switch_widget" />
<com.moez.QKSMS.common.widget.PreferenceView <com.moez.QKSMS.common.widget.PreferenceView
android:id="@+id/notificationPreviews" android:id="@+id/previews"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:title="@string/settings_notification_previews_title" app:title="@string/settings_notification_previews_title"
@@ -86,6 +84,7 @@
app:title="@string/settings_ringtone_title" /> app:title="@string/settings_ringtone_title" />
<View <View
android:id="@+id/actionsDivider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
@@ -93,6 +92,41 @@
android:background="?android:attr/divider" /> android:background="?android:attr/divider" />
<com.moez.QKSMS.common.widget.QkTextView <com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/actionsTitle"
style="@style/PreferenceCategory"
android:text="@string/settings_notification_actions_title" />
<com.moez.QKSMS.common.widget.PreferenceView
android:id="@+id/action1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_notification_action_1"
tools:summary="Mark read" />
<com.moez.QKSMS.common.widget.PreferenceView
android:id="@+id/action2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_notification_action_2"
tools:summary="Reply" />
<com.moez.QKSMS.common.widget.PreferenceView
android:id="@+id/action3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:title="@string/settings_notification_action_3"
tools:summary="None" />
<View
android:id="@+id/qkreplyDivider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:background="?android:attr/divider" />
<com.moez.QKSMS.common.widget.QkTextView
android:id="@+id/qkreplyTitle"
style="@style/PreferenceCategory" style="@style/PreferenceCategory"
android:text="@string/settings_category_qkreply" /> android:text="@string/settings_category_qkreply" />
@@ -100,7 +134,6 @@
android:id="@+id/qkreply" android:id="@+id/qkreply"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:icon="@drawable/ic_reply_white_24dp"
app:summary="@string/settings_qkreply_summary" app:summary="@string/settings_qkreply_summary"
app:title="@string/settings_qkreply_title" app:title="@string/settings_qkreply_title"
app:widget="@layout/settings_switch_widget" /> app:widget="@layout/settings_switch_widget" />
+2 -2
View File
@@ -21,7 +21,7 @@
<item <item
android:id="@+id/call" android:id="@+id/call"
android:icon="@drawable/ic_call_black_24dp" android:icon="@drawable/ic_call_white_24dp"
android:title="@string/menu_call" android:title="@string/menu_call"
android:visible="false" android:visible="false"
app:showAsAction="always" /> app:showAsAction="always" />
@@ -42,7 +42,7 @@
<item <item
android:id="@+id/delete" android:id="@+id/delete"
android:icon="@drawable/ic_delete_black_24dp" android:icon="@drawable/ic_delete_white_24dp"
android:title="@string/compose_menu_delete" android:title="@string/compose_menu_delete"
android:visible="false" android:visible="false"
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
+1 -1
View File
@@ -35,7 +35,7 @@
<item <item
android:id="@+id/delete" android:id="@+id/delete"
android:icon="@drawable/ic_delete_black_24dp" android:icon="@drawable/ic_delete_white_24dp"
android:title="@string/main_menu_delete" android:title="@string/main_menu_delete"
android:visible="false" android:visible="false"
app:showAsAction="ifRoom" /> app:showAsAction="ifRoom" />
+10 -2
View File
@@ -163,6 +163,10 @@
<string name="settings_system_font_title">Use system font</string> <string name="settings_system_font_title">Use system font</string>
<string name="settings_auto_emoji_title">Automatic emoji</string> <string name="settings_auto_emoji_title">Automatic emoji</string>
<string name="settings_notifications_title">Notifications</string> <string name="settings_notifications_title">Notifications</string>
<string name="settings_notification_actions_title">Actions</string>
<string name="settings_notification_action_1">Button 1</string>
<string name="settings_notification_action_2">Button 2</string>
<string name="settings_notification_action_3">Button 3</string>
<string name="settings_notification_previews_title">Notification previews</string> <string name="settings_notification_previews_title">Notification previews</string>
<string name="settings_vibration_title">Vibration</string> <string name="settings_vibration_title">Vibration</string>
<string name="settings_ringtone_title">Sound</string> <string name="settings_ringtone_title">Sound</string>
@@ -246,8 +250,12 @@
<string name="theme_hex">HEX</string> <string name="theme_hex">HEX</string>
<string name="theme_apply">Apply</string> <string name="theme_apply">Apply</string>
<string name="notification_reply">Reply</string> <string-array name="notification_actions">
<string name="notification_read">Mark read</string> <item>None</item>
<item>Mark read</item>
<item>Reply</item>
<item>Call</item>
</string-array>
<string name="button_cancel">Cancel</string> <string name="button_cancel">Cancel</string>
<string name="button_delete">Delete</string> <string name="button_delete">Delete</string>