n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only suggest typed word when it's valid

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2023-08-19 14:21:09 +03:00
parent 996f09eb9d
commit cccc18a1de
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/org/futo/inputmethod/latin/Suggest.java
View File

@ -183,7 +183,7 @@ public final class Suggest {
} }
final int firstOcurrenceOfTypedWordInSuggestions = final int firstOcurrenceOfTypedWordInSuggestions =
SuggestedWordInfo.removeDups(typedWordString, suggestionsContainer); SuggestedWordInfo.removeDups("", suggestionsContainer);
final SuggestedWordInfo whitelistedWordInfo = final SuggestedWordInfo whitelistedWordInfo =
getWhitelistedWordInfoOrNull(suggestionsContainer); getWhitelistedWordInfoOrNull(suggestionsContainer);

50
java/src/org/futo/inputmethod/latin/uix/ActionBar.kt
View File

@ -19,7 +19,6 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
import androidx.compose.material3.TextButton import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment.Companion.CenterVertically import androidx.compose.ui.Alignment.Companion.CenterVertically
@ -51,10 +50,11 @@ import androidx.compose.ui.unit.sp
import org.futo.inputmethod.latin.R import org.futo.inputmethod.latin.R
import org.futo.inputmethod.latin.SuggestedWords import org.futo.inputmethod.latin.SuggestedWords
import org.futo.inputmethod.latin.SuggestedWords.SuggestedWordInfo import org.futo.inputmethod.latin.SuggestedWords.SuggestedWordInfo
import org.futo.inputmethod.latin.SuggestedWords.SuggestedWordInfo.KIND_TYPED
import org.futo.inputmethod.latin.common.Constants import org.futo.inputmethod.latin.common.Constants
import org.futo.inputmethod.latin.suggestions.SuggestionStripView import org.futo.inputmethod.latin.suggestions.SuggestionStripView
import org.futo.inputmethod.latin.uix.theme.Typography
import org.futo.inputmethod.latin.uix.theme.WhisperVoiceInputTheme import org.futo.inputmethod.latin.uix.theme.WhisperVoiceInputTheme
import java.lang.IndexOutOfBoundsException
import java.lang.Integer.min import java.lang.Integer.min
import kotlin.math.ceil import kotlin.math.ceil
import kotlin.math.roundToInt import kotlin.math.roundToInt
@ -148,7 +148,7 @@ fun AutoFitText(
} }
@Composable @Composable
fun RowScope.SuggestionItem(words: SuggestedWords, idx: Int, onClick: () -> Unit) { fun RowScope.SuggestionItem(words: SuggestedWords, idx: Int, isPrimary: Boolean, onClick: () -> Unit) {
val word = try { val word = try {
words.getWord(idx) words.getWord(idx)
} catch(e: IndexOutOfBoundsException) { } catch(e: IndexOutOfBoundsException) {
@ -156,8 +156,8 @@ fun RowScope.SuggestionItem(words: SuggestedWords, idx: Int, onClick: () -> Unit
} }
val topSuggestionIcon = painterResource(id = R.drawable.top_suggestion) val topSuggestionIcon = painterResource(id = R.drawable.top_suggestion)
val textButtonModifier = when (idx) { val textButtonModifier = when (isPrimary) {
0 -> Modifier.drawBehind { true -> Modifier.drawBehind {
with(topSuggestionIcon) { with(topSuggestionIcon) {
val iconSize = topSuggestionIcon.intrinsicSize val iconSize = topSuggestionIcon.intrinsicSize
translate( translate(
@ -168,18 +168,17 @@ fun RowScope.SuggestionItem(words: SuggestedWords, idx: Int, onClick: () -> Unit
} }
} }
} }
false -> Modifier
else -> Modifier
} }
val textModifier = when (idx) { val textModifier = when (isPrimary) {
0 -> Modifier true -> Modifier
else -> Modifier.alpha(0.75f) false -> Modifier.alpha(0.75f)
} }
val textStyle = when (idx) { val textStyle = when (isPrimary) {
0 -> suggestionStylePrimary true -> suggestionStylePrimary
else -> suggestionStyleAlternative false -> suggestionStyleAlternative
}.copy(color = MaterialTheme.colorScheme.onPrimary) }.copy(color = MaterialTheme.colorScheme.onPrimary)
TextButton( TextButton(
@ -221,10 +220,28 @@ fun RowScope.SuggestionItems(words: SuggestedWords, onClick: (i: Int) -> Unit) {
return return
} }
var offset = 0
// Don't show what the user is typing
try {
val info = words.getInfo(0)
if (info.kind == KIND_TYPED && !info.isExactMatch && !info.isExactMatchWithIntentionalOmission) {
offset = 1
}
} catch(_: IndexOutOfBoundsException) {
}
for (i in 0 until maxSuggestions) { for (i in 0 until maxSuggestions) {
val remapped = ORDER_OF_SUGGESTIONS[i] val remapped = ORDER_OF_SUGGESTIONS[i]
SuggestionItem(words, remapped) { onClick(remapped) } SuggestionItem(
words,
remapped + offset,
isPrimary = remapped == 0
) { onClick(remapped + offset) }
if (i < maxSuggestions - 1) SuggestionSeparator() if (i < maxSuggestions - 1) SuggestionSeparator()
} }
@ -265,8 +282,9 @@ fun RowScope.ActionItems() {
ActionItem() ActionItem()
ActionItem() ActionItem()
Box(modifier = Modifier.fillMaxHeight().weight(1.0f)) {
Spacer(modifier = Modifier.weight(1.0f)) AutoFitText("Note: Actions not yet implemented", style = Typography.bodyMedium.copy(color = MaterialTheme.colorScheme.onBackground))
}
} }