Skip to content

Commit b652be2

Browse files
committed
Add logic to heading menu selection for unformatted text
1 parent 777d114 commit b652be2

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

aztec/src/main/kotlin/org/wordpress/aztec/toolbar/AztecToolbar.kt

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -360,21 +360,26 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
360360
}
361361

362362
private fun selectHeadingMenuItem(textFormats: ArrayList<TextFormat>) {
363-
textFormats.forEach {
364-
when (it) {
365-
TextFormat.FORMAT_HEADING_1 -> headingMenu?.menu?.getItem(1)?.isChecked = true
366-
TextFormat.FORMAT_HEADING_2 -> headingMenu?.menu?.getItem(2)?.isChecked = true
367-
TextFormat.FORMAT_HEADING_3 -> headingMenu?.menu?.getItem(3)?.isChecked = true
368-
TextFormat.FORMAT_HEADING_4 -> headingMenu?.menu?.getItem(4)?.isChecked = true
369-
TextFormat.FORMAT_HEADING_5 -> headingMenu?.menu?.getItem(5)?.isChecked = true
370-
TextFormat.FORMAT_HEADING_6 -> headingMenu?.menu?.getItem(6)?.isChecked = true
371-
else -> {
372-
// Select TextFormat.FORMAT_PARAGRAPH by default.
373-
headingMenu?.menu?.getItem(0)?.isChecked = true
363+
if (textFormats.size == 0) {
364+
// Select TextFormat.FORMAT_PARAGRAPH by default.
365+
headingMenu?.menu?.getItem(0)?.isChecked = true
366+
} else {
367+
textFormats.forEach {
368+
when (it) {
369+
TextFormat.FORMAT_HEADING_1 -> headingMenu?.menu?.getItem(1)?.isChecked = true
370+
TextFormat.FORMAT_HEADING_2 -> headingMenu?.menu?.getItem(2)?.isChecked = true
371+
TextFormat.FORMAT_HEADING_3 -> headingMenu?.menu?.getItem(3)?.isChecked = true
372+
TextFormat.FORMAT_HEADING_4 -> headingMenu?.menu?.getItem(4)?.isChecked = true
373+
TextFormat.FORMAT_HEADING_5 -> headingMenu?.menu?.getItem(5)?.isChecked = true
374+
TextFormat.FORMAT_HEADING_6 -> headingMenu?.menu?.getItem(6)?.isChecked = true
375+
else -> {
376+
// Select TextFormat.FORMAT_PARAGRAPH by default.
377+
headingMenu?.menu?.getItem(0)?.isChecked = true
378+
}
374379
}
375-
}
376380

377-
return
381+
return
382+
}
378383
}
379384
}
380385

0 commit comments

Comments
 (0)