Skip to content

Add suggested words to the user dictionary #2226

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

Open
djurcola wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add suggested words to the user dictionary #2226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions java/res/values/strings-uix.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,14 @@
<string name="autoupdater_perform_update">Update</string>

<!-- These strings can appear in the keyboard itself -->
<string name="keyboard_suggest_manage_word_body">Manage the word \"<xliff:g name="wordToManage" example="crane">%s</xliff:g>\"</string>
<string name="keyboard_suggest_blacklist_body">Blacklist the word \"<xliff:g name="wordToBlacklist" example="crane">%s</xliff:g>\" from being suggested?</string>
<!-- Must be fairly short -->
<string name="keyboard_suggest_add_to_dictionary">Add to dictionary</string>
<!-- Must be fairly short -->
<string name="keyboard_suggest_add_word_to_blacklist">Blacklist</string>
<string name="keyboard_suggest_added_to_dictionary">Added to dictionary</string>
<string name="keyboard_suggest_already_in_dictionary">Already in dictionary</string>
<!-- Must be fairly short -->
<string name="keyboard_suggest_disable_emojis">Disable emoji suggestions</string>
<!-- Must be fairly short -->
Expand Down
38 changes: 38 additions & 0 deletions java/src/org/futo/inputmethod/latin/LatinIME.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import android.graphics.Color
import android.inputmethodservice.InputMethodService
import android.os.Build
import android.os.Bundle
import android.provider.UserDictionary
import android.util.Log
import android.widget.Toast
import android.view.KeyEvent
import android.view.View
import android.view.ViewGroup
Expand Down Expand Up @@ -56,6 +58,7 @@ import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.futo.inputmethod.accessibility.AccessibilityUtils
import org.futo.inputmethod.compat.UserDictionaryCompatUtils
import org.futo.inputmethod.engine.ExpandableSuggestionBarConfiguration
import org.futo.inputmethod.engine.IMEManager
import org.futo.inputmethod.engine.general.WordLearner
Expand Down Expand Up @@ -837,6 +840,41 @@ class LatinIME : InputMethodServiceCompose(), LatinIMELegacy.SuggestionStripCont
uixManager.requestForgetWord(suggestedWordInfo)
}

fun addSuggestedWordToDictionary(suggestedWordInfo: SuggestedWordInfo) = lifecycleScope.launch {
val word = suggestedWordInfo.mWord
val settings = Settings.getInstance().current
val locale = settings.mLocale
val wasAdded = withContext(Dispatchers.Default) {
val selection = "${UserDictionary.Words.WORD}=? AND ${UserDictionary.Words.LOCALE}=?" +
" AND (${UserDictionary.Words.SHORTCUT} is null OR ${UserDictionary.Words.SHORTCUT}='')"
val alreadyPresent = contentResolver.query(
UserDictionary.Words.CONTENT_URI,
arrayOf(UserDictionary.Words.WORD),
selection,
arrayOf(word, locale.toString()),
null
)?.use { it.moveToFirst() } == true

if (!alreadyPresent) {
UserDictionaryCompatUtils.addWord(this@LatinIME, word, 250, null, locale)
}

!alreadyPresent
}

if (wasAdded) {
imeManager.getActiveIME(settings).requestSuggestionRefresh()
}
Toast.makeText(
this@LatinIME,
getString(
if (wasAdded) R.string.keyboard_suggest_added_to_dictionary
else R.string.keyboard_suggest_already_in_dictionary
),
Toast.LENGTH_SHORT
).show()
}

fun blacklistWord(suggestedWordInfo: SuggestedWordInfo?) = lifecycleScope.launch {
val word = suggestedWordInfo?.mWord
if(word != null) {
Expand Down
43 changes: 27 additions & 16 deletions java/src/org/futo/inputmethod/latin/uix/UixManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1503,23 +1503,34 @@ class UixManager(private val latinIME: LatinIME) {
}

fun requestForgetWord(suggestedWordInfo: SuggestedWords.SuggestedWordInfo) {
val isEmojiSuggestion = suggestedWordInfo.mKindAndFlags == SuggestedWordInfo.KIND_EMOJI_SUGGESTION
keyboardManagerForAction.requestDialog(
latinIME.getString(R.string.keyboard_suggest_blacklist_body, suggestedWordInfo.mWord),
listOf(
DialogRequestItem(latinIME.getString(R.string.cancel)) { },
DialogRequestItem(latinIME.getString(R.string.keyboard_suggest_add_word_to_blacklist)) {
latinIME.blacklistWord(suggestedWordInfo)
},
) + if(suggestedWordInfo.mKindAndFlags == SuggestedWordInfo.KIND_EMOJI_SUGGESTION) {
listOf(
DialogRequestItem(latinIME.getString(R.string.keyboard_suggest_disable_emojis)) {
runBlocking { latinIME.setSetting(SHOW_EMOJI_SUGGESTIONS, false) }
latinIME.blacklistWord(null)
}
)
} else {
listOf()
}
latinIME.getString(
if (isEmojiSuggestion) R.string.keyboard_suggest_blacklist_body
else R.string.keyboard_suggest_manage_word_body,
suggestedWordInfo.mWord
),
listOf(DialogRequestItem(latinIME.getString(R.string.cancel)) { }) +
if (isEmojiSuggestion) {
listOf(
DialogRequestItem(latinIME.getString(R.string.keyboard_suggest_add_word_to_blacklist)) {
latinIME.blacklistWord(suggestedWordInfo)
},
DialogRequestItem(latinIME.getString(R.string.keyboard_suggest_disable_emojis)) {
runBlocking { latinIME.setSetting(SHOW_EMOJI_SUGGESTIONS, false) }
latinIME.blacklistWord(null)
}
)
} else {
listOf(
DialogRequestItem(latinIME.getString(R.string.keyboard_suggest_add_to_dictionary)) {
latinIME.addSuggestedWordToDictionary(suggestedWordInfo)
},
DialogRequestItem(latinIME.getString(R.string.keyboard_suggest_add_word_to_blacklist)) {
latinIME.blacklistWord(suggestedWordInfo)
}
)
}
) { }

val v = latinIME.getSystemService(Context.VIBRATOR_SERVICE) as Vibrator?
Expand Down