Skip to content

Commit 56892fd

Browse files
ParaskP7ParaskP7
committed
Analysis: Resolve parameter supertype naming type warnings
Warning Message: "The corresponding parameter in the supertype 'IAztecToolbar' is named 'keyEvent'. This may cause problems when calling this function with named arguments."
1 parent 96c9668 commit 56892fd

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -110,100 +110,100 @@ class AztecToolbar : FrameLayout, IAztecToolbar, OnMenuItemClickListener {
110110
aztecToolbarListener = listener
111111
}
112112

113-
override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
113+
override fun onKeyUp(keyCode: Int, keyEvent: KeyEvent): Boolean {
114114
when (keyCode) {
115115
KeyEvent.KEYCODE_1 -> {
116-
if (event.isAltPressed && event.isCtrlPressed) { // Heading 1 = Alt + Ctrl + 1
116+
if (keyEvent.isAltPressed && keyEvent.isCtrlPressed) { // Heading 1 = Alt + Ctrl + 1
117117
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_HEADING_1, true)
118118
editor?.toggleFormatting(AztecTextFormat.FORMAT_HEADING_1)
119119
return true
120120
}
121121
}
122122
KeyEvent.KEYCODE_2 -> {
123-
if (event.isAltPressed && event.isCtrlPressed) { // Heading 2 = Alt + Ctrl + 2
123+
if (keyEvent.isAltPressed && keyEvent.isCtrlPressed) { // Heading 2 = Alt + Ctrl + 2
124124
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_HEADING_2, true)
125125
editor?.toggleFormatting(AztecTextFormat.FORMAT_HEADING_2)
126126
return true
127127
}
128128
}
129129
KeyEvent.KEYCODE_3 -> {
130-
if (event.isAltPressed && event.isCtrlPressed) { // Heading 3 = Alt + Ctrl + 3
130+
if (keyEvent.isAltPressed && keyEvent.isCtrlPressed) { // Heading 3 = Alt + Ctrl + 3
131131
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_HEADING_3, true)
132132
editor?.toggleFormatting(AztecTextFormat.FORMAT_HEADING_3)
133133
return true
134134
}
135135
}
136136
KeyEvent.KEYCODE_4 -> {
137-
if (event.isAltPressed && event.isCtrlPressed) { // Heading 4 = Alt + Ctrl + 4
137+
if (keyEvent.isAltPressed && keyEvent.isCtrlPressed) { // Heading 4 = Alt + Ctrl + 4
138138
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_HEADING_4, true)
139139
editor?.toggleFormatting(AztecTextFormat.FORMAT_HEADING_4)
140140
return true
141141
}
142142
}
143143
KeyEvent.KEYCODE_5 -> {
144-
if (event.isAltPressed && event.isCtrlPressed) { // Heading 5 = Alt + Ctrl + 5
144+
if (keyEvent.isAltPressed && keyEvent.isCtrlPressed) { // Heading 5 = Alt + Ctrl + 5
145145
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_HEADING_5, true)
146146
editor?.toggleFormatting(AztecTextFormat.FORMAT_HEADING_5)
147147
return true
148148
}
149149
}
150150
KeyEvent.KEYCODE_6 -> {
151-
if (event.isAltPressed && event.isCtrlPressed) { // Heading 6 = Alt + Ctrl + 6
151+
if (keyEvent.isAltPressed && keyEvent.isCtrlPressed) { // Heading 6 = Alt + Ctrl + 6
152152
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_HEADING_6, true)
153153
editor?.toggleFormatting(AztecTextFormat.FORMAT_HEADING_6)
154154
return true
155155
}
156156
}
157157
KeyEvent.KEYCODE_7 -> {
158-
if (event.isAltPressed && event.isCtrlPressed) { // Heading 6 = Alt + Ctrl + 7
158+
if (keyEvent.isAltPressed && keyEvent.isCtrlPressed) { // Heading 6 = Alt + Ctrl + 7
159159
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_PARAGRAPH, true)
160160
editor?.toggleFormatting(AztecTextFormat.FORMAT_PARAGRAPH)
161161
return true
162162
}
163163
}
164164
KeyEvent.KEYCODE_8 -> {
165-
if (event.isAltPressed && event.isCtrlPressed) { // Preformat = Alt + Ctrl + 8
165+
if (keyEvent.isAltPressed && keyEvent.isCtrlPressed) { // Preformat = Alt + Ctrl + 8
166166
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_PREFORMAT, true)
167167
editor?.toggleFormatting(AztecTextFormat.FORMAT_PREFORMAT)
168168
return true
169169
}
170170
}
171171
KeyEvent.KEYCODE_B -> {
172-
if (event.isCtrlPressed) { // Bold = Ctrl + B
172+
if (keyEvent.isCtrlPressed) { // Bold = Ctrl + B
173173
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_STRONG, true)
174174
findViewById<ToggleButton>(ToolbarAction.BOLD.buttonId).performClick()
175175
return true
176176
}
177177
}
178178
KeyEvent.KEYCODE_D -> {
179-
if (event.isCtrlPressed) { // Strikethrough = Ctrl + D
179+
if (keyEvent.isCtrlPressed) { // Strikethrough = Ctrl + D
180180
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_STRIKETHROUGH, true)
181181
findViewById<ToggleButton>(ToolbarAction.STRIKETHROUGH.buttonId).performClick()
182182
return true
183183
}
184184
}
185185
KeyEvent.KEYCODE_H -> {
186-
if (event.isAltPressed && event.isCtrlPressed) { // Shortcuts = Alt + Ctrl + H
186+
if (keyEvent.isAltPressed && keyEvent.isCtrlPressed) { // Shortcuts = Alt + Ctrl + H
187187
showDialogShortcuts()
188188
return true
189189
}
190190
}
191191
KeyEvent.KEYCODE_I -> {
192-
if (event.isCtrlPressed) { // Italic = Ctrl + I
192+
if (keyEvent.isCtrlPressed) { // Italic = Ctrl + I
193193
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_EMPHASIS, true)
194194
findViewById<ToggleButton>(ToolbarAction.ITALIC.buttonId).performClick()
195195
return true
196196
}
197197
}
198198
KeyEvent.KEYCODE_K -> {
199-
if (event.isCtrlPressed) { // Link = Ctrl + K
199+
if (keyEvent.isCtrlPressed) { // Link = Ctrl + K
200200
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_LINK, true)
201201
findViewById<ToggleButton>(ToolbarAction.LINK.buttonId).performClick()
202202
return true
203203
}
204204
}
205205
KeyEvent.KEYCODE_M -> {
206-
if (event.isAltPressed && event.isCtrlPressed) { // Media = Alt + Ctrl + M
206+
if (keyEvent.isAltPressed && keyEvent.isCtrlPressed) { // Media = Alt + Ctrl + M
207207
if (aztecToolbarListener != null && aztecToolbarListener!!.onToolbarMediaButtonClicked()) {
208208
//event is consumed by listener
209209
} else {
@@ -214,59 +214,59 @@ class AztecToolbar : FrameLayout, IAztecToolbar, OnMenuItemClickListener {
214214
}
215215
}
216216
KeyEvent.KEYCODE_O -> {
217-
if (event.isAltPressed && event.isCtrlPressed) { // Ordered List = Alt + Ctrl + O
217+
if (keyEvent.isAltPressed && keyEvent.isCtrlPressed) { // Ordered List = Alt + Ctrl + O
218218
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_ORDERED_LIST, true)
219219
editor?.toggleFormatting(AztecTextFormat.FORMAT_ORDERED_LIST)
220220
return true
221221
}
222222
}
223223
KeyEvent.KEYCODE_Q -> {
224-
if (event.isAltPressed && event.isCtrlPressed) { // Quote = Alt + Ctrl + Q
224+
if (keyEvent.isAltPressed && keyEvent.isCtrlPressed) { // Quote = Alt + Ctrl + Q
225225
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_QUOTE, true)
226226
findViewById<ToggleButton>(ToolbarAction.QUOTE.buttonId).performClick()
227227
return true
228228
}
229229
}
230230
KeyEvent.KEYCODE_U -> {
231-
if (event.isAltPressed && event.isCtrlPressed) { // Unordered List = Alt + Ctrl + U
231+
if (keyEvent.isAltPressed && keyEvent.isCtrlPressed) { // Unordered List = Alt + Ctrl + U
232232
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_UNORDERED_LIST, true)
233233
editor?.toggleFormatting(AztecTextFormat.FORMAT_UNORDERED_LIST)
234234
return true
235-
} else if (event.isCtrlPressed) { // Underline = Ctrl + U
235+
} else if (keyEvent.isCtrlPressed) { // Underline = Ctrl + U
236236
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_UNDERLINE, true)
237237
findViewById<ToggleButton>(ToolbarAction.UNDERLINE.buttonId).performClick()
238238
return true
239239
}
240240
}
241241
KeyEvent.KEYCODE_T -> {
242-
if (event.isAltPressed && event.isCtrlPressed) { // Task List = Alt + Ctrl + T
242+
if (keyEvent.isAltPressed && keyEvent.isCtrlPressed) { // Task List = Alt + Ctrl + T
243243
aztecToolbarListener?.onToolbarFormatButtonClicked(AztecTextFormat.FORMAT_TASK_LIST, true)
244244
editor?.toggleFormatting(AztecTextFormat.FORMAT_TASK_LIST)
245245
return true
246246
}
247247
}
248248
KeyEvent.KEYCODE_X -> {
249-
if (event.isAltPressed && event.isCtrlPressed) { // Code = Alt + Ctrl + X
249+
if (keyEvent.isAltPressed && keyEvent.isCtrlPressed) { // Code = Alt + Ctrl + X
250250
// TODO: Add Code action.
251251
// findViewById<ToggleButton>(ToolbarAction.CODE.buttonId).performClick()
252252
return true
253253
}
254254
}
255255
KeyEvent.KEYCODE_Y -> {
256-
if (event.isCtrlPressed) { // Redo = Ctrl + Y
256+
if (keyEvent.isCtrlPressed) { // Redo = Ctrl + Y
257257
editor?.redo()
258258
return true
259259
}
260260
}
261261
KeyEvent.KEYCODE_Z -> {
262-
if (event.isCtrlPressed) { // Undo = Ctrl + Z
262+
if (keyEvent.isCtrlPressed) { // Undo = Ctrl + Z
263263
editor?.undo()
264264
return true
265265
}
266266
}
267267
else -> {
268268
toolbarButtonPlugins.forEach {
269-
if (it.matchesKeyShortcut(keyCode, event)) {
269+
if (it.matchesKeyShortcut(keyCode, keyEvent)) {
270270
aztecToolbarListener?.onToolbarFormatButtonClicked(it.action.textFormats.first(), true)
271271
it.toggle()
272272
return true

0 commit comments

Comments
 (0)