mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 19:38:52 +01:00
Clean up Scheduling Code
Update documentation, remove deprecated and unused code, and clean up formatting.
This commit is contained in:
@@ -51,7 +51,9 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
|
||||
override val editScheduledMessage: Subject<Long> = PublishSubject.create()
|
||||
override val backPressedIntent: Subject<Unit> = PublishSubject.create()
|
||||
|
||||
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] }
|
||||
private val viewModel by lazy {
|
||||
ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java]
|
||||
}
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
AndroidInjection.inject(this)
|
||||
@@ -152,4 +154,4 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
|
||||
finish()
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
+4
-5
@@ -53,7 +53,8 @@ class ScheduledMessageAdapter @Inject constructor(
|
||||
val clicks: Subject<Long> = PublishSubject.create()
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
val view = LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_list_item, parent, false)
|
||||
val view = LayoutInflater.from(parent.context)
|
||||
.inflate(R.layout.scheduled_message_list_item, parent, false)
|
||||
|
||||
view.attachments.adapter = ScheduledMessageAttachmentAdapter(context)
|
||||
view.attachments.setRecycledViewPool(imagesViewPool)
|
||||
@@ -76,7 +77,8 @@ class ScheduledMessageAdapter @Inject constructor(
|
||||
val message = getItem(position) ?: return
|
||||
|
||||
// GroupAvatarView only accepts recipients, so map the phone numbers to recipients
|
||||
holder.avatars.recipients = message.recipients.map { address -> Recipient(address = address) }
|
||||
holder.avatars.recipients =
|
||||
message.recipients.map { address -> Recipient(address = address) }
|
||||
|
||||
holder.recipients.text = message.recipients.joinToString(",") { address ->
|
||||
contactCache[address]?.name?.takeIf { it.isNotBlank() } ?: address
|
||||
@@ -111,10 +113,7 @@ class ScheduledMessageAdapter @Inject constructor(
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
return super.get(key)?.takeIf { it.isValid }
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
-1
@@ -65,5 +65,4 @@ class ScheduledMessageAttachmentAdapter @Inject constructor(
|
||||
else -> holder.fileName.visibility = View.GONE
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -50,10 +50,12 @@ class ScheduledViewModel @Inject constructor(
|
||||
// show the delete message dialog if one or more messages selected
|
||||
view.optionsItemIntent
|
||||
.filter { it == R.id.delete }
|
||||
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages -> selectedMessages }
|
||||
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages ->
|
||||
selectedMessages }
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe {
|
||||
val ids = it.mapNotNull(scheduledMessageRepo::getScheduledMessage).map { it.id }
|
||||
val ids = it.mapNotNull(scheduledMessageRepo::getScheduledMessage)
|
||||
.map { it.id }
|
||||
view.showDeleteDialog(ids)
|
||||
}
|
||||
|
||||
@@ -61,7 +63,8 @@ class ScheduledViewModel @Inject constructor(
|
||||
// copy the selected message text to the clipboard
|
||||
view.optionsItemIntent
|
||||
.filter { it == R.id.copy }
|
||||
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages -> selectedMessages }
|
||||
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages ->
|
||||
selectedMessages }
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe {
|
||||
val messages = it
|
||||
@@ -82,14 +85,16 @@ class ScheduledViewModel @Inject constructor(
|
||||
// send the messages now menu item selected
|
||||
view.optionsItemIntent
|
||||
.filter { it == R.id.send_now }
|
||||
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages -> selectedMessages }
|
||||
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessages ->
|
||||
selectedMessages }
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { view.showSendNowDialog(it) }
|
||||
|
||||
// edit message menu item selected
|
||||
view.optionsItemIntent
|
||||
.filter { it == R.id.edit_message }
|
||||
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessage -> selectedMessage.first() }
|
||||
.withLatestFrom(view.messagesSelectedIntent) { _, selectedMessage ->
|
||||
selectedMessage.first() }
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { view.showEditMessageDialog(it) }
|
||||
|
||||
@@ -130,7 +135,7 @@ class ScheduledViewModel @Inject constructor(
|
||||
// navigate back or unselect
|
||||
view.optionsItemIntent
|
||||
.filter { it == android.R.id.home }
|
||||
.map { Unit }
|
||||
.map { }
|
||||
.mergeWith(view.backPressedIntent)
|
||||
.withLatestFrom(state) { _, state -> state }
|
||||
.autoDisposable(view.scope())
|
||||
|
||||
Reference in New Issue
Block a user