mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-18 03:48:52 +01:00
Tap conversation to show unblock dialog
This commit is contained in:
@@ -25,6 +25,7 @@ import com.moez.QKSMS.R
|
||||
import data.model.Contact
|
||||
import data.model.Conversation
|
||||
import data.model.PhoneNumber
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import kotlinx.android.synthetic.main.blocked_list_item.view.*
|
||||
import presentation.common.base.FlowableAdapter
|
||||
import presentation.common.base.QkViewHolder
|
||||
@@ -32,6 +33,8 @@ import javax.inject.Inject
|
||||
|
||||
class BlockedAdapter @Inject constructor(private val context: Context) : FlowableAdapter<Conversation>() {
|
||||
|
||||
val unblock = PublishSubject.create<Long>()
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder {
|
||||
return QkViewHolder(LayoutInflater.from(context).inflate(R.layout.blocked_list_item, parent, false))
|
||||
}
|
||||
@@ -40,6 +43,8 @@ class BlockedAdapter @Inject constructor(private val context: Context) : Flowabl
|
||||
val conversation = getItem(position)
|
||||
val view = holder.itemView
|
||||
|
||||
view.setOnClickListener { unblock.onNext(conversation.id) }
|
||||
|
||||
view.avatars.contacts = conversation.recipients.map { recipient ->
|
||||
recipient.contact ?: Contact().apply { numbers.add(PhoneNumber().apply { address = recipient.address }) }
|
||||
}
|
||||
|
||||
@@ -83,6 +83,8 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
|
||||
override val conversationLongClickIntent by lazy { conversationsAdapter.longClicks }
|
||||
override val conversationMenuItemIntent by lazy { menuItemAdapter.menuItemClicks }
|
||||
override val confirmDeleteIntent: Subject<Unit> = PublishSubject.create()
|
||||
override val unblockIntent by lazy { blockedAdapter.unblock }
|
||||
override val confirmUnblockIntent: Subject<Unit> = PublishSubject.create()
|
||||
override val swipeConversationIntent by lazy { itemTouchCallback.swipes }
|
||||
override val undoSwipeConversationIntent: Subject<Unit> = PublishSubject.create()
|
||||
|
||||
@@ -204,6 +206,7 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
|
||||
menuItemAdapter.data = state.page.menu
|
||||
empty.setText(R.string.inbox_empty_text)
|
||||
empty.setVisible(state.page.empty && !state.syncing)
|
||||
compose.setVisible(true)
|
||||
}
|
||||
|
||||
is Archived -> {
|
||||
@@ -214,6 +217,7 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
|
||||
menuItemAdapter.data = state.page.menu
|
||||
empty.setText(R.string.archived_empty_text)
|
||||
empty.setVisible(state.page.empty && !state.syncing)
|
||||
compose.setVisible(true)
|
||||
}
|
||||
|
||||
is Scheduled -> {
|
||||
@@ -223,6 +227,7 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
|
||||
menuItemAdapter.data = ArrayList()
|
||||
empty.setText(R.string.scheduled_empty_text)
|
||||
empty.setVisible(state.page.empty && !state.syncing)
|
||||
compose.setVisible(false)
|
||||
}
|
||||
|
||||
is Blocked -> {
|
||||
@@ -233,6 +238,7 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
|
||||
menuItemAdapter.data = ArrayList()
|
||||
empty.setText(R.string.blocked_empty_text)
|
||||
empty.setVisible(state.page.empty && !state.syncing)
|
||||
compose.setVisible(false)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -281,6 +287,15 @@ class MainActivity : QkThemedActivity<MainViewModel>(), MainView {
|
||||
.show()
|
||||
}
|
||||
|
||||
override fun showUnblockDialog() {
|
||||
AlertDialog.Builder(this)
|
||||
.setTitle(R.string.dialog_unblock_title)
|
||||
.setMessage(R.string.dialog_unblock_message)
|
||||
.setPositiveButton(R.string.button_unblock, { _, _ -> confirmUnblockIntent.onNext(Unit) })
|
||||
.setNegativeButton(R.string.button_cancel, null)
|
||||
.show()
|
||||
}
|
||||
|
||||
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
|
||||
menuInflater.inflate(R.menu.main, menu)
|
||||
return super.onCreateOptionsMenu(menu)
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
package presentation.feature.main
|
||||
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.Subject
|
||||
import presentation.common.base.QkView
|
||||
|
||||
interface MainView : QkView<MainState> {
|
||||
@@ -31,13 +30,16 @@ interface MainView : QkView<MainState> {
|
||||
val drawerItemIntent: Observable<DrawerItem>
|
||||
val conversationClickIntent: Observable<Long>
|
||||
val conversationLongClickIntent: Observable<Long>
|
||||
val conversationMenuItemIntent: Subject<Int>
|
||||
val confirmDeleteIntent: Subject<Unit>
|
||||
val conversationMenuItemIntent: Observable<Int>
|
||||
val confirmDeleteIntent: Observable<Unit>
|
||||
val unblockIntent: Observable<Long>
|
||||
val confirmUnblockIntent: Observable<Unit>
|
||||
val swipeConversationIntent: Observable<Int>
|
||||
val undoSwipeConversationIntent: Subject<Unit>
|
||||
val undoSwipeConversationIntent: Observable<Unit>
|
||||
|
||||
fun clearSearch()
|
||||
fun showDeleteDialog()
|
||||
fun showUnblockDialog()
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -52,6 +52,7 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
||||
@Inject lateinit var deleteConversation: DeleteConversation
|
||||
@Inject lateinit var markArchived: MarkArchived
|
||||
@Inject lateinit var markUnarchived: MarkUnarchived
|
||||
@Inject lateinit var markUnblocked: MarkUnblocked
|
||||
@Inject lateinit var partialSync: PartialSync
|
||||
|
||||
private val conversations by lazy {
|
||||
@@ -258,6 +259,17 @@ class MainViewModel : QkViewModel<MainView, MainState>(MainState()) {
|
||||
.withLatestFrom(swipedConversation, { _, threadId -> threadId })
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { threadId -> markUnarchived.execute(threadId) }
|
||||
|
||||
// Show confirm unblock conversation dialog
|
||||
view.unblockIntent
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { view.showUnblockDialog() }
|
||||
|
||||
// Unblock conversation
|
||||
view.confirmUnblockIntent
|
||||
.withLatestFrom(view.unblockIntent, { _, threadId -> threadId })
|
||||
.autoDisposable(view.scope())
|
||||
.subscribe { threadId -> markUnblocked.execute(threadId)}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user