Fix tab key on hardware keyboard

+ Add a whitelist of keys if you want them to be treated as shortcuts
massivemadness · Jun 11, 2022 · 261b9d7 · 261b9d7
1 parent 54ef0fe
commit 261b9d7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/editorkit/src/main/kotlin/com/blacksquircle/ui/editorkit/plugin/shortcuts/ShortcutsPlugin.kt b/editorkit/src/main/kotlin/com/blacksquircle/ui/editorkit/plugin/shortcuts/ShortcutsPlugin.kt
@@ -24,6 +24,7 @@ import com.blacksquircle.ui.editorkit.widget.TextProcessor
 class ShortcutsPlugin : EditorPlugin(PLUGIN_ID) {
 
     var onShortcutListener: OnShortcutListener? = null
+    var shortcutKeyFilter = emptyList<Int>()
 
     override fun onAttached(editText: TextProcessor) {
         super.onAttached(editText)
@@ -45,7 +46,7 @@ class ShortcutsPlugin : EditorPlugin(PLUGIN_ID) {
             )
 
             // Shortcuts can be handled only if one of following keys is pressed
-            if (shortcut.ctrl || shortcut.shift || shortcut.alt) {
+            if (shortcut.ctrl || shortcut.shift || shortcut.alt || keyCode in shortcutKeyFilter) {
                 if (onShortcutListener.onShortcut(shortcut)) {
                     return true
                 }

diff --git a/editorkit/src/main/kotlin/com/blacksquircle/ui/editorkit/widget/TextProcessor.kt b/editorkit/src/main/kotlin/com/blacksquircle/ui/editorkit/widget/TextProcessor.kt
@@ -41,7 +41,7 @@ open class TextProcessor @JvmOverloads constructor(
         private const val TAG = "TextProcessor"
     }
 
-    private val plugins = mutableListOf<EditorPlugin>()
+    private val plugins = hashSetOf<EditorPlugin>()
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec)

diff --git a/...editor/src/main/kotlin/com/blacksquircle/ui/feature/editor/ui/fragments/EditorFragment.kt b/...editor/src/main/kotlin/com/blacksquircle/ui/feature/editor/ui/fragments/EditorFragment.kt
@@ -308,6 +308,7 @@ class EditorFragment : Fragment(R.layout.fragment_editor), BackPressedHandler,
                             else -> false
                         }
                     }
+                    shortcutKeyFilter = listOf(KeyEvent.KEYCODE_TAB)
                 }
             }
             binding.editor.plugins(pluginSupplier)
-Original file line number
+Diff line change
@@ Expand Up @@
                                 else -> false
                             }
                         }
+                        shortcutKeyFilter = listOf(KeyEvent.KEYCODE_TAB)
                     }
                 }
                 binding.editor.plugins(pluginSupplier)
@@ Expand Down @@