mirror of
https://github.com/anomalyco/hex.git
synced 2026-11-22 21:23:02 +01:00
* ios: add Dvorak punctuation keys experiment Settings › Experiments › Dvorak punctuation keys (off by default, experiments.dvorakPunctuation) adds comma and period ahead of P on English's Dvorak row 1, whose nine keys narrow to start at the left margin and end at the same delete key, and a semicolon just left of the space bar, taking a letter's width from it where the bar still holds a letter-wide space. With shift or caps lock they type < > :. On the Duo's split keyboard only the left half takes the two punctuation keys, on a pitch narrowed so it keeps its right edge and the split gap doesn't move, and the semicolon takes from the left space bar. A URL or email field keeps its own . key instead of a second key of the same kind. With the experiment off every layout is key for key the one it was; a docked iPad keeps Apple's own rows. Adaptive touch names the narrower key plane apart from Apple's Dvorak, so the two don't share what they learn. Unit tests only (KeyboardLayoutTests, FullKeyboardEngineTests): no CI compiles the iOS targets. * ios: fix the Dvorak punctuation experiment's review findings The tests' KeyboardLayout calls were out of argument order and their left-margin and split-gap arithmetic used windowInset, metrics.gap and referenceW where the builders use horizontalInset + metrics.side, SplitGeometry.gap and SplitGeometry.keyWidth. Row-1 keys are now filtered to character keys so delete isn't taken for the row's last key. The layout's stored dvorakPunctuation is false unless the arrangement is Dvorak's, so QWERTY keyboards and other layouts compare and learn exactly as before; Adaptive touch keys its signature on a new hasDvorakPunctuationRow (layer, letters, field == .text), so a QWERTY, a non-letter page or a Dvorak URL/email field keeps its learned centres. Auto-capitalization no longer turns , . ; into < > :. ShiftStateMachine now tracks whether shift is automatic, and commitCharacter, displayLabel and keycapLabel take the shifted symbol only from a shift you pressed or caps lock. The docked iPad's two-symbol keys keep following auto-capitalization as before, and letters capitalize either way. Also: the new string-catalog entries sit where their keys sort, the READMEs say "key for key", and the feature map notes the split left half's narrower top row. Unit tests only: no CI compiles the iOS targets.
223 lines
9.3 KiB
Swift
223 lines
9.3 KiB
Swift
import UIKit
|
||
import XCTest
|
||
@testable import HEX
|
||
|
||
final class ShiftStateMachineTests: XCTestCase {
|
||
func testTapTurnsShiftOnForOneCharacter() {
|
||
var shift = ShiftStateMachine()
|
||
shift.shiftDown(now: 0)
|
||
shift.shiftUp()
|
||
XCTAssertEqual(shift.state, .on)
|
||
XCTAssertTrue(shift.isUppercase)
|
||
shift.didType()
|
||
XCTAssertEqual(shift.state, .off)
|
||
XCTAssertFalse(shift.isUppercase)
|
||
}
|
||
|
||
func testTappingShiftAgainTurnsItOff() {
|
||
var shift = ShiftStateMachine()
|
||
shift.shiftDown(now: 0)
|
||
shift.shiftUp()
|
||
shift.shiftDown(now: 1)
|
||
shift.shiftUp()
|
||
XCTAssertEqual(shift.state, .off)
|
||
}
|
||
|
||
func testChordTypesCapitalsWhileHeldThenTurnsOff() {
|
||
var shift = ShiftStateMachine()
|
||
shift.shiftDown(now: 0)
|
||
XCTAssertTrue(shift.isUppercase)
|
||
shift.didType() // "A"
|
||
XCTAssertTrue(shift.isUppercase, "still held")
|
||
shift.didType() // "B"
|
||
XCTAssertTrue(shift.isUppercase)
|
||
shift.shiftUp()
|
||
XCTAssertEqual(shift.state, .off)
|
||
}
|
||
|
||
func testChordDoesNotCountTowardDoubleTap() {
|
||
var shift = ShiftStateMachine()
|
||
shift.shiftDown(now: 0)
|
||
shift.didType()
|
||
shift.shiftUp()
|
||
shift.shiftDown(now: 0.1)
|
||
XCTAssertEqual(shift.state, .on, "a fresh tap, not caps lock")
|
||
}
|
||
|
||
func testDoubleTapLocksAndTapUnlocks() {
|
||
var shift = ShiftStateMachine()
|
||
shift.shiftDown(now: 0)
|
||
shift.shiftUp()
|
||
shift.shiftDown(now: 0.2)
|
||
shift.shiftUp()
|
||
XCTAssertEqual(shift.state, .locked)
|
||
shift.didType()
|
||
shift.didType()
|
||
XCTAssertEqual(shift.state, .locked)
|
||
shift.refreshAutoCapitalization(false)
|
||
XCTAssertEqual(shift.state, .locked, "auto-caps never clears caps lock")
|
||
shift.shiftDown(now: 5)
|
||
shift.shiftUp()
|
||
XCTAssertEqual(shift.state, .off)
|
||
}
|
||
|
||
func testSlowSecondTapTurnsShiftOff() {
|
||
var shift = ShiftStateMachine()
|
||
shift.shiftDown(now: 0)
|
||
shift.shiftUp()
|
||
shift.shiftDown(now: 0.31)
|
||
shift.shiftUp()
|
||
XCTAssertEqual(shift.state, .off)
|
||
}
|
||
|
||
func testDoubleTapFromAutoCapsLocks() {
|
||
var shift = ShiftStateMachine()
|
||
shift.refreshAutoCapitalization(true)
|
||
shift.shiftDown(now: 0)
|
||
shift.shiftUp()
|
||
XCTAssertEqual(shift.state, .off, "one tap clears auto-caps")
|
||
shift.shiftDown(now: 0.15)
|
||
shift.shiftUp()
|
||
XCTAssertEqual(shift.state, .locked)
|
||
}
|
||
|
||
func testAutoCapsLeavesAHeldShiftAlone() {
|
||
var shift = ShiftStateMachine()
|
||
shift.shiftDown(now: 0)
|
||
shift.refreshAutoCapitalization(false)
|
||
XCTAssertTrue(shift.isUppercase)
|
||
}
|
||
|
||
/// Auto-capitalization's shift is not a shift you pressed: caps lock and your own press are
|
||
/// `isUserShift`, and only those type the Dvorak punctuation keys' symbols.
|
||
func testAutoCapsIsNotAUserShift() {
|
||
var shift = ShiftStateMachine()
|
||
shift.refreshAutoCapitalization(true)
|
||
XCTAssertTrue(shift.isUppercase)
|
||
XCTAssertFalse(shift.isUserShift)
|
||
shift.didType()
|
||
XCTAssertFalse(shift.isUserShift)
|
||
|
||
shift.shiftDown(now: 0)
|
||
XCTAssertTrue(shift.isUserShift, "a press")
|
||
shift.didType()
|
||
shift.shiftUp()
|
||
shift.shiftDown(now: 1)
|
||
shift.shiftUp()
|
||
XCTAssertEqual(shift.state, .on)
|
||
XCTAssertTrue(shift.isUserShift, "one-shot from a tap")
|
||
shift.didType()
|
||
XCTAssertFalse(shift.isUserShift)
|
||
|
||
shift.refreshAutoCapitalization(true)
|
||
XCTAssertFalse(shift.isUserShift, "auto-caps again")
|
||
shift.shiftDown(now: 5)
|
||
shift.shiftUp()
|
||
shift.shiftDown(now: 5.1)
|
||
shift.shiftUp()
|
||
XCTAssertEqual(shift.state, .locked)
|
||
XCTAssertTrue(shift.isUserShift, "caps lock")
|
||
}
|
||
|
||
// MARK: - Auto-capitalization
|
||
|
||
func testSentenceCapitalization() {
|
||
let cases: [(String?, Bool, Bool)] = [
|
||
(nil, false, true),
|
||
(nil, true, false), // web view lost the context
|
||
("", true, true),
|
||
("Hello", true, false),
|
||
("Hello ", true, false),
|
||
("Hello. ", true, true),
|
||
("Hello. ", true, true),
|
||
("Really? ", true, true),
|
||
("Wow! ", true, true),
|
||
("He said \"hi.\" ", true, true),
|
||
("(Done.) ", true, true),
|
||
("e.g.", true, false),
|
||
("Line one\n", true, true),
|
||
("Line one\n ", true, true),
|
||
(" ", true, true),
|
||
("7:30 ", true, false),
|
||
]
|
||
for (before, hasText, expected) in cases {
|
||
XCTAssertEqual(
|
||
AutoCapitalization.shouldCapitalize(mode: .sentences, before: before, hasText: hasText),
|
||
expected,
|
||
"before: \(String(describing: before)) hasText: \(hasText)"
|
||
)
|
||
}
|
||
}
|
||
|
||
func testOtherCapitalizationModes() {
|
||
XCTAssertFalse(AutoCapitalization.shouldCapitalize(mode: .none, before: "", hasText: false))
|
||
XCTAssertTrue(AutoCapitalization.shouldCapitalize(mode: .allCharacters, before: "abc", hasText: true))
|
||
XCTAssertTrue(AutoCapitalization.shouldCapitalize(mode: .words, before: "Jane ", hasText: true))
|
||
XCTAssertFalse(AutoCapitalization.shouldCapitalize(mode: .words, before: "Ja", hasText: true))
|
||
// Greek's ; is its question mark: the system Greek keyboard capitalizes after "; ".
|
||
XCTAssertTrue(AutoCapitalization.shouldCapitalize(mode: .sentences, before: "Τι κάνεις; ", hasText: true, language: .greek))
|
||
XCTAssertTrue(AutoCapitalization.shouldCapitalize(mode: .sentences, before: "Τι κάνεις\u{037E} ", hasText: true, language: .greek))
|
||
XCTAssertFalse(AutoCapitalization.shouldCapitalize(mode: .sentences, before: "first; ", hasText: true))
|
||
XCTAssertEqual(AutoCapitalization.Mode(UITextAutocapitalizationType.none), .none)
|
||
XCTAssertEqual(AutoCapitalization.Mode(nil), .sentences)
|
||
}
|
||
|
||
// MARK: - Double-space period
|
||
|
||
func testDoubleSpaceAfterAWordTypesAPeriod() {
|
||
XCTAssertTrue(DoubleSpacePeriod.shouldReplace(before: "late ", lastSpaceAt: 10, now: 10.2))
|
||
XCTAssertTrue(DoubleSpacePeriod.shouldReplace(before: "at 7 ", lastSpaceAt: 10, now: 10.35))
|
||
}
|
||
|
||
func testDoubleSpaceEdgeCases() {
|
||
XCTAssertFalse(DoubleSpacePeriod.shouldReplace(before: "late ", lastSpaceAt: 10, now: 10.4), "too slow")
|
||
XCTAssertFalse(DoubleSpacePeriod.shouldReplace(before: "late ", lastSpaceAt: nil, now: 10), "not our space")
|
||
XCTAssertFalse(DoubleSpacePeriod.shouldReplace(before: "late. ", lastSpaceAt: 10, now: 10.1), "already punctuated")
|
||
XCTAssertFalse(DoubleSpacePeriod.shouldReplace(before: "late ", lastSpaceAt: 10, now: 10.1), "third space")
|
||
XCTAssertFalse(DoubleSpacePeriod.shouldReplace(before: " ", lastSpaceAt: 10, now: 10.1), "start of field")
|
||
XCTAssertFalse(DoubleSpacePeriod.shouldReplace(before: nil, lastSpaceAt: 10, now: 10.1), "no context")
|
||
XCTAssertFalse(DoubleSpacePeriod.shouldReplace(before: "late", lastSpaceAt: 10, now: 10.1), "cursor moved")
|
||
}
|
||
|
||
// MARK: - Layers and fields
|
||
|
||
func testNumbersGoBackToLettersOnSpaceOrReturn() {
|
||
var layer = KeyboardLayerState()
|
||
layer.switchTo(.numbers)
|
||
layer.didInsert("7")
|
||
XCTAssertEqual(layer.layer, .numbers)
|
||
layer.didInsert(" ")
|
||
XCTAssertEqual(layer.layer, .letters)
|
||
|
||
layer.switchTo(.symbols)
|
||
layer.didInsert("#")
|
||
layer.didInsert("\n")
|
||
XCTAssertEqual(layer.layer, .letters)
|
||
|
||
layer.switchTo(.numbers)
|
||
layer.reset()
|
||
XCTAssertEqual(layer.layer, .letters)
|
||
}
|
||
|
||
func testFieldRouting() {
|
||
XCTAssertEqual(KeyboardFieldRouting.route(for: .default), .keys(.text, initialLayer: .letters))
|
||
XCTAssertEqual(KeyboardFieldRouting.route(for: nil), .keys(.text, initialLayer: .letters))
|
||
XCTAssertEqual(KeyboardFieldRouting.route(for: .URL), .keys(.url, initialLayer: .letters))
|
||
XCTAssertEqual(KeyboardFieldRouting.route(for: .emailAddress), .keys(.email, initialLayer: .letters))
|
||
XCTAssertEqual(KeyboardFieldRouting.route(for: .numbersAndPunctuation), .keys(.text, initialLayer: .numbers))
|
||
XCTAssertEqual(KeyboardFieldRouting.route(for: .numberPad), .handOff)
|
||
XCTAssertEqual(KeyboardFieldRouting.route(for: .decimalPad), .handOff)
|
||
XCTAssertEqual(KeyboardFieldRouting.route(for: .asciiCapableNumberPad), .handOff)
|
||
}
|
||
|
||
/// A number pad goes to the next keyboard where iOS asks for a globe, but not where Apple's
|
||
/// keyboard is split (the Duo unfolded and upright): that switch can end the host app there
|
||
/// (TestFlight build 121), so Hex stays on its 123 page.
|
||
func testNumberPadsStayOnHexWhereApplesKeyboardSplits() {
|
||
XCTAssertTrue(KeyboardFieldRouting.handsOffNumberPad(needsInputModeSwitchKey: true, posture: .phone))
|
||
XCTAssertFalse(KeyboardFieldRouting.handsOffNumberPad(needsInputModeSwitchKey: false, posture: .phone), "iOS's own globe")
|
||
XCTAssertTrue(KeyboardFieldRouting.handsOffNumberPad(needsInputModeSwitchKey: true, posture: .cover))
|
||
XCTAssertTrue(KeyboardFieldRouting.handsOffNumberPad(needsInputModeSwitchKey: true, posture: .unfoldedTall))
|
||
XCTAssertFalse(KeyboardFieldRouting.handsOffNumberPad(needsInputModeSwitchKey: true, posture: .unfoldedWide))
|
||
}
|
||
}
|