Rename toolbar click listener methods for consistency

Author: theck13

app/src/main/kotlin/org/wordpress/aztec/demo/MainActivity.kt

@@ -665,10 +665,7 @@ class MainActivity : AppCompatActivity(),
     override fun onToolbarHeadingButtonClicked() {
     }
 
-    override fun onToolbarListButtonClicked() {
-    }
-
-    override fun onToolbarHtmlModeClicked() {
+    override fun onToolbarHtmlButtonClicked() {
         val uploadingPredicate = object : AztecText.AttributePredicate {
             override fun matches(attrs: Attributes): Boolean {
                 return attrs.getIndex("uploading") > -1
@@ -684,7 +681,10 @@ class MainActivity : AppCompatActivity(),
         }
     }
 
-    override fun onToolbarAddMediaClicked() {
+    override fun onToolbarListButtonClicked() {
+    }
+
+    override fun onToolbarMediaButtonClicked() {
         mediaMenu = PopupMenu(this, formattingToolbar)
         mediaMenu?.setOnMenuItemClickListener(this)
         mediaMenu?.inflate(R.menu.media)

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

@@ -149,7 +149,7 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
             }
             KeyEvent.KEYCODE_M -> {
                 if (event.isAltPressed && event.isCtrlPressed) { // Media = Alt + Ctrl + M
-                    aztecToolbarListener?.onToolbarAddMediaClicked()
+                    aztecToolbarListener?.onToolbarMediaButtonClicked()
                     findViewById(ToolbarAction.ADD_MEDIA.buttonId).performClick()
                     return true
                 }
@@ -424,7 +424,7 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
         //other toolbar action
         when (action) {
             ToolbarAction.ADD_MEDIA -> {
-                aztecToolbarListener?.onToolbarAddMediaClicked()
+                aztecToolbarListener?.onToolbarMediaButtonClicked()
             }
             ToolbarAction.HEADING -> {
                 aztecToolbarListener?.onToolbarHeadingButtonClicked()
@@ -439,7 +439,7 @@ class AztecToolbar : FrameLayout, OnMenuItemClickListener {
                 editor!!.showLinkDialog()
             }
             ToolbarAction.HTML -> {
-                aztecToolbarListener?.onToolbarHtmlModeClicked()
+                aztecToolbarListener?.onToolbarHtmlButtonClicked()
             }
             ToolbarAction.ELLIPSIS_COLLAPSE -> {
                 aztecToolbarListener?.onToolbarExpandButtonClicked()

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

@@ -3,11 +3,11 @@ package org.wordpress.aztec.toolbar
 import org.wordpress.aztec.TextFormat
 
 interface AztecToolbarClickListener {
-    fun onToolbarAddMediaClicked()
-    fun onToolbarHtmlModeClicked()
     fun onToolbarCollapseButtonClicked()
     fun onToolbarExpandButtonClicked()
     fun onToolbarFormatButtonClicked(format: TextFormat, isKeyboardShortcut: Boolean)
     fun onToolbarHeadingButtonClicked()
+    fun onToolbarHtmlButtonClicked()
     fun onToolbarListButtonClicked()
+    fun onToolbarMediaButtonClicked()
 }