Skip to content

Commit d5a4838

Browse files
theck13theck13
committed
Replace integer literals with id when getting menu items
1 parent c2db7b3 commit d5a4838

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -403,44 +403,44 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
403403
}
404404

405405
fun getSelectedHeadingMenuItem(): TextFormat? {
406-
if (headingMenu?.menu?.getItem(0)?.isChecked!!) return TextFormat.FORMAT_PARAGRAPH
407-
else if (headingMenu?.menu?.getItem(1)?.isChecked!!) return TextFormat.FORMAT_HEADING_1
408-
else if (headingMenu?.menu?.getItem(2)?.isChecked!!) return TextFormat.FORMAT_HEADING_2
409-
else if (headingMenu?.menu?.getItem(3)?.isChecked!!) return TextFormat.FORMAT_HEADING_3
410-
else if (headingMenu?.menu?.getItem(4)?.isChecked!!) return TextFormat.FORMAT_HEADING_4
411-
else if (headingMenu?.menu?.getItem(5)?.isChecked!!) return TextFormat.FORMAT_HEADING_5
412-
else if (headingMenu?.menu?.getItem(6)?.isChecked!!) return TextFormat.FORMAT_HEADING_6
406+
if (headingMenu?.menu?.findItem(R.id.paragraph)?.isChecked!!) return TextFormat.FORMAT_PARAGRAPH
407+
else if (headingMenu?.menu?.findItem(R.id.heading_1)?.isChecked!!) return TextFormat.FORMAT_HEADING_1
408+
else if (headingMenu?.menu?.findItem(R.id.heading_2)?.isChecked!!) return TextFormat.FORMAT_HEADING_2
409+
else if (headingMenu?.menu?.findItem(R.id.heading_3)?.isChecked!!) return TextFormat.FORMAT_HEADING_3
410+
else if (headingMenu?.menu?.findItem(R.id.heading_4)?.isChecked!!) return TextFormat.FORMAT_HEADING_4
411+
else if (headingMenu?.menu?.findItem(R.id.heading_5)?.isChecked!!) return TextFormat.FORMAT_HEADING_5
412+
else if (headingMenu?.menu?.findItem(R.id.heading_6)?.isChecked!!) return TextFormat.FORMAT_HEADING_6
413413
// TODO: Uncomment when Preformat is to be added back as a feature
414-
// else if (headingMenu?.menu?.getItem(7)?.isChecked!!) return TextFormat.FORMAT_PREFORMAT
414+
// else if (headingMenu?.menu?.findItem(R.id.preformat)?.isChecked!!) return TextFormat.FORMAT_PREFORMAT
415415
return null
416416
}
417417

418418
fun getSelectedListMenuItem(): TextFormat? {
419-
if (listMenu?.menu?.getItem(0)?.isChecked!!) return TextFormat.FORMAT_UNORDERED_LIST
420-
else if (listMenu?.menu?.getItem(1)?.isChecked!!) return TextFormat.FORMAT_ORDERED_LIST
419+
if (listMenu?.menu?.findItem(R.id.list_unordered)?.isChecked!!) return TextFormat.FORMAT_UNORDERED_LIST
420+
else if (listMenu?.menu?.findItem(R.id.list_ordered)?.isChecked!!) return TextFormat.FORMAT_ORDERED_LIST
421421
return null
422422
}
423423

424424
private fun selectHeadingMenuItem(textFormats: ArrayList<TextFormat>) {
425425
if (textFormats.size == 0) {
426426
// Select paragraph by default.
427-
headingMenu?.menu?.getItem(0)?.isChecked = true
427+
headingMenu?.menu?.findItem(R.id.paragraph)?.isChecked = true
428428
// Use unnumbered heading selector by default.
429429
setHeadingMenuSelector(TextFormat.FORMAT_PARAGRAPH)
430430
} else {
431431
textFormats.forEach {
432432
when (it) {
433-
TextFormat.FORMAT_HEADING_1 -> headingMenu?.menu?.getItem(1)?.isChecked = true
434-
TextFormat.FORMAT_HEADING_2 -> headingMenu?.menu?.getItem(2)?.isChecked = true
435-
TextFormat.FORMAT_HEADING_3 -> headingMenu?.menu?.getItem(3)?.isChecked = true
436-
TextFormat.FORMAT_HEADING_4 -> headingMenu?.menu?.getItem(4)?.isChecked = true
437-
TextFormat.FORMAT_HEADING_5 -> headingMenu?.menu?.getItem(5)?.isChecked = true
438-
TextFormat.FORMAT_HEADING_6 -> headingMenu?.menu?.getItem(6)?.isChecked = true
433+
TextFormat.FORMAT_HEADING_1 -> headingMenu?.menu?.findItem(R.id.heading_1)?.isChecked = true
434+
TextFormat.FORMAT_HEADING_2 -> headingMenu?.menu?.findItem(R.id.heading_2)?.isChecked = true
435+
TextFormat.FORMAT_HEADING_3 -> headingMenu?.menu?.findItem(R.id.heading_3)?.isChecked = true
436+
TextFormat.FORMAT_HEADING_4 -> headingMenu?.menu?.findItem(R.id.heading_4)?.isChecked = true
437+
TextFormat.FORMAT_HEADING_5 -> headingMenu?.menu?.findItem(R.id.heading_5)?.isChecked = true
438+
TextFormat.FORMAT_HEADING_6 -> headingMenu?.menu?.findItem(R.id.heading_6)?.isChecked = true
439439
// TODO: Uncomment when Preformat is to be added back as a feature
440-
// TextFormat.FORMAT_PREFORMAT -> headingMenu?.menu?.getItem(7)?.isChecked = true
440+
// TextFormat.FORMAT_PREFORMAT -> headingMenu?.menu?.findItem(R.id.preformat)?.isChecked = true
441441
else -> {
442442
// Select paragraph by default.
443-
headingMenu?.menu?.getItem(0)?.isChecked = true
443+
headingMenu?.menu?.findItem(R.id.paragraph)?.isChecked = true
444444
}
445445
}
446446

@@ -454,17 +454,17 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
454454
private fun selectListMenuItem(textFormats: ArrayList<TextFormat>) {
455455
if (textFormats.size == 0) {
456456
// Select no list by default.
457-
listMenu?.menu?.getItem(2)?.isChecked = true
457+
listMenu?.menu?.findItem(R.id.list_none)?.isChecked = true
458458
// Use unordered list selector by default.
459459
setListMenuSelector(TextFormat.FORMAT_UNORDERED_LIST)
460460
} else {
461461
textFormats.forEach {
462462
when (it) {
463-
TextFormat.FORMAT_UNORDERED_LIST -> listMenu?.menu?.getItem(0)?.isChecked = true
464-
TextFormat.FORMAT_ORDERED_LIST -> listMenu?.menu?.getItem(1)?.isChecked = true
463+
TextFormat.FORMAT_UNORDERED_LIST -> listMenu?.menu?.findItem(R.id.list_unordered)?.isChecked = true
464+
TextFormat.FORMAT_ORDERED_LIST -> listMenu?.menu?.findItem(R.id.list_ordered)?.isChecked = true
465465
else -> {
466466
// Select no list by default.
467-
listMenu?.menu?.getItem(2)?.isChecked = true
467+
listMenu?.menu?.findItem(R.id.list_none)?.isChecked = true
468468
}
469469
}
470470

0 commit comments

Comments
 (0)