Skip to content

Commit fd1bfd4

Browse files
KevinBoulongneKevinBoulongne
committed
Organize MenuDrawer Adapter's code
1 parent 4ba1b77 commit fd1bfd4

File tree

6 files changed

+79
-77
lines changed

6 files changed

+79
-77
lines changed

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

+59-56
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,23 @@ import com.infomaniak.mail.databinding.ItemMenuDrawerFolderBinding
3131
import com.infomaniak.mail.databinding.ItemMenuDrawerFooterBinding
3232
import com.infomaniak.mail.databinding.ItemMenuDrawerMailboxBinding
3333
import com.infomaniak.mail.databinding.ItemMenuDrawerMailboxesHeaderBinding
34-
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.MenuDrawerItemType.DIVIDER_ITEM_VIEW_HOLDER
35-
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.MenuDrawerItemType.EMPTY_FOLDERS_ITEM
36-
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.MenuDrawerItemType.FOLDERS_HEADER_ITEM
37-
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.MenuDrawerItemType.FOLDER_ITEM
38-
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.MenuDrawerItemType.FOOTER_ITEM
39-
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.MenuDrawerItemType.INVALID_MAILBOX_ITEM
40-
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.MenuDrawerItemType.MAILBOXES_HEADER_ITEM
41-
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.MenuDrawerItemType.MAILBOX_ITEM
34+
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.ItemType.DIVIDER_ITEM
35+
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.ItemType.EMPTY_CUSTOM_FOLDERS_ITEM
36+
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.ItemType.FOLDERS_HEADER_ITEM
4237
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.MenuDrawerViewHolder
38+
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.ViewType.DIVIDER_VIEW
39+
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.ViewType.EMPTY_FOLDERS_VIEW
40+
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.ViewType.FOLDERS_HEADER_VIEW
41+
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.ViewType.FOLDER_VIEW
42+
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.ViewType.FOOTER_VIEW
43+
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.ViewType.INVALID_MAILBOX_VIEW
44+
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.ViewType.MAILBOXES_HEADER_VIEW
45+
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.ViewType.MAILBOX_VIEW
4346
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerFragment.MediatorContainer
4447
import com.infomaniak.mail.ui.main.menuDrawer.items.DividerItemViewHolder
45-
import com.infomaniak.mail.ui.main.menuDrawer.items.EmptyFoldersItem
48+
import com.infomaniak.mail.ui.main.menuDrawer.items.EmptyFoldersViewHolder
4649
import com.infomaniak.mail.ui.main.menuDrawer.items.FolderViewHolder
47-
import com.infomaniak.mail.ui.main.menuDrawer.items.FoldersHeaderItem
50+
import com.infomaniak.mail.ui.main.menuDrawer.items.FoldersHeaderViewHolder
4851
import com.infomaniak.mail.ui.main.menuDrawer.items.FooterViewHolder
4952
import com.infomaniak.mail.ui.main.menuDrawer.items.FooterViewHolder.MenuDrawerFooter
5053
import com.infomaniak.mail.ui.main.menuDrawer.items.InvalidMailboxViewHolder
@@ -92,7 +95,7 @@ class MenuDrawerAdapter @Inject constructor() : ListAdapter<Any, MenuDrawerViewH
9295
if (areMailboxesExpanded) addAll(otherMailboxes)
9396

9497
// Default Folders
95-
add(ItemType.DIVIDER)
98+
add(DIVIDER_ITEM)
9699
while (count < allFolders.count() && (allFolders[count].role != null || !allFolders[count].isRoot)) {
97100
val defaultFolder = allFolders[count]
98101
if (defaultFolder.canBeCollapsed) temporaryHasCollapsableDefaultFolder = true
@@ -101,11 +104,11 @@ class MenuDrawerAdapter @Inject constructor() : ListAdapter<Any, MenuDrawerViewH
101104
}
102105

103106
// Custom Folders
104-
add(ItemType.DIVIDER)
105-
add(ItemType.CUSTOM_FOLDERS_HEADER)
107+
add(DIVIDER_ITEM)
108+
add(FOLDERS_HEADER_ITEM)
106109
if (areCustomFoldersExpanded) {
107110
if (count == allFolders.count()) {
108-
add(ItemType.EMPTY_CUSTOM_FOLDERS)
111+
add(EMPTY_CUSTOM_FOLDERS_ITEM)
109112
} else {
110113
while (count < allFolders.count()) {
111114
val customFolder = allFolders[count]
@@ -119,7 +122,7 @@ class MenuDrawerAdapter @Inject constructor() : ListAdapter<Any, MenuDrawerViewH
119122
hasCollapsableCustomFolder = temporaryHasCollapsableCustomFolder
120123

121124
// Footer
122-
add(ItemType.DIVIDER)
125+
add(DIVIDER_ITEM)
123126
add(MenuDrawerFooter(permissions, quotas))
124127
}
125128
}
@@ -136,7 +139,7 @@ class MenuDrawerAdapter @Inject constructor() : ListAdapter<Any, MenuDrawerViewH
136139
var newIsFound = false
137140
for (index in currentList.indices) {
138141

139-
if (getItemViewType(index) != FOLDER_ITEM.ordinal) continue
142+
if (getItemViewType(index) != FOLDER_VIEW.ordinal) continue
140143

141144
val itemId = (currentList[index] as Folder).id
142145
if (itemId == oldId) {
@@ -156,13 +159,13 @@ class MenuDrawerAdapter @Inject constructor() : ListAdapter<Any, MenuDrawerViewH
156159

157160
override fun getItemViewType(position: Int): Int = runCatchingRealm {
158161
return@runCatchingRealm when (val item = currentList[position]) {
159-
is MailboxesHeader -> MAILBOXES_HEADER_ITEM.ordinal
160-
is Mailbox -> if (item.isValid) MAILBOX_ITEM.ordinal else INVALID_MAILBOX_ITEM.ordinal
161-
is Folder -> FOLDER_ITEM.ordinal
162-
ItemType.CUSTOM_FOLDERS_HEADER -> FOLDERS_HEADER_ITEM.ordinal
163-
ItemType.EMPTY_CUSTOM_FOLDERS -> EMPTY_FOLDERS_ITEM.ordinal
164-
is MenuDrawerFooter -> FOOTER_ITEM.ordinal
165-
ItemType.DIVIDER -> DIVIDER_ITEM_VIEW_HOLDER.ordinal
162+
DIVIDER_ITEM -> DIVIDER_VIEW.ordinal
163+
is MailboxesHeader -> MAILBOXES_HEADER_VIEW.ordinal
164+
is Mailbox -> if (item.isValid) MAILBOX_VIEW.ordinal else INVALID_MAILBOX_VIEW.ordinal
165+
FOLDERS_HEADER_ITEM -> FOLDERS_HEADER_VIEW.ordinal
166+
is Folder -> FOLDER_VIEW.ordinal
167+
EMPTY_CUSTOM_FOLDERS_ITEM -> EMPTY_FOLDERS_VIEW.ordinal
168+
is MenuDrawerFooter -> FOOTER_VIEW.ordinal
166169
else -> error("Failed to find a viewType for MenuDrawer item")
167170
}
168171
}.getOrDefault(super.getItemViewType(position))
@@ -171,14 +174,14 @@ class MenuDrawerAdapter @Inject constructor() : ListAdapter<Any, MenuDrawerViewH
171174
val inflater = LayoutInflater.from(parent.context)
172175

173176
return when (viewType) {
174-
MAILBOXES_HEADER_ITEM.ordinal -> MailboxesHeaderViewHolder(inflater, parent)
175-
MAILBOX_ITEM.ordinal -> MailboxViewHolder(inflater, parent)
176-
INVALID_MAILBOX_ITEM.ordinal -> InvalidMailboxViewHolder(inflater, parent)
177-
FOLDER_ITEM.ordinal -> FolderViewHolder(inflater, parent)
178-
FOLDERS_HEADER_ITEM.ordinal -> FoldersHeaderItem(inflater, parent)
179-
EMPTY_FOLDERS_ITEM.ordinal -> EmptyFoldersItem(inflater, parent)
180-
FOOTER_ITEM.ordinal -> FooterViewHolder(inflater, parent)
181-
DIVIDER_ITEM_VIEW_HOLDER.ordinal -> DividerItemViewHolder(inflater, parent)
177+
DIVIDER_VIEW.ordinal -> DividerItemViewHolder(inflater, parent)
178+
MAILBOXES_HEADER_VIEW.ordinal -> MailboxesHeaderViewHolder(inflater, parent)
179+
MAILBOX_VIEW.ordinal -> MailboxViewHolder(inflater, parent)
180+
INVALID_MAILBOX_VIEW.ordinal -> InvalidMailboxViewHolder(inflater, parent)
181+
FOLDERS_HEADER_VIEW.ordinal -> FoldersHeaderViewHolder(inflater, parent)
182+
FOLDER_VIEW.ordinal -> FolderViewHolder(inflater, parent)
183+
EMPTY_FOLDERS_VIEW.ordinal -> EmptyFoldersViewHolder(inflater, parent)
184+
FOOTER_VIEW.ordinal -> FooterViewHolder(inflater, parent)
182185
else -> error("Failed to find a binding for MenuDrawer viewType")
183186
}
184187
}
@@ -214,6 +217,11 @@ class MenuDrawerAdapter @Inject constructor() : ListAdapter<Any, MenuDrawerViewH
214217
onLockedMailboxClicked = callbacks.onLockedMailboxClicked,
215218
onInvalidPasswordMailboxClicked = callbacks.onInvalidPasswordMailboxClicked,
216219
)
220+
is FoldersHeaderViewHolder -> holder.displayFoldersHeader(
221+
binding = this as ItemMenuDrawerCustomFoldersHeaderBinding,
222+
onFoldersHeaderClicked = callbacks.onFoldersHeaderClicked,
223+
onCreateFolderClicked = callbacks.onCreateFolderClicked,
224+
)
217225
is FolderViewHolder -> holder.displayFolder(
218226
folder = item as Folder,
219227
binding = this as ItemMenuDrawerFolderBinding,
@@ -222,11 +230,6 @@ class MenuDrawerAdapter @Inject constructor() : ListAdapter<Any, MenuDrawerViewH
222230
onFolderClicked = callbacks.onFolderClicked,
223231
onCollapseChildrenClicked = callbacks.onCollapseChildrenClicked,
224232
)
225-
is FoldersHeaderItem -> holder.displayCustomFoldersHeader(
226-
binding = this as ItemMenuDrawerCustomFoldersHeaderBinding,
227-
onCustomFoldersHeaderClicked = callbacks.onCustomFoldersHeaderClicked,
228-
onCreateFolderClicked = callbacks.onCreateFolderClicked,
229-
)
230233
is FooterViewHolder -> holder.displayFooter(
231234
footer = item as MenuDrawerFooter,
232235
binding = this as ItemMenuDrawerFooterBinding,
@@ -242,60 +245,60 @@ class MenuDrawerAdapter @Inject constructor() : ListAdapter<Any, MenuDrawerViewH
242245

243246
abstract class MenuDrawerViewHolder(val binding: ViewBinding) : ViewHolder(binding.root)
244247

248+
enum class ViewType {
249+
DIVIDER_VIEW,
250+
MAILBOXES_HEADER_VIEW,
251+
MAILBOX_VIEW,
252+
INVALID_MAILBOX_VIEW,
253+
FOLDERS_HEADER_VIEW,
254+
FOLDER_VIEW,
255+
EMPTY_FOLDERS_VIEW,
256+
FOOTER_VIEW,
257+
}
258+
245259
private enum class ItemType {
246-
CUSTOM_FOLDERS_HEADER,
247-
EMPTY_CUSTOM_FOLDERS,
248-
DIVIDER,
260+
DIVIDER_ITEM,
261+
FOLDERS_HEADER_ITEM,
262+
EMPTY_CUSTOM_FOLDERS_ITEM,
249263
}
250264

251265
private enum class NotifyType {
252266
MAILBOXES_HEADER_CLICKED,
253267
}
254268

255-
enum class MenuDrawerItemType {
256-
MAILBOXES_HEADER_ITEM,
257-
MAILBOX_ITEM,
258-
INVALID_MAILBOX_ITEM,
259-
FOLDER_ITEM,
260-
FOLDERS_HEADER_ITEM,
261-
EMPTY_FOLDERS_ITEM,
262-
FOOTER_ITEM,
263-
DIVIDER_ITEM_VIEW_HOLDER,
264-
}
265-
266269
private class FolderDiffCallback : DiffUtil.ItemCallback<Any>() {
267270

268271
override fun areItemsTheSame(oldItem: Any, newItem: Any) = runCatchingRealm {
269272
when (oldItem) {
273+
DIVIDER_ITEM -> newItem == DIVIDER_ITEM
270274
is MailboxesHeader -> newItem is MailboxesHeader && newItem.mailbox?.objectId == oldItem.mailbox?.objectId
271275
is Mailbox -> newItem is Mailbox && newItem.objectId == oldItem.objectId
276+
FOLDERS_HEADER_ITEM -> newItem == FOLDERS_HEADER_ITEM
272277
is Folder -> newItem is Folder && newItem.id == oldItem.id
273-
ItemType.CUSTOM_FOLDERS_HEADER -> newItem == ItemType.CUSTOM_FOLDERS_HEADER
274-
ItemType.EMPTY_CUSTOM_FOLDERS -> newItem == ItemType.EMPTY_CUSTOM_FOLDERS
278+
EMPTY_CUSTOM_FOLDERS_ITEM -> newItem == EMPTY_CUSTOM_FOLDERS_ITEM
275279
is MenuDrawerFooter -> newItem is MenuDrawerFooter
276-
ItemType.DIVIDER -> newItem == ItemType.DIVIDER
277280
else -> error("oldItem wasn't any known item type (in MenuDrawer `areItemsTheSame`)")
278281
}
279282
}.getOrDefault(false)
280283

281284
override fun areContentsTheSame(oldItem: Any, newItem: Any) = runCatchingRealm {
282285
when (oldItem) {
286+
DIVIDER_ITEM -> true
283287
is MailboxesHeader -> newItem is MailboxesHeader
284288
&& newItem.hasMoreThanOneMailbox == oldItem.hasMoreThanOneMailbox
285289
&& newItem.isExpanded == oldItem.isExpanded
286290
&& newItem.mailbox?.unreadCountDisplay?.count == oldItem.mailbox?.unreadCountDisplay?.count
287291
is Mailbox -> newItem is Mailbox && newItem.unreadCountDisplay.count == oldItem.unreadCountDisplay.count
292+
FOLDERS_HEADER_ITEM -> true
288293
is Folder -> newItem is Folder &&
289294
newItem.name == oldItem.name &&
290295
newItem.isFavorite == oldItem.isFavorite &&
291296
newItem.path == oldItem.path &&
292297
newItem.unreadCountDisplay == oldItem.unreadCountDisplay &&
293298
newItem.threads.count() == oldItem.threads.count() &&
294299
newItem.canBeCollapsed == oldItem.canBeCollapsed
295-
ItemType.CUSTOM_FOLDERS_HEADER -> true
296-
ItemType.EMPTY_CUSTOM_FOLDERS -> true
300+
EMPTY_CUSTOM_FOLDERS_ITEM -> true
297301
is MenuDrawerFooter -> newItem is MenuDrawerFooter && newItem.quotas?.size == oldItem.quotas?.size
298-
ItemType.DIVIDER -> false
299302
else -> error("oldItem wasn't any known item type (in MenuDrawer `areContentsTheSame`)")
300303
}
301304
}.getOrDefault(false)

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,15 @@ interface MenuDrawerAdapterCallbacks {
2424
var onMailboxesHeaderClicked: () -> Unit
2525

2626
var onValidMailboxClicked: (Int) -> Unit
27-
2827
var onLockedMailboxClicked: (String) -> Unit
2928
var onInvalidPasswordMailboxClicked: (Mailbox) -> Unit
3029

30+
var onFoldersHeaderClicked: (Boolean) -> Unit
31+
var onCreateFolderClicked: () -> Unit
32+
3133
var onFolderClicked: (folderId: String) -> Unit
3234
var onCollapseChildrenClicked: (folderId: String, shouldCollapse: Boolean) -> Unit
3335

34-
var onCustomFoldersHeaderClicked: (Boolean) -> Unit
35-
var onCreateFolderClicked: () -> Unit
36-
3736
var onSyncAutoConfigClicked: () -> Unit
3837
var onImportMailsClicked: () -> Unit
3938
var onRestoreMailsClicked: () -> Unit

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ class MenuDrawerFragment : Fragment() {
125125
override var onValidMailboxClicked: (Int) -> Unit = ::onValidMailboxClicked
126126
override var onLockedMailboxClicked: (String) -> Unit = ::onLockedMailboxClicked
127127
override var onInvalidPasswordMailboxClicked: (Mailbox) -> Unit = ::onInvalidPasswordMailboxClicked
128+
override var onFoldersHeaderClicked: (Boolean) -> Unit = ::onFoldersHeaderClicked
129+
override var onCreateFolderClicked: () -> Unit = ::onCreateFolderClicked
128130
override var onFolderClicked: (folderId: String) -> Unit = ::onFolderSelected
129131
override var onCollapseChildrenClicked: (folderId: String, shouldCollapse: Boolean) -> Unit = ::onFolderCollapsed
130-
override var onCustomFoldersHeaderClicked: (Boolean) -> Unit = ::onCustomFoldersHeaderClicked
131-
override var onCreateFolderClicked: () -> Unit = ::onCreateFolderClicked
132132
override var onSyncAutoConfigClicked: () -> Unit = ::onSyncAutoConfigClicked
133133
override var onImportMailsClicked: () -> Unit = ::onImportMailsClicked
134134
override var onRestoreMailsClicked: () -> Unit = ::onRestoreMailsClicked
@@ -178,7 +178,7 @@ class MenuDrawerFragment : Fragment() {
178178
)
179179
}
180180

181-
private fun onCustomFoldersHeaderClicked(isCollapsed: Boolean) {
181+
private fun onFoldersHeaderClicked(isCollapsed: Boolean) {
182182
trackMenuDrawerEvent("customFolders", !isCollapsed)
183183
menuDrawerViewModel.areCustomFoldersExpanded.value = !isCollapsed
184184
}

‎app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/items/EmptyFoldersItem.kt ‎app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/items/EmptyFoldersViewHolder.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import android.view.ViewGroup
2222
import com.infomaniak.mail.databinding.ItemMenuDrawerEmptyCustomFoldersBinding
2323
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.MenuDrawerViewHolder
2424

25-
class EmptyFoldersItem(
25+
class EmptyFoldersViewHolder(
2626
inflater: LayoutInflater,
2727
parent: ViewGroup,
2828
) : MenuDrawerViewHolder(ItemMenuDrawerEmptyCustomFoldersBinding.inflate(inflater, parent, false))

‎app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/items/FoldersHeaderItem.kt ‎app/src/main/java/com/infomaniak/mail/ui/main/menuDrawer/items/FoldersHeaderViewHolder.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ import com.infomaniak.lib.core.utils.SentryLog
2323
import com.infomaniak.mail.databinding.ItemMenuDrawerCustomFoldersHeaderBinding
2424
import com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerAdapter.MenuDrawerViewHolder
2525

26-
class FoldersHeaderItem(
26+
class FoldersHeaderViewHolder(
2727
inflater: LayoutInflater,
2828
parent: ViewGroup,
2929
) : MenuDrawerViewHolder(ItemMenuDrawerCustomFoldersHeaderBinding.inflate(inflater, parent, false)) {
3030

31-
fun displayCustomFoldersHeader(
31+
fun displayFoldersHeader(
3232
binding: ItemMenuDrawerCustomFoldersHeaderBinding,
33-
onCustomFoldersHeaderClicked: (Boolean) -> Unit,
33+
onFoldersHeaderClicked: (Boolean) -> Unit,
3434
onCreateFolderClicked: () -> Unit,
3535
) = with(binding.root) {
3636
SentryLog.d("Bind", "Bind Custom Folders header")
3737

38-
setOnClickListener { onCustomFoldersHeaderClicked(isCollapsed) }
38+
setOnClickListener { onFoldersHeaderClicked(isCollapsed) }
3939
setOnActionClickListener { onCreateFolderClicked() }
4040
}
4141
}

‎app/src/main/res/layout/item_menu_drawer_footer.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
android:layout_marginBottom="@dimen/marginStandardSmall"
2424
android:orientation="vertical">
2525

26-
<!-- advanced actions dropdown -->
26+
<!-- Advanced Actions dropdown -->
2727
<com.infomaniak.mail.ui.main.menuDrawer.MenuDrawerDropdownView
2828
android:id="@+id/advancedActions"
2929
android:layout_width="match_parent"
3030
android:layout_height="wrap_content"
3131
app:collapsedByDefault="true"
3232
app:title="@string/menuDrawerAdvancedActions" />
3333

34-
<!-- advanced actions -->
34+
<!-- Advanced Actions -->
3535
<LinearLayout
3636
android:id="@+id/advancedActionsLayout"
3737
android:layout_width="match_parent"
@@ -64,36 +64,36 @@
6464

6565
</LinearLayout>
6666

67-
<!-- divider -->
67+
<!-- Divider -->
6868
<com.google.android.material.divider.MaterialDivider
6969
style="@style/MenuDrawerDivider"
7070
android:layout_width="match_parent"
7171
android:layout_height="wrap_content" />
7272

73-
<!-- feedback -->
73+
<!-- Feedback -->
7474
<com.infomaniak.mail.views.itemViews.SimpleMenuDrawerItemView
7575
android:id="@+id/feedback"
7676
android:layout_width="match_parent"
7777
android:layout_height="wrap_content"
7878
app:icon="@drawable/ic_feedback"
7979
app:text="@string/buttonFeedback" />
8080

81-
<!-- help -->
81+
<!-- Help -->
8282
<com.infomaniak.mail.views.itemViews.SimpleMenuDrawerItemView
8383
android:id="@+id/help"
8484
android:layout_width="match_parent"
8585
android:layout_height="wrap_content"
8686
app:icon="@drawable/ic_help"
8787
app:text="@string/buttonHelp" />
8888

89-
<!-- divider -->
89+
<!-- Divider -->
9090
<com.google.android.material.divider.MaterialDivider
9191
android:id="@+id/storageDivider"
9292
style="@style/MenuDrawerDivider"
9393
android:layout_width="match_parent"
9494
android:layout_height="wrap_content" />
9595

96-
<!-- quotas -->
96+
<!-- Quotas -->
9797
<androidx.constraintlayout.widget.ConstraintLayout
9898
android:id="@+id/storageLayout"
9999
android:layout_width="match_parent"
@@ -138,13 +138,13 @@
138138

139139
</androidx.constraintlayout.widget.ConstraintLayout>
140140

141-
<!-- divider -->
141+
<!-- Divider -->
142142
<com.google.android.material.divider.MaterialDivider
143143
style="@style/MenuDrawerDivider"
144144
android:layout_width="match_parent"
145145
android:layout_height="wrap_content" />
146146

147-
<!-- app version -->
147+
<!-- App version -->
148148
<com.google.android.material.button.MaterialButton
149149
android:id="@+id/appVersionName"
150150
style="@style/TextButton"

0 commit comments

Comments
 (0)