Skip to content

Commit f14cca7

Browse files
committed
Renamed method and added a comment to make it's intent clearer.
1 parent 43ef6fb commit f14cca7

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import org.wordpress.aztec.R
3232
import org.wordpress.aztec.plugins.IMediaToolbarButton
3333
import org.wordpress.aztec.plugins.IToolbarButton
3434
import org.wordpress.aztec.source.SourceViewEditText
35-
import org.wordpress.aztec.util.convertToButtonStateForAccessibility
35+
import org.wordpress.aztec.util.convertToButtonAccessibilityProperties
3636
import java.util.Arrays
3737
import java.util.ArrayList
3838
import java.util.Locale
@@ -445,7 +445,7 @@ class AztecToolbar : FrameLayout, IAztecToolbar, OnMenuItemClickListener {
445445
val button = findViewById<ToggleButton>(buttonPlugin.action.buttonId)
446446

447447
if (buttonPlugin is IMediaToolbarButton) {
448-
button.convertToButtonStateForAccessibility()
448+
button.convertToButtonAccessibilityProperties()
449449
}
450450
}
451451

@@ -460,7 +460,7 @@ class AztecToolbar : FrameLayout, IAztecToolbar, OnMenuItemClickListener {
460460

461461
ToolbarAction.values().forEach { action ->
462462
if (targetActions.contains(action)) {
463-
findViewById<ToggleButton>(action.buttonId).convertToButtonStateForAccessibility()
463+
findViewById<ToggleButton>(action.buttonId).convertToButtonAccessibilityProperties()
464464
}
465465
}
466466
}

aztec/src/main/kotlin/org/wordpress/aztec/util/Extensions.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,11 @@ fun ClipData.Item.coerceToHtmlText(parser: AztecParser): String {
6565
return text.toString()
6666
}
6767

68-
fun ToggleButton.convertToButtonStateForAccessibility() {
68+
/**
69+
* Some of the toggle button controls that exist on the Aztec formatting toolbar act as buttons but are
70+
* announced as switches so this function converts the accessibility properties to that of a button.
71+
*/
72+
fun ToggleButton.convertToButtonAccessibilityProperties() {
6973
ViewCompat.setAccessibilityDelegate(this, object : AccessibilityDelegateCompat() {
7074
override fun onInitializeAccessibilityNodeInfo(host: View?, info: AccessibilityNodeInfoCompat?) {
7175
super.onInitializeAccessibilityNodeInfo(host, info)

0 commit comments

Comments
 (0)