luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-23 17:40:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

charCount is a useful parameter so we don't need to recompute it when looping

Browse source
This commit is contained in:
devycarol 2025-03-06 20:55:44 -07:00
parent 711e87d28f
commit b6a13a7473
2 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/helium314/keyboard/keyboard/KeyboardActionListenerImpl.kt
View file

@ -113,15 +113,17 @@ class KeyboardActionListenerImpl(private val latinIME: LatinIME, private val inp
var actualSteps = 0 var actualSteps = 0
// corrected steps to avoid splitting chars belonging to the same codepoint // corrected steps to avoid splitting chars belonging to the same codepoint
if (steps > 0) { if (steps > 0) {
val text = inputLogic.mConnection.getSelectedText(0) ?: return steps val text = inputLogic.mConnection.getSelectedText(0)
loopOverCodePoints(text) { if (text == null) actualSteps = steps
actualSteps += Character.charCount(it) else loopOverCodePoints(text) { cp, charCount ->
actualSteps += charCount
actualSteps >= steps actualSteps >= steps
} }
} else { } else {
val text = inputLogic.mConnection.getTextBeforeCursor(-steps * 4, 0) ?: return steps val text = inputLogic.mConnection.getTextBeforeCursor(-steps * 4, 0)
loopOverCodePointsBackwards(text) { if (text == null) actualSteps = steps
actualSteps -= Character.charCount(it) else loopOverCodePointsBackwards(text) { cp, charCount ->
actualSteps -= charCount
actualSteps <= steps actualSteps <= steps
} }
} }
@ -217,12 +219,12 @@ class KeyboardActionListenerImpl(private val latinIME: LatinIME, private val inp
private fun positiveMoveSteps(text: CharSequence, steps: Int): Int { private fun positiveMoveSteps(text: CharSequence, steps: Int): Int {
var actualSteps = 0 var actualSteps = 0
// corrected steps to avoid splitting chars belonging to the same codepoint // corrected steps to avoid splitting chars belonging to the same codepoint
loopOverCodePoints(text) { loopOverCodePoints(text) { cp, charCount ->
if (StringUtils.mightBeEmoji(it)) { if (StringUtils.mightBeEmoji(cp)) {
actualSteps = 0 actualSteps = 0
true true
} }
actualSteps += Character.charCount(it) actualSteps += charCount
actualSteps >= steps actualSteps >= steps
} }
return min(actualSteps, text.length) return min(actualSteps, text.length)
@ -231,12 +233,12 @@ class KeyboardActionListenerImpl(private val latinIME: LatinIME, private val inp
private fun negativeMoveSteps(text: CharSequence, steps: Int): Int { private fun negativeMoveSteps(text: CharSequence, steps: Int): Int {
var actualSteps = 0 var actualSteps = 0
// corrected steps to avoid splitting chars belonging to the same codepoint // corrected steps to avoid splitting chars belonging to the same codepoint
loopOverCodePointsBackwards(text) { loopOverCodePointsBackwards(text) { cp, charCount ->
if (StringUtils.mightBeEmoji(it)) { if (StringUtils.mightBeEmoji(cp)) {
actualSteps = 0 actualSteps = 0
true true
} }
actualSteps -= Character.charCount(it) actualSteps -= charCount
actualSteps <= steps actualSteps <= steps
} }
return -min(-actualSteps, text.length) return -min(-actualSteps, text.length)

26
app/src/main/java/helium314/keyboard/latin/common/StringUtils.kt
View file

@ -9,33 +9,35 @@ import helium314.keyboard.latin.settings.SpacingAndPunctuations
import java.math.BigInteger import java.math.BigInteger
import java.util.Locale import java.util.Locale
fun loopOverCodePoints(text: CharSequence, loop: (cp: Int) -> Boolean) { fun loopOverCodePoints(text: CharSequence, loop: (cp: Int, charCount: Int) -> Boolean) {
val s = text.toString() val s = text.toString()
var offset = 0 var offset = 0
while (offset < s.length) { while (offset < s.length) {
val cp = s.codePointAt(offset) val cp = s.codePointAt(offset)
if (loop(cp)) return val charCount = Character.charCount(cp)
offset += Character.charCount(cp) if (loop(cp, charCount)) return
offset += charCount
} }
} }
fun loopOverCodePointsBackwards(text: CharSequence, loop: (cp: Int) -> Boolean) { fun loopOverCodePointsBackwards(text: CharSequence, loop: (cp: Int, charCount: Int) -> Boolean) {
val s = text.toString() val s = text.toString()
var offset = s.length var offset = s.length
while (offset > 0) { while (offset > 0) {
val cp = s.codePointBefore(offset) val cp = s.codePointBefore(offset)
if (loop(cp)) return val charCount = Character.charCount(cp)
offset -= Character.charCount(cp) if (loop(cp, charCount)) return
offset -= charCount
} }
} }
fun nonWordCodePointAndNoSpaceBeforeCursor(text: CharSequence, spacingAndPunctuations: SpacingAndPunctuations): Boolean { fun nonWordCodePointAndNoSpaceBeforeCursor(text: CharSequence, spacingAndPunctuations: SpacingAndPunctuations): Boolean {
var space = false var space = false
var nonWordCodePoint = false var nonWordCodePoint = false
loopOverCodePointsBackwards(text) { loopOverCodePointsBackwards(text) { cp, charCount ->
if (!space && Character.isWhitespace(it)) space = true if (!space && Character.isWhitespace(cp)) space = true
// treat double quote like a word codepoint for the purpose of this function (not great, maybe clarify name, or extend list of chars?) // treat double quote like a word codepoint for the purpose of this function (not great, maybe clarify name, or extend list of chars?)
if (!nonWordCodePoint && !spacingAndPunctuations.isWordCodePoint(it) && it != '"'.code) { if (!nonWordCodePoint && !spacingAndPunctuations.isWordCodePoint(cp) && cp != '"'.code) {
nonWordCodePoint = true nonWordCodePoint = true
} }
space && nonWordCodePoint // stop if both are found space && nonWordCodePoint // stop if both are found
@ -45,9 +47,9 @@ fun nonWordCodePointAndNoSpaceBeforeCursor(text: CharSequence, spacingAndPunctua
fun hasLetterBeforeLastSpaceBeforeCursor(text: CharSequence): Boolean { fun hasLetterBeforeLastSpaceBeforeCursor(text: CharSequence): Boolean {
var letter = false var letter = false
loopOverCodePointsBackwards(text) { loopOverCodePointsBackwards(text) { cp, charCount ->
if (Character.isWhitespace(it)) true if (Character.isWhitespace(cp)) true
else if (Character.isLetter(it)) { else if (Character.isLetter(cp)) {
letter = true letter = true
true true
} }