#979 - Delayed sending

This commit is contained in:
Moez Bhatti
2018-04-30 02:57:04 -04:00
parent 504c0b3413
commit 0e52b290a0
21 changed files with 356 additions and 32 deletions
@@ -27,6 +27,7 @@ import android.view.View
import android.view.inputmethod.InputMethodManager
import android.widget.EditText
import android.widget.ImageView
import android.widget.ProgressBar
fun EditText.showKeyboard() {
requestFocus()
@@ -38,6 +39,10 @@ fun ImageView.setTint(color: Int) {
imageTintList = ColorStateList.valueOf(color)
}
fun ProgressBar.setTint(color: Int) {
progressTintList = ColorStateList.valueOf(color)
}
fun View.setBackgroundTint(color: Int) {
// API 21 doesn't support this
@@ -63,6 +63,7 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
override val infoIntent: Subject<Unit> = PublishSubject.create()
override val messageClickIntent: Subject<Message> by lazy { messageAdapter.clicks }
override val messageLongClickIntent: Subject<Message> by lazy { messageAdapter.longClicks }
override val cancelSendingIntent: Subject<Message> by lazy { messageAdapter.cancelSending }
override val menuItemIntent: Subject<Int> by lazy { dialog.adapter.menuItemClicks }
override val attachmentDeletedIntent: Subject<Uri> by lazy { attachmentAdapter.attachmentDeleted }
override val textChangedIntent by lazy { message.textChanges() }
@@ -40,6 +40,7 @@ interface ComposeView : QkView<ComposeState> {
val infoIntent: Subject<Unit>
val messageClickIntent: Subject<Message>
val messageLongClickIntent: Subject<Message>
val cancelSendingIntent: Subject<Message>
val menuItemIntent: Subject<Int>
val attachmentDeletedIntent: Subject<Uri>
val textChangedIntent: Observable<CharSequence>
@@ -37,6 +37,7 @@ import common.util.ClipboardUtils
import common.util.extensions.makeToast
import common.util.filter.ContactFilter
import injection.appComponent
import interactor.CancelDelayedMessage
import interactor.ContactSync
import interactor.DeleteMessage
import interactor.MarkRead
@@ -70,6 +71,7 @@ import javax.inject.Inject
class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(ComposeState()) {
@Inject lateinit var context: Context
@Inject lateinit var cancelMessage: CancelDelayedMessage
@Inject lateinit var contactFilter: ContactFilter
@Inject lateinit var contactsRepo: ContactRepository
@Inject lateinit var messageRepo: MessageRepository
@@ -171,6 +173,7 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
}
.switchMap { messages -> messages.asObservable() }
disposables += cancelMessage
disposables += sendMessage
disposables += markRead
disposables += conversation.subscribe()
@@ -312,6 +315,12 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
.autoDisposable(view.scope())
.subscribe { view.showMenu(listOf(menuCopy, menuForward, menuDelete)) }
// Cancel sending a message
view.cancelSendingIntent
.doOnNext { message -> view.setDraft(message.getText()) }
.autoDisposable(view.scope())
.subscribe { message -> cancelMessage.execute(message.id) }
// Handle long-press menu item click
view.menuItemIntent
.withLatestFrom(view.messageLongClickIntent, { actionId, message ->
@@ -18,6 +18,7 @@
*/
package feature.compose
import android.animation.ObjectAnimator
import android.content.Context
import android.graphics.Typeface
import android.os.Build
@@ -29,6 +30,8 @@ import android.text.style.StyleSpan
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.ProgressBar
import com.jakewharton.rxbinding2.view.RxView
import com.jakewharton.rxbinding2.view.clicks
import com.moez.QKSMS.R
@@ -42,6 +45,7 @@ import common.util.extensions.dpToPx
import common.util.extensions.forwardTouches
import common.util.extensions.setBackgroundTint
import common.util.extensions.setPadding
import common.util.extensions.setTint
import common.util.extensions.setVisible
import common.widget.BubbleImageView.Style.*
import io.reactivex.disposables.CompositeDisposable
@@ -54,6 +58,7 @@ import kotlinx.android.synthetic.main.mms_preview_list_item.view.*
import model.Conversation
import model.Message
import model.Recipient
import util.Preferences
import util.extensions.hasThumbnails
import util.extensions.isImage
import util.extensions.isVideo
@@ -64,7 +69,8 @@ class MessagesAdapter @Inject constructor(
private val context: Context,
private val colors: Colors,
private val dateFormatter: DateFormatter,
private val navigator: Navigator
private val navigator: Navigator,
private val prefs: Preferences
) : QkRealmAdapter<Message>() {
companion object {
@@ -75,6 +81,7 @@ class MessagesAdapter @Inject constructor(
val clicks: Subject<Message> = PublishSubject.create<Message>()
val longClicks: Subject<Message> = PublishSubject.create<Message>()
val cancelSending: Subject<Message> = PublishSubject.create<Message>()
var data: Pair<Conversation, RealmResults<Message>>? = null
set(value) {
@@ -119,7 +126,15 @@ class MessagesAdapter @Inject constructor(
if (viewType == VIEW_TYPE_MESSAGE_OUT) {
view = layoutInflater.inflate(R.layout.message_list_item_out, parent, false)
disposables += colors.bubble
.subscribe { color -> view.body.setBackgroundTint(color) }
.subscribe { color ->
view.body.setBackgroundTint(color)
view.findViewById<ProgressBar>(R.id.cancel).setBackgroundTint(color)
}
disposables += theme
.subscribe { color ->
view.findViewById<ImageView>(R.id.cancelIcon).setTint(color)
view.findViewById<ProgressBar>(R.id.cancel).setTint(color)
}
} else {
view = layoutInflater.inflate(R.layout.message_list_item_in, parent, false)
view.avatar.threadId = conversation?.id ?: 0
@@ -152,6 +167,29 @@ class MessagesAdapter @Inject constructor(
RxView.longClicks(view).subscribe { longClicks.onNext(message) }
// Bind the cancel view
view.findViewById<ProgressBar>(R.id.cancel)?.let { cancel ->
val isCancellable = message.isSending() && message.date > System.currentTimeMillis()
cancel.setVisible(isCancellable)
cancel.clicks().subscribe { cancelSending.onNext(message) }
cancel.progress = 2
if (isCancellable) {
val delay = when (prefs.sendDelay.get()) {
Preferences.SEND_DELAY_SHORT -> 3000
Preferences.SEND_DELAY_MEDIUM -> 5000
Preferences.SEND_DELAY_LONG -> 10000
else -> 0
}
val progress = (1 - (message.date - System.currentTimeMillis()) / delay.toFloat()) * 100
ObjectAnimator.ofInt(cancel, "progress", progress.toInt(), 100)
.setDuration(message.date - System.currentTimeMillis())
.start()
}
}
// Bind the message status
bindStatus(viewHolder, position)
@@ -46,15 +46,17 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
@Inject lateinit var nightModeDialog: QkDialog
@Inject lateinit var textSizeDialog: QkDialog
@Inject lateinit var sendDelayDialog: QkDialog
@Inject lateinit var mmsSizeDialog: QkDialog
override val viewModelClass = SettingsViewModel::class
override val preferenceClickIntent: Subject<PreferenceView> = PublishSubject.create()
override val nightModeSelectedIntent by lazy { nightModeDialog.adapter.menuItemClicks }
override val viewQksmsPlusIntent: Subject<Unit> = PublishSubject.create()
override val nightModeSelectedIntent by lazy { nightModeDialog.adapter.menuItemClicks }
override val startTimeSelectedIntent: Subject<Pair<Int, Int>> = PublishSubject.create()
override val endTimeSelectedIntent: Subject<Pair<Int, Int>> = PublishSubject.create()
override val textSizeSelectedIntent by lazy { textSizeDialog.adapter.menuItemClicks }
override val sendDelayChangedIntent by lazy { sendDelayDialog.adapter.menuItemClicks }
override val mmsSizeSelectedIntent: Subject<Int> by lazy { mmsSizeDialog.adapter.menuItemClicks }
// TODO remove this
@@ -79,6 +81,7 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
nightModeDialog.adapter.setData(R.array.night_modes)
textSizeDialog.adapter.setData(R.array.text_sizes)
sendDelayDialog.adapter.setData(R.array.delayed_sending_labels)
mmsSizeDialog.adapter.setData(R.array.mms_sizes, R.array.mms_sizes_ids)
about.summary = getString(R.string.settings_version, BuildConfig.VERSION_NAME)
@@ -119,6 +122,10 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
black.checkbox.isChecked = state.black
autoEmoji.checkbox.isChecked = state.autoEmojiEnabled
delayed.summary = state.sendDelaySummary
sendDelayDialog.adapter.selectedItem = state.sendDelayId
delivery.checkbox.isChecked = state.deliveryEnabled
textSize.summary = state.textSizeSummary
@@ -131,9 +138,6 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
mmsSizeDialog.adapter.selectedItem = state.maxMmsSizeId
}
// TODO change this to a PopupWindow
override fun showNightModeDialog() = nightModeDialog.show(this)
override fun showQksmsPlusSnackbar() {
Snackbar.make(contentView, R.string.toast_qksms_plus, Snackbar.LENGTH_LONG).run {
setAction(R.string.button_more, { viewQksmsPlusIntent.onNext(Unit) })
@@ -141,6 +145,9 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
}
}
// TODO change this to a PopupWindow
override fun showNightModeDialog() = nightModeDialog.show(this)
override fun showStartTimePicker(hour: Int, minute: Int) {
TimePickerDialog(this, TimePickerDialog.OnTimeSetListener { _, newHour, newMinute ->
startTimeSelectedIntent.onNext(Pair(newHour, newMinute))
@@ -155,6 +162,8 @@ class SettingsActivity : QkThemedActivity<SettingsViewModel>(), SettingsView {
override fun showTextSizePicker() = textSizeDialog.show(this)
override fun showDelayDurationDialog() = sendDelayDialog.show(this)
override fun showMmsSizePicker() = mmsSizeDialog.show(this)
}
@@ -31,6 +31,8 @@ data class SettingsState(
val black: Boolean = false,
val autoEmojiEnabled: Boolean = true,
val notificationsEnabled: Boolean = true,
val sendDelaySummary: String = "",
val sendDelayId: Int = 0,
val deliveryEnabled: Boolean = false,
val textSizeSummary: String = "",
val textSizeId: Int = Preferences.TEXT_SIZE_NORMAL,
@@ -26,17 +26,19 @@ import io.reactivex.subjects.Subject
interface SettingsView : QkView<SettingsState> {
val preferenceClickIntent: Subject<PreferenceView>
val nightModeSelectedIntent: Observable<Int>
val viewQksmsPlusIntent: Subject<Unit>
val nightModeSelectedIntent: Observable<Int>
val startTimeSelectedIntent: Subject<Pair<Int, Int>>
val endTimeSelectedIntent: Subject<Pair<Int, Int>>
val textSizeSelectedIntent: Subject<Int>
val sendDelayChangedIntent: Observable<Int>
val mmsSizeSelectedIntent: Observable<Int>
fun showNightModeDialog()
fun showQksmsPlusSnackbar()
fun showNightModeDialog()
fun showStartTimePicker(hour: Int, minute: Int)
fun showEndTimePicker(hour: Int, minute: Int)
fun showTextSizePicker()
fun showDelayDurationDialog()
fun showMmsSizePicker()
}
@@ -75,11 +75,15 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
disposables += prefs.black.asObservable()
.subscribe { black -> newState { it.copy(black = black) } }
disposables += prefs.notifications().asObservable()
.subscribe { enabled -> newState { it.copy(notificationsEnabled = enabled) } }
disposables += prefs.autoEmoji.asObservable()
.subscribe { enabled -> newState { it.copy(autoEmojiEnabled = enabled) } }
disposables += prefs.notifications().asObservable()
.subscribe { enabled -> newState { it.copy(notificationsEnabled = enabled) } }
val delayedSendingLabels = context.resources.getStringArray(R.array.delayed_sending_labels)
disposables += prefs.sendDelay.asObservable()
.subscribe { id -> newState { it.copy(sendDelaySummary = delayedSendingLabels[id], sendDelayId = id) } }
disposables += prefs.delivery.asObservable()
.subscribe { enabled -> newState { it.copy(deliveryEnabled = enabled) } }
@@ -140,6 +144,8 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
R.id.blocked -> navigator.showBlockedConversations()
R.id.delayed -> view.showDelayDurationDialog()
R.id.delivery -> prefs.delivery.set(!prefs.delivery.get())
R.id.textSize -> view.showTextSizePicker()
@@ -192,6 +198,17 @@ class SettingsViewModel : QkViewModel<SettingsView, SettingsState>(SettingsState
.autoDisposable(view.scope())
.subscribe { prefs.textSize.set(it) }
view.sendDelayChangedIntent
.withLatestFrom(billingManager.upgradeStatus, { duration, upgraded ->
if (!upgraded && duration != 0) {
view.showQksmsPlusSnackbar()
} else {
prefs.sendDelay.set(duration)
}
})
.autoDisposable(view.scope())
.subscribe()
view.mmsSizeSelectedIntent
.autoDisposable(view.scope())
.subscribe { prefs.mmsSize.set(it) }
@@ -64,6 +64,7 @@ import receiver.MmsSentReceiver
import receiver.MmsUpdatedReceiver
import receiver.NightModeReceiver
import receiver.RemoteMessagingReceiver
import receiver.SendSmsReceiver
import receiver.SmsDeliveredReceiver
import receiver.SmsProviderChangedReceiver
import receiver.SmsReceiver
@@ -103,6 +104,7 @@ interface AppComponent {
fun inject(receiver: MmsUpdatedReceiver)
fun inject(receiver: NightModeReceiver)
fun inject(receiver: RemoteMessagingReceiver)
fun inject(receiver: SendSmsReceiver)
fun inject(receiver: SmsProviderChangedReceiver)
fun inject(receiver: SmsReceiver)
fun inject(receiver: WidgetProvider)
@@ -0,0 +1,44 @@
/*
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
*
* This file is part of QKSMS.
*
* QKSMS is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* QKSMS is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
*/
package receiver
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
import injection.appComponent
import interactor.RetrySending
import repository.MessageRepository
import javax.inject.Inject
class SendSmsReceiver : BroadcastReceiver() {
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var retrySending: RetrySending
override fun onReceive(context: Context, intent: Intent) {
appComponent.inject(this)
val id = intent.getLongExtra("id", 0L)
messageRepo.getMessage(id)?.let { message ->
val result = goAsync()
retrySending.execute(message) { result.finish() }
}
}
}