From 88207982fb10e7cfdbbd3e868fdb047760cf647b Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Thu, 4 Jul 2024 10:12:06 +0200 Subject: [PATCH] Remove unused COLLAPSABLE_FOLDER_EXISTENCE_HAS_CHANGED payload --- .../ui/main/menuDrawer/MenuDrawerAdapter.kt | 17 ++++---------- .../ui/main/menuDrawer/items/FolderItem.kt | 23 ------------------- 2 files changed, 4 insertions(+), 36 deletions(-) diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/MenuDrawerAdapter.kt b/app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/MenuDrawerAdapter.kt index d32323440e..430dffc20a 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/MenuDrawerAdapter.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/MenuDrawerAdapter.kt @@ -215,21 +215,13 @@ class MenuDrawerAdapter @Inject constructor() : ListAdapter) { - when (payloads.firstOrNull()) { - NotifyType.MAILBOXES_HEADER_CLICKED -> MailboxesHeaderItem.displayWithPayload( + if (payloads.firstOrNull() == NotifyType.MAILBOXES_HEADER_CLICKED) { + MailboxesHeaderItem.displayWithPayload( item = items[position], binding = holder.binding, ) - NotifyType.COLLAPSABLE_FOLDER_EXISTENCE_HAS_CHANGED -> FolderItem.displayWithPayload( - item = items[position], - binding = holder.binding, - currentFolderId = currentFolderId, - hasCollapsableDefaultFolder = hasCollapsableDefaultFolder, - hasCollapsableCustomFolder = hasCollapsableCustomFolder, - onFolderClicked = onFolderClicked, - onCollapseChildrenClicked = onCollapseChildrenClicked, - ) - else -> super.onBindViewHolder(holder, position, payloads) + } else { + super.onBindViewHolder(holder, position, payloads) } } @@ -290,7 +282,6 @@ class MenuDrawerAdapter @Inject constructor() : ListAdapter() { diff --git a/app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/items/FolderItem.kt b/app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/items/FolderItem.kt index 13a422e0f9..716684bdc7 100644 --- a/app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/items/FolderItem.kt +++ b/app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/items/FolderItem.kt @@ -63,29 +63,6 @@ object FolderItem { ) } - fun displayWithPayload( - item: Any, - binding: ViewBinding, - currentFolderId: String?, - hasCollapsableDefaultFolder: Boolean, - hasCollapsableCustomFolder: Boolean, - onFolderClicked: (folderId: String) -> Unit, - onCollapseChildrenClicked: (folderId: String, shouldCollapse: Boolean) -> Unit, - ) { - item as Folder - binding as ItemMenuDrawerFolderBinding - - Log.d("Bind", "Bind Custom folders because of collapse change = ${item.name}") - binding.displayFolder( - item, - currentFolderId, - hasCollapsableDefaultFolder, - hasCollapsableCustomFolder, - onFolderClicked, - onCollapseChildrenClicked, - ) - } - private fun ItemMenuDrawerFolderBinding.displayFolder( folder: Folder, currentFolderId: String?,