forked from upstream-mirrors/quik
Add block/archive notification actions, and block swipe action
Closes #1575, closes #943
This commit is contained in:
+2
-1
@@ -147,8 +147,9 @@ class ConversationItemTouchCallback @Inject constructor(
|
||||
|
||||
private fun iconForAction(action: Int, tint: Int): Bitmap? {
|
||||
val res = when (action) {
|
||||
Preferences.SWIPE_ACTION_ARCHIVE -> R.drawable.ic_archive_black_24dp
|
||||
Preferences.SWIPE_ACTION_ARCHIVE -> R.drawable.ic_archive_white_24dp
|
||||
Preferences.SWIPE_ACTION_DELETE -> R.drawable.ic_delete_white_24dp
|
||||
Preferences.SWIPE_ACTION_BLOCK -> R.drawable.ic_block_white_24dp
|
||||
Preferences.SWIPE_ACTION_CALL -> R.drawable.ic_call_white_24dp
|
||||
Preferences.SWIPE_ACTION_READ -> R.drawable.ic_check_white_24dp
|
||||
Preferences.SWIPE_ACTION_UNREAD -> R.drawable.ic_markunread_black_24dp
|
||||
|
||||
@@ -423,6 +423,7 @@ class MainViewModel @Inject constructor(
|
||||
when (action) {
|
||||
Preferences.SWIPE_ACTION_ARCHIVE -> markArchived.execute(listOf(threadId)) { view.showArchivedSnackbar() }
|
||||
Preferences.SWIPE_ACTION_DELETE -> view.showDeleteDialog(listOf(threadId))
|
||||
Preferences.SWIPE_ACTION_BLOCK -> view.showBlockingDialog(listOf(threadId), true)
|
||||
Preferences.SWIPE_ACTION_CALL -> conversationRepo.getConversation(threadId)?.recipients?.firstOrNull()?.address?.let(navigator::makePhoneCall)
|
||||
Preferences.SWIPE_ACTION_READ -> markRead.execute(listOf(threadId))
|
||||
Preferences.SWIPE_ACTION_UNREAD -> markUnread.execute(listOf(threadId))
|
||||
|
||||
+2
-1
@@ -70,8 +70,9 @@ class SwipeActionsPresenter @Inject constructor(
|
||||
|
||||
@DrawableRes
|
||||
private fun iconForAction(action: Int) = when (action) {
|
||||
Preferences.SWIPE_ACTION_ARCHIVE -> R.drawable.ic_archive_black_24dp
|
||||
Preferences.SWIPE_ACTION_ARCHIVE -> R.drawable.ic_archive_white_24dp
|
||||
Preferences.SWIPE_ACTION_DELETE -> R.drawable.ic_delete_white_24dp
|
||||
Preferences.SWIPE_ACTION_BLOCK -> R.drawable.ic_block_white_24dp
|
||||
Preferences.SWIPE_ACTION_CALL -> R.drawable.ic_call_white_24dp
|
||||
Preferences.SWIPE_ACTION_READ -> R.drawable.ic_check_white_24dp
|
||||
Preferences.SWIPE_ACTION_UNREAD -> R.drawable.ic_markunread_black_24dp
|
||||
|
||||
+2
-2
@@ -22,9 +22,9 @@ import androidx.annotation.DrawableRes
|
||||
import com.moez.QKSMS.R
|
||||
|
||||
data class SwipeActionsState(
|
||||
@DrawableRes val rightIcon: Int = R.drawable.ic_archive_black_24dp,
|
||||
@DrawableRes val rightIcon: Int = R.drawable.ic_archive_white_24dp,
|
||||
val rightLabel: String = "",
|
||||
|
||||
@DrawableRes val leftIcon: Int = R.drawable.ic_archive_black_24dp,
|
||||
@DrawableRes val leftIcon: Int = R.drawable.ic_archive_white_24dp,
|
||||
val leftLabel: String = ""
|
||||
)
|
||||
Reference in New Issue
Block a user