wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix hotkey handling (take keyboard layout into account)

Browse source
This commit is contained in:
schlagi123 2021-12-18 20:42:55 +01:00 committed by GitHub
parent b425ec5274
commit 1ab5b8a3e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 115 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

219
app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
View file

@ -661,7 +661,7 @@ open class MessageList :
override fun dispatchKeyEvent(event: KeyEvent): Boolean {
var eventHandled = false
if (KeyEvent.ACTION_DOWN == event.action) {
eventHandled = onCustomKeyDown(event.keyCode, event)
eventHandled = onCustomKeyDown(event)
}
if (!eventHandled) {
@ -712,10 +712,10 @@ open class MessageList :
*
* @return `true` if this event was consumed.
*/
private fun onCustomKeyDown(keyCode: Int, event: KeyEvent): Boolean {
private fun onCustomKeyDown(event: KeyEvent): Boolean {
if (!event.hasNoModifiers()) return false
when (keyCode) {
when (event.keyCode) {
KeyEvent.KEYCODE_VOLUME_UP -> {
if (messageViewFragment != null && displayMode != DisplayMode.MESSAGE_LIST &&
K9.isUseVolumeKeysForNavigation
@ -738,107 +738,8 @@ open class MessageList :
return true
}
}
KeyEvent.KEYCODE_C -> {
messageListFragment!!.onCompose()
return true
}
KeyEvent.KEYCODE_O -> {
messageListFragment!!.onCycleSort()
return true
}
KeyEvent.KEYCODE_I -> {
messageListFragment!!.onReverseSort()
return true
}
KeyEvent.KEYCODE_DEL, KeyEvent.KEYCODE_D -> {
if (displayMode == DisplayMode.MESSAGE_LIST) {
messageListFragment!!.onDelete()
} else if (messageViewFragment != null) {
messageViewFragment!!.onDelete()
}
return true
}
KeyEvent.KEYCODE_S -> {
messageListFragment!!.toggleMessageSelect()
return true
}
KeyEvent.KEYCODE_G -> {
if (displayMode == DisplayMode.MESSAGE_LIST) {
messageListFragment!!.onToggleFlagged()
} else if (messageViewFragment != null) {
messageViewFragment!!.onToggleFlagged()
}
return true
}
KeyEvent.KEYCODE_M -> {
if (displayMode == DisplayMode.MESSAGE_LIST) {
messageListFragment!!.onMove()
} else if (messageViewFragment != null) {
messageViewFragment!!.onMove()
}
return true
}
KeyEvent.KEYCODE_V -> {
if (displayMode == DisplayMode.MESSAGE_LIST) {
messageListFragment!!.onArchive()
} else if (messageViewFragment != null) {
messageViewFragment!!.onArchive()
}
return true
}
KeyEvent.KEYCODE_Y -> {
if (displayMode == DisplayMode.MESSAGE_LIST) {
messageListFragment!!.onCopy()
} else if (messageViewFragment != null) {
messageViewFragment!!.onCopy()
}
return true
}
KeyEvent.KEYCODE_Z -> {
if (displayMode == DisplayMode.MESSAGE_LIST) {
messageListFragment!!.onToggleRead()
} else if (messageViewFragment != null) {
messageViewFragment!!.onToggleRead()
}
return true
}
KeyEvent.KEYCODE_F -> {
if (messageViewFragment != null) {
messageViewFragment!!.onForward()
}
return true
}
KeyEvent.KEYCODE_A -> {
if (messageViewFragment != null) {
messageViewFragment!!.onReplyAll()
}
return true
}
KeyEvent.KEYCODE_R -> {
if (messageViewFragment != null) {
messageViewFragment!!.onReply()
}
return true
}
KeyEvent.KEYCODE_J, KeyEvent.KEYCODE_P -> {
if (messageViewFragment != null) {
showPreviousMessage()
}
return true
}
KeyEvent.KEYCODE_N, KeyEvent.KEYCODE_K -> {
if (messageViewFragment != null) {
showNextMessage()
}
return true
}
KeyEvent.KEYCODE_H -> {
val toast = if (displayMode == DisplayMode.MESSAGE_LIST) {
Toast.makeText(this, R.string.message_list_help_key, Toast.LENGTH_LONG)
} else {
Toast.makeText(this, R.string.message_view_help_key, Toast.LENGTH_LONG)
}
toast.show()
KeyEvent.KEYCODE_DEL -> {
onDeleteHotKey()
return true
}
KeyEvent.KEYCODE_DPAD_LEFT -> {
@ -857,9 +758,119 @@ open class MessageList :
}
}
when (if (event.unicodeChar != 0) event.unicodeChar.toChar() else null) {
'c' -> {
messageListFragment!!.onCompose()
return true
}
'o' -> {
messageListFragment!!.onCycleSort()
return true
}
'i' -> {
messageListFragment!!.onReverseSort()
return true
}
'd' -> {
onDeleteHotKey()
return true
}
's' -> {
messageListFragment!!.toggleMessageSelect()
return true
}
'g' -> {
if (displayMode == DisplayMode.MESSAGE_LIST) {
messageListFragment!!.onToggleFlagged()
} else if (messageViewFragment != null) {
messageViewFragment!!.onToggleFlagged()
}
return true
}
'm' -> {
if (displayMode == DisplayMode.MESSAGE_LIST) {
messageListFragment!!.onMove()
} else if (messageViewFragment != null) {
messageViewFragment!!.onMove()
}
return true
}
'v' -> {
if (displayMode == DisplayMode.MESSAGE_LIST) {
messageListFragment!!.onArchive()
} else if (messageViewFragment != null) {
messageViewFragment!!.onArchive()
}
return true
}
'y' -> {
if (displayMode == DisplayMode.MESSAGE_LIST) {
messageListFragment!!.onCopy()
} else if (messageViewFragment != null) {
messageViewFragment!!.onCopy()
}
return true
}
'z' -> {
if (displayMode == DisplayMode.MESSAGE_LIST) {
messageListFragment!!.onToggleRead()
} else if (messageViewFragment != null) {
messageViewFragment!!.onToggleRead()
}
return true
}
'f' -> {
if (messageViewFragment != null) {
messageViewFragment!!.onForward()
}
return true
}
'a' -> {
if (messageViewFragment != null) {
messageViewFragment!!.onReplyAll()
}
return true
}
'r' -> {
if (messageViewFragment != null) {
messageViewFragment!!.onReply()
}
return true
}
'j', 'p' -> {
if (messageViewFragment != null) {
showPreviousMessage()
}
return true
}
'n', 'k' -> {
if (messageViewFragment != null) {
showNextMessage()
}
return true
}
'h' -> {
val toast = if (displayMode == DisplayMode.MESSAGE_LIST) {
Toast.makeText(this, R.string.message_list_help_key, Toast.LENGTH_LONG)
} else {
Toast.makeText(this, R.string.message_view_help_key, Toast.LENGTH_LONG)
}
toast.show()
return true
}
}
return false
}
private fun onDeleteHotKey() {
if (displayMode == DisplayMode.MESSAGE_LIST) {
messageListFragment!!.onDelete()
} else if (messageViewFragment != null) {
messageViewFragment!!.onDelete()
}
}
override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
// Swallow these events too to avoid the audible notification of a volume change
if (K9.isUseVolumeKeysForListNavigation) {