Skip to content

improved emoji handleing #332

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 4 commits into from
Mar 13, 2025
Merged

improved emoji handleing #332

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
856bbc3
impeoved emoji handleing
bhanu-dev82 Mar 10, 2025
47f5406
Minor nit picks for comment formatting
andrewtavis Mar 10, 2025
aec1d2f
added maxlength from database and batch editing
bhanu-dev82 Mar 11, 2025
88d62b0
Remove unneeded max keyword length variable
andrewtavis Mar 13, 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
28 changes: 27 additions & 1 deletion 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 @@ -1229,12 +1229,37 @@ abstract class GeneralKeyboardIME(

/**
* Inserts the specified emoji into the current input field.
* Replaces the last word if there's no trailing space.
*
* @param emoji The emoji character to be inserted.
*/
private fun insertEmoji(emoji: String) {
val inputConnection = currentInputConnection ?: return
inputConnection.commitText(emoji, 1)
// Need to be adjust according to the longest emoji keyword.
val maxLookBack = MAX_EMOJI_KEYWORD_LENGTH
val previousText = inputConnection.getTextBeforeCursor(maxLookBack, 0)?.toString() ?: ""

// Check if the last character is a space.
val endsWithSpace = previousText.endsWith(" ")
if (endsWithSpace) {
// Append emoji after the space.
inputConnection.commitText(emoji, 1)
} else {
// Extract the last word (without trailing space).
val trimmedText = previousText.trim()
val lastWord = trimmedText.substringAfterLast(' ').takeIf { it.isNotEmpty() }

// Check if the last word exists in emojiKeywords.
if (lastWord != null && emojiKeywords.containsKey(lastWord.lowercase())) {
// Calculate the length to delete (lastWord length).
val lengthToDelete = lastWord.length
inputConnection.deleteSurroundingText(lengthToDelete, 0)
inputConnection.commitText(emoji, 1)
} else {
// Default behavior: append the emoji.
inputConnection.commitText(emoji, 1)
}
}
}

/**
Expand Down Expand Up @@ -1577,6 +1602,7 @@ abstract class GeneralKeyboardIME(
internal companion object {
const val DEFAULT_SHIFT_PERM_TOGGLE_SPEED = 500
const val TEXT_LENGTH = 20
const val MAX_EMOJI_KEYWORD_LENGTH = 20
Copy link
Member

@andrewtavis andrewtavis Mar 10, 2025

Choose a reason for hiding this comment

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

One thing here @bhanu-dev82 is that this might not hold always. Maybe we can load this in from the DB for the emojis table? Let me know what you think here :)

Copy link
Collaborator Author

@bhanu-dev82 bhanu-dev82 Mar 11, 2025

Choose a reason for hiding this comment

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

yes i will implement it and commit

const val NOUN_TYPE_SIZE = 22f
const val SUGGESTION_SIZE = 15f
const val DARK_THEME = "#aeb3be"
Expand Down
Loading