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

rename params, don't do unnecessary type checks, no unbraced multiline if's

Browse source
This commit is contained in:
devycarol 2025-03-06 20:16:13 -07:00
parent 631ab60eb9
commit ec8c4e477f
1 changed files with 32 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,43 +9,43 @@ import helium314.keyboard.latin.settings.SpacingAndPunctuations
import java.math.BigInteger
import java.util.Locale
fun loopOverCodePoints(s: CharSequence, run: (Int) -> Boolean) {
val text = if (s is String) s else s.toString()
fun loopOverCodePoints(text: CharSequence, loop: (cp: Int) -> Boolean) {
val s = text.toString()
var offset = 0
while (offset < text.length) {
val codepoint = text.codePointAt(offset)
if (run(codepoint)) return
offset += Character.charCount(codepoint)
while (offset < s.length) {
val cp = s.codePointAt(offset)
if (loop(cp)) return
offset += Character.charCount(cp)
}
}
fun loopOverCodePointsBackwards(s: CharSequence, run: (Int) -> Boolean) {
val text = if (s is String) s else s.toString()
var offset = text.length
fun loopOverCodePointsBackwards(text: CharSequence, loop: (cp: Int) -> Boolean) {
val s = text.toString()
var offset = s.length
while (offset > 0) {
val codepoint = text.codePointBefore(offset)
if (run(codepoint)) return
offset -= Character.charCount(codepoint)
val cp = s.codePointBefore(offset)
if (loop(cp)) return
offset -= Character.charCount(cp)
}
}
fun nonWordCodePointAndNoSpaceBeforeCursor(s: CharSequence, spacingAndPunctuations: SpacingAndPunctuations): Boolean {
fun nonWordCodePointAndNoSpaceBeforeCursor(text: CharSequence, spacingAndPunctuations: SpacingAndPunctuations): Boolean {
var space = false
var nonWordCodePoint = false
loopOverCodePointsBackwards(s) {
if (!space && Character.isWhitespace(it))
space = true
loopOverCodePointsBackwards(text) {
if (!space && Character.isWhitespace(it)) 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?)
if (!nonWordCodePoint && !spacingAndPunctuations.isWordCodePoint(it) && it != '"'.code)
if (!nonWordCodePoint && !spacingAndPunctuations.isWordCodePoint(it) && it != '"'.code) {
nonWordCodePoint = true
}
space && nonWordCodePoint // stop if both are found
}
return nonWordCodePoint && !space // return true if an non-word codepoint and no space was found
}
fun hasLetterBeforeLastSpaceBeforeCursor(s: CharSequence): Boolean {
fun hasLetterBeforeLastSpaceBeforeCursor(text: CharSequence): Boolean {
var letter = false
loopOverCodePointsBackwards(s) {
loopOverCodePointsBackwards(text) {
if (Character.isWhitespace(it)) true
else if (Character.isLetter(it)) {
letter = true
@ -56,17 +56,15 @@ fun hasLetterBeforeLastSpaceBeforeCursor(s: CharSequence): Boolean {
return letter
}
/** get the complete emoji at end of [s], considering that emojis can be joined with ZWJ resulting in different emojis */
fun getFullEmojiAtEnd(s: CharSequence): String {
val text = if (s is String) s else s.toString()
var offset = text.length
/** get the complete emoji at end of [text], considering that emojis can be joined with ZWJ resulting in different emojis */
fun getFullEmojiAtEnd(text: CharSequence): String {
val s = text.toString()
var offset = s.length
while (offset > 0) {
val codepoint = text.codePointBefore(offset)
val codepoint = s.codePointBefore(offset)
// stop if codepoint can't be emoji
if (!mightBeEmoji(codepoint))
return text.substring(offset)
offset -= Character.charCount(codepoint)
if (offset > 0 && text[offset - 1].code == KeyCode.ZWJ) {
if (offset > 0 && s[offset - 1].code == KeyCode.ZWJ) {
// todo: this appends ZWJ in weird cases like text, ZWJ, emoji
// and detects single ZWJ as emoji (at least irrelevant for current use of getFullEmojiAtEnd)
offset -= 1
@ -76,19 +74,17 @@ fun getFullEmojiAtEnd(s: CharSequence): String {
if (codepoint in 0x1F3FB..0x1F3FF) {
// Skin tones are not added with ZWJ, but just appended. This is not nice as they can be emojis on their own,
// but that's how it is done. Assume that an emoji before the skin tone will get merged (usually correct in practice)
val codepointBefore = text.codePointBefore(offset)
val codepointBefore = s.codePointBefore(offset)
if (isEmoji(codepointBefore)) {
offset -= Character.charCount(codepointBefore)
continue
}
}
// check the whole text after offset
val textToCheck = text.substring(offset)
if (isEmoji(textToCheck)) {
return textToCheck
val textToCheck = s.substring(offset)
if (isEmoji(textToCheck)) return textToCheck
}
}
return text.substring(offset)
return s.substring(offset)
}
/** split the string on the first of consecutive space only, further consecutive spaces are added to the next split */
@ -110,8 +106,7 @@ fun String.splitOnFirstSpacesOnly(): List<String> {
sb.append(c)
}
}
if (sb.isNotBlank())
out.add(sb.toString())
if (sb.isNotBlank()) out.add(sb.toString())
return out
}
@ -120,8 +115,7 @@ fun CharSequence.isValidNumber(): Boolean {
}
fun String.decapitalize(locale: Locale): String {
if (isEmpty() || !this[0].isUpperCase())
return this
if (isEmpty() || !this[0].isUpperCase()) return this
return replaceFirstChar { it.lowercase(locale) }
}
@ -136,7 +130,7 @@ fun containsValueWhenSplit(string: String?, value: String, split: String): Boole
fun isEmoji(c: Int): Boolean = mightBeEmoji(c) && isEmoji(newSingleCodePointString(c))
fun isEmoji(s: CharSequence): Boolean = mightBeEmoji(s) && s.matches(emoRegex)
fun isEmoji(text: CharSequence): Boolean = mightBeEmoji(text) && text.matches(emoRegex)
fun String.splitOnWhitespace() = split(whitespaceSplitRegex)