Add option to delete scheduled message or send immediately

This commit is contained in:
Moez Bhatti
2018-06-27 16:57:27 -04:00
parent f175567cde
commit cf371ddf85
6 changed files with 64 additions and 15 deletions
@@ -4,6 +4,7 @@ import android.os.Bundle
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders
import com.moez.QKSMS.R
import com.moez.QKSMS.common.QkDialog
import com.moez.QKSMS.common.base.QkThemedActivity
import dagger.android.AndroidInjection
import kotlinx.android.synthetic.main.scheduled_activity.*
@@ -11,9 +12,13 @@ import javax.inject.Inject
class ScheduledActivity : QkThemedActivity(), ScheduledView {
@Inject lateinit var adapter: ScheduledMessageAdapter
@Inject lateinit var dialog: QkDialog
@Inject lateinit var messageAdapter: ScheduledMessageAdapter
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
override val messageClickIntent by lazy { messageAdapter.clicks }
override val messageMenuIntent by lazy { dialog.adapter.menuItemClicks }
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] }
override fun onCreate(savedInstanceState: Bundle?) {
@@ -24,12 +29,18 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
showBackButton(true)
viewModel.bindView(this)
adapter.emptyView = empty
messages.adapter = adapter
dialog.adapter.setData(R.array.scheduled_options)
messageAdapter.emptyView = empty
messages.adapter = messageAdapter
}
override fun render(state: ScheduledState) {
adapter.updateData(state.scheduledMessages)
messageAdapter.updateData(state.scheduledMessages)
}
override fun showMessageOptions() {
dialog.show(this)
}
}
@@ -7,25 +7,27 @@ import com.moez.QKSMS.R
import com.moez.QKSMS.common.base.QkRealmAdapter
import com.moez.QKSMS.common.base.QkViewHolder
import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.interactor.SendScheduledMessage
import com.moez.QKSMS.model.Contact
import com.moez.QKSMS.model.PhoneNumber
import com.moez.QKSMS.model.Recipient
import com.moez.QKSMS.model.ScheduledMessage
import com.moez.QKSMS.repository.ContactRepository
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import io.realm.RealmList
import kotlinx.android.synthetic.main.scheduled_message_list_item.view.*
import javax.inject.Inject
class ScheduledMessageAdapter @Inject constructor(
private val contactRepo: ContactRepository,
private val dateFormatter: DateFormatter,
private val sendScheduledMessage: SendScheduledMessage
private val dateFormatter: DateFormatter
) : QkRealmAdapter<ScheduledMessage>() {
private val contacts by lazy { contactRepo.getContacts() }
private val contactMap: HashMap<String, Contact> = hashMapOf()
val clicks: Subject<Long> = PublishSubject.create()
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
return QkViewHolder(LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_list_item, parent, false))
}
@@ -34,7 +36,7 @@ class ScheduledMessageAdapter @Inject constructor(
val message = getItem(position)!!
val view = holder.itemView
view.setOnClickListener { sendScheduledMessage.execute(message.id) }
view.setOnClickListener { clicks.onNext(message.id) }
message.recipients.forEach { address ->
if (!contactMap.containsKey(address)) {
@@ -1,7 +1,13 @@
package com.moez.QKSMS.feature.scheduled
import com.moez.QKSMS.common.base.QkView
import io.reactivex.Observable
interface ScheduledView : QkView<ScheduledState> {
val messageClickIntent: Observable<Long>
val messageMenuIntent: Observable<Int>
fun showMessageOptions()
}
@@ -1,13 +1,36 @@
package com.moez.QKSMS.feature.scheduled
import com.moez.QKSMS.common.androidxcompat.scope
import com.moez.QKSMS.common.base.QkViewModel
import com.moez.QKSMS.interactor.SendScheduledMessage
import com.moez.QKSMS.repository.ScheduledMessageRepository
import com.uber.autodispose.kotlin.autoDisposable
import io.reactivex.rxkotlin.withLatestFrom
import javax.inject.Inject
class ScheduledViewModel @Inject constructor(
scheduledMessageRepo: ScheduledMessageRepository
private val scheduledMessageRepo: ScheduledMessageRepository,
private val sendScheduledMessage: SendScheduledMessage
) : QkViewModel<ScheduledView, ScheduledState>(ScheduledState(
scheduledMessages = scheduledMessageRepo.getScheduledMessages()
)) {
override fun bindView(view: ScheduledView) {
super.bindView(view)
view.messageClickIntent
.autoDisposable(view.scope())
.subscribe { view.showMessageOptions() }
view.messageMenuIntent
.withLatestFrom(view.messageClickIntent) { itemId, messageId ->
when (itemId) {
0 -> sendScheduledMessage.execute(messageId)
1 -> scheduledMessageRepo.deleteScheduledMessage(messageId)
}
}
.autoDisposable(view.scope())
.subscribe()
}
}