app, io: [wasm, android] add support for numeric/email keyboard mode

Previously, the on-screen keyboard always displays the text keyboard,
(QWERTY or equivalent).

For optimal user experience, it's possible to specify the keyboard type
using `InputHint`. The on-screen keyboard will provide shortcuts or
restrict what the user can input.

Due to some limitations (gio#116), only numeric and text keyboards are
supported on Android.

Signed-off-by: Inkeliz <inkeliz@inkeliz.com>
This commit is contained in:
Inkeliz
2021-04-30 13:03:17 +01:00
committed by Elias Naur
parent e68ee35c86
commit 9b4b91fec0
14 changed files with 128 additions and 5 deletions
+22 -1
View File
@@ -22,7 +22,8 @@ import (
// Key events are in general only delivered to the
// focused key handler.
type InputOp struct {
Tag event.Tag
Tag event.Tag
Hint InputHint
}
// SoftKeyboardOp shows or hide the on-screen keyboard, if available.
@@ -64,6 +65,25 @@ type EditEvent struct {
Text string
}
// InputHint changes the on-screen-keyboard type. That hints the
// type of data that might be entered by the user.
type InputHint uint8
const (
// HintAny hints that any input is expected.
HintAny InputHint = iota
// HintText hints that text input is expected. It may activate auto-correction and suggestions.
HintText
// HintNumeric hints that numeric input is expected. It may activate shortcuts for 0-9, "." and ",".
HintNumeric
// HintEmail hints that email input is expected. It may activate shortcuts for common email characters, such as "@" and ".com".
HintEmail
// HintURL hints that URL input is expected. It may activate shortcuts for common URL fragments such as "/" and ".com".
HintURL
// HintTelephone hints that telephone number input is expected. It may activate shortcuts for 0-9, "#" and "*".
HintTelephone
)
// State is the state of a key during an event.
type State uint8
@@ -127,6 +147,7 @@ func (h InputOp) Add(o *op.Ops) {
}
data := o.Write1(opconst.TypeKeyInputLen, h.Tag)
data[0] = byte(opconst.TypeKeyInput)
data[1] = byte(h.Hint)
}
func (h SoftKeyboardOp) Add(o *op.Ops) {
+19 -1
View File
@@ -17,6 +17,7 @@ type keyQueue struct {
handlers map[event.Tag]*keyHandler
reader ops.Reader
state TextInputState
hint key.InputHint
}
type keyHandler struct {
@@ -24,6 +25,7 @@ type keyHandler struct {
// in the current frame.
visible bool
new bool
hint key.InputHint
}
const (
@@ -38,6 +40,20 @@ func (q *keyQueue) InputState() TextInputState {
return q.state
}
// InputHint returns the input mode from the most recent key.InputOp.
func (q *keyQueue) InputHint() (key.InputHint, bool) {
if q.focus == nil {
return q.hint, false
}
focused, ok := q.handlers[q.focus]
if !ok {
return q.hint, false
}
old := q.hint
q.hint = focused.hint
return q.hint, old != q.hint
}
func (q *keyQueue) Frame(root *op.Ops, events *handlerEvents) {
if q.handlers == nil {
q.handlers = make(map[event.Tag]*keyHandler)
@@ -108,6 +124,7 @@ func (q *keyQueue) resolveFocus(events *handlerEvents) (focus event.Tag, changed
q.handlers[op.Tag] = h
}
h.visible = true
h.hint = op.Hint
}
}
return
@@ -118,7 +135,8 @@ func decodeKeyInputOp(d []byte, refs []interface{}) key.InputOp {
panic("invalid op")
}
return key.InputOp{
Tag: refs[0].(event.Tag),
Tag: refs[0].(event.Tag),
Hint: key.InputHint(d[1]),
}
}
+5
View File
@@ -102,6 +102,11 @@ func (q *Router) TextInputState() TextInputState {
return q.kqueue.InputState()
}
// TextInputHint returns the input mode from the most recent key.InputOp.
func (q *Router) TextInputHint() (key.InputHint, bool) {
return q.kqueue.InputHint()
}
// WriteClipboard returns the most recent text to be copied
// to the clipboard, if any.
func (q *Router) WriteClipboard() (string, bool) {