Skip to content

fix(command-mode): fix shift key and capitalization behaviour #297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrewtavis merged 2 commits into from
Jan 16, 2025
Merged

fix(command-mode): fix shift key and capitalization behaviour #297

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
678cef3
fix(command-mode): fix shift key and capitalization behaviour
smalik2811 Jan 16, 2025
eccb083
Fix comments within command mode shift state functionality
andrewtavis Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions app/src/main/java/be/scri/services/GeneralKeyboardIME.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ abstract class GeneralKeyboardIME(
} else {
currentEnterKeyType!!
}
keyboard = KeyboardBase(this, getKeyboardLayoutXML(), enterKeyType)
keyboardView?.setKeyboard(keyboard!!)
}

fun getIsAccentCharacterDisabled(): Boolean {
Expand Down Expand Up @@ -336,6 +336,10 @@ abstract class GeneralKeyboardIME(
Log.i("MY-TAG", "PLURAL STATE")
updateKeyboardMode(true)
currentState = ScribeState.PLURAL
if (language == "German") {
Copy link
Member

@andrewtavis andrewtavis Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wonderful, thanks for this, @smalik2811!

// All nouns are capitalized in German.
keyboard!!.mShiftState = SHIFT_ON_ONE_CHAR
}
updateUI()
}
}
Expand Down Expand Up @@ -552,7 +556,11 @@ abstract class GeneralKeyboardIME(
}

fun updateShiftKeyState() {
if (keyboardMode == keyboardLetters) {
// The shift state in the Scribe commands should not depend on the Input Connection.
// The current state should be transferred to the command unless required by the language.
if ((currentState == ScribeState.IDLE || currentState == ScribeState.SELECT_COMMAND) &&
keyboardMode == keyboardLetters
) {
val editorInfo = currentInputEditorInfo
if (
editorInfo != null &&
Expand Down Expand Up @@ -762,11 +770,11 @@ abstract class GeneralKeyboardIME(
binding?.commandBar?.append(codeChar.toString())
inputConnection.commitText(codeChar.toString(), 1)
}
}

if (keyboard!!.mShiftState == SHIFT_ON_ONE_CHAR && keyboardMode == keyboardLetters) {
keyboard!!.mShiftState = SHIFT_OFF
keyboardView!!.invalidateAllKeys()
}
if (keyboard!!.mShiftState == SHIFT_ON_ONE_CHAR && keyboardMode == keyboardLetters) {
keyboard!!.mShiftState = SHIFT_OFF
keyboardView!!.invalidateAllKeys()
}
}

Expand Down
Loading