Rename layouts to match MenuDrawer layouts name format

Author: KevinBoulongne

app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/MailboxesAdapter.kt

@@ -29,7 +29,7 @@ import com.infomaniak.mail.MatomoMail.trackMenuDrawerEvent
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.models.mailbox.Mailbox
 import com.infomaniak.mail.databinding.ItemInvalidMailboxBinding
-import com.infomaniak.mail.databinding.ItemMailboxMenuDrawerBinding
+import com.infomaniak.mail.databinding.ItemMenuDrawerMailboxBinding
 import com.infomaniak.mail.databinding.ItemSelectableMailboxBinding
 import com.infomaniak.mail.ui.main.menuDrawer.MailboxesAdapter.MailboxesViewHolder
 import com.infomaniak.mail.utils.AccountUtils
@@ -50,7 +50,7 @@ class MailboxesAdapter(
         val layoutInflater = LayoutInflater.from(parent.context)
         val binding = when (viewType) {
             DisplayType.SIMPLE_MAILBOX.layout -> ItemSelectableMailboxBinding.inflate(layoutInflater, parent, false)
-            DisplayType.MENU_DRAWER_MAILBOX.layout -> ItemMailboxMenuDrawerBinding.inflate(layoutInflater, parent, false)
+            DisplayType.MENU_DRAWER_MAILBOX.layout -> ItemMenuDrawerMailboxBinding.inflate(layoutInflater, parent, false)
             else -> ItemInvalidMailboxBinding.inflate(layoutInflater, parent, false)
         }
 
@@ -67,7 +67,7 @@ class MailboxesAdapter(
                     (this as ItemSelectableMailboxBinding).displaySimpleMailbox(mailbox, isCurrentMailbox)
                 }
                 DisplayType.MENU_DRAWER_MAILBOX.layout -> {
-                    (this as ItemMailboxMenuDrawerBinding).displayMenuDrawerMailbox(mailbox, isCurrentMailbox)
+                    (this as ItemMenuDrawerMailboxBinding).displayMenuDrawerMailbox(mailbox, isCurrentMailbox)
                 }
                 DisplayType.INVALID_MAILBOX.layout -> (this as ItemInvalidMailboxBinding).displayInvalidMailbox(mailbox)
             }
@@ -94,7 +94,7 @@ class MailboxesAdapter(
         setSelectedState(isCurrentMailbox)
     }
 
-    private fun ItemMailboxMenuDrawerBinding.displayMenuDrawerMailbox(mailbox: Mailbox, isCurrentMailbox: Boolean) = with(root) {
+    private fun ItemMenuDrawerMailboxBinding.displayMenuDrawerMailbox(mailbox: Mailbox, isCurrentMailbox: Boolean) = with(root) {
         displayValidMailbox(mailbox, isCurrentMailbox) { context.trackMenuDrawerEvent(SWITCH_MAILBOX_NAME) }
 
         unreadCount = mailbox.unreadCountDisplay.count
@@ -141,7 +141,7 @@ class MailboxesAdapter(
 
     private enum class DisplayType(val layout: Int) {
         INVALID_MAILBOX(R.layout.item_invalid_mailbox),
-        MENU_DRAWER_MAILBOX(R.layout.item_mailbox_menu_drawer),
+        MENU_DRAWER_MAILBOX(R.layout.item_menu_drawer_mailbox),
         SIMPLE_MAILBOX(R.layout.item_selectable_mailbox),
     }
 

app/src/main/java/com/infomaniak/mail/ui/main/move/FolderAdapter.kt

@@ -30,7 +30,7 @@ import com.infomaniak.mail.MatomoMail.trackMenuDrawerEvent
 import com.infomaniak.mail.R
 import com.infomaniak.mail.data.models.Folder
 import com.infomaniak.mail.data.models.Folder.FolderRole
-import com.infomaniak.mail.databinding.ItemFolderMenuDrawerBinding
+import com.infomaniak.mail.databinding.ItemMenuDrawerFolderBinding
 import com.infomaniak.mail.databinding.ItemSelectableFolderBinding
 import com.infomaniak.mail.ui.main.move.FolderAdapter.FolderViewHolder
 import com.infomaniak.mail.utils.UiUtils
@@ -79,7 +79,7 @@ class FolderAdapter @Inject constructor(
         val binding = if (viewType == DisplayType.SELECTABLE_FOLDER.layout) {
             ItemSelectableFolderBinding.inflate(layoutInflater, parent, false)
         } else {
-            ItemFolderMenuDrawerBinding.inflate(layoutInflater, parent, false)
+            ItemMenuDrawerFolderBinding.inflate(layoutInflater, parent, false)
         }
 
         return FolderViewHolder(binding)
@@ -101,7 +101,7 @@ class FolderAdapter @Inject constructor(
 
         when (getItemViewType(position)) {
             DisplayType.SELECTABLE_FOLDER.layout -> (this as ItemSelectableFolderBinding).root.displayFolder(folder)
-            DisplayType.MENU_DRAWER.layout -> (this as ItemFolderMenuDrawerBinding).root.displayMenuDrawerFolder(folder)
+            DisplayType.MENU_DRAWER.layout -> (this as ItemMenuDrawerFolderBinding).root.displayMenuDrawerFolder(folder)
         }
     }
 
@@ -231,7 +231,7 @@ class FolderAdapter @Inject constructor(
 
     private enum class DisplayType(val layout: Int) {
         SELECTABLE_FOLDER(R.layout.item_selectable_folder),
-        MENU_DRAWER(R.layout.item_folder_menu_drawer),
+        MENU_DRAWER(R.layout.item_menu_drawer_folder),
     }
 
     companion object {

app/src/main/res/layout/fragment_menu_drawer.xml

@@ -131,7 +131,7 @@
                 android:visibility="gone"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:itemCount="3"
-                tools:listitem="@layout/item_mailbox_menu_drawer"
+                tools:listitem="@layout/item_menu_drawer_mailbox"
                 tools:visibility="visible" />
 
             <com.google.android.material.divider.MaterialDivider
@@ -147,7 +147,7 @@
                 android:overScrollMode="never"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:itemCount="5"
-                tools:listitem="@layout/item_folder_menu_drawer" />
+                tools:listitem="@layout/item_menu_drawer_folder" />
 
             <com.google.android.material.divider.MaterialDivider
                 style="@style/MenuDrawerDivider"
@@ -175,7 +175,7 @@
                     android:overScrollMode="never"
                     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                     tools:itemCount="2"
-                    tools:listitem="@layout/item_folder_menu_drawer" />
+                    tools:listitem="@layout/item_menu_drawer_folder" />
 
                 <TextView
                     android:id="@+id/noFolderText"

app/src/main/res/layout/fragment_move.xml

@@ -102,7 +102,7 @@
                 android:scrollbars="none"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:itemCount="6"
-                tools:listitem="@layout/item_folder_menu_drawer" />
+                tools:listitem="@layout/item_menu_drawer_folder" />
         </LinearLayout>
     </com.google.android.material.card.MaterialCardView>
 </LinearLayout>