wzray/tt9
1
0
Fork 0
Code Activity

restored the old way of selecting emoji

Browse source
This commit is contained in:
sspanak 2024-03-11 17:54:46 +02:00 • committed by Dimo Karaivanov
parent 17232e4e1d
commit f3430224b5
4 changed files with 44 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

29
app/src/main/java/io/github/sspanak/tt9/ime/modes/ModePredictive.java
View file

@ -60,18 +60,13 @@ public class ModePredictive extends InputMode {
public boolean onBackspace() {
isCursorDirectionForward = false;
if (digitSequence.length() < 1) {
if (digitSequence.isEmpty()) {
clearWordStem();
return false;
}
if (digitSequence.startsWith(EmojiLanguage.EMOJI_SEQUENCE) && specialCharSelectedGroup > 0) {
specialCharSelectedGroup -= 2;
return true;
}
digitSequence = digitSequence.substring(0, digitSequence.length() - 1);
if (digitSequence.length() == 0) {
if (digitSequence.isEmpty()) {
clearWordStem();
} else if (stem.length() > digitSequence.length()) {
stem = stem.substring(0, digitSequence.length());
@ -93,16 +88,12 @@ public class ModePredictive extends InputMode {
suggestions.add(language.getKeyNumber(number));
} else {
super.reset();
digitSequence += number;
digitSequence = EmojiLanguage.validateEmojiSequence(digitSequence, number);
disablePredictions = false;
if (digitSequence.equals(Language.PREFERRED_CHAR_SEQUENCE)) {
autoAcceptTimeout = 0;
}
// custom emoji are longest 1-key sequence, so do not allow typing any longer than that,
// to prevent side effects
digitSequence = digitSequence.startsWith(EmojiLanguage.CUSTOM_EMOJI_SEQUENCE) ? EmojiLanguage.CUSTOM_EMOJI_SEQUENCE : digitSequence;
}
return true;
@ -237,7 +228,7 @@ public class ModePredictive extends InputMode {
return;
}
Language searchLanguage = digitSequence.startsWith(EmojiLanguage.CUSTOM_EMOJI_SEQUENCE) ? new EmojiLanguage() : language;
Language searchLanguage = digitSequence.equals(EmojiLanguage.CUSTOM_EMOJI_SEQUENCE) ? new EmojiLanguage() : language;
onSuggestionsUpdated = onLoad;
predictions
@ -261,8 +252,9 @@ public class ModePredictive extends InputMode {
super.nextSpecialCharacters();
onLoad.run();
return true;
} else if (digitSequence.equals(EmojiLanguage.EMOJI_SEQUENCE)) {
nextSpecialCharacters(new EmojiLanguage());
} else if (!digitSequence.equals(EmojiLanguage.CUSTOM_EMOJI_SEQUENCE) && digitSequence.startsWith(EmojiLanguage.EMOJI_SEQUENCE)) {
suggestions.clear();
suggestions.addAll(new EmojiLanguage().getKeyCharacters(digitSequence.charAt(0) - '0', digitSequence.length() - 2));
onLoad.run();
return true;
} else if (digitSequence.startsWith(Language.PREFERRED_CHAR_SEQUENCE)) {
@ -282,7 +274,7 @@ public class ModePredictive extends InputMode {
*/
private void getPredictions() {
// in case the user hasn't added any custom emoji, do not allow advancing to the empty character group
if (predictions.getList().isEmpty() && digitSequence.equals(EmojiLanguage.CUSTOM_EMOJI_SEQUENCE)) {
if (predictions.getList().isEmpty() && digitSequence.startsWith(EmojiLanguage.EMOJI_SEQUENCE)) {
digitSequence = EmojiLanguage.EMOJI_SEQUENCE;
return;
}
@ -348,9 +340,7 @@ public class ModePredictive extends InputMode {
@Override
protected boolean nextSpecialCharacters() {
return
(digitSequence.equals(EmojiLanguage.EMOJI_SEQUENCE) && super.nextSpecialCharacters(new EmojiLanguage()))
|| (digitSequence.equals(Language.SPECIAL_CHARS_KEY) && super.nextSpecialCharacters());
return digitSequence.equals(Language.SPECIAL_CHARS_KEY) && super.nextSpecialCharacters();
}
@Override
@ -405,6 +395,7 @@ public class ModePredictive extends InputMode {
!digitSequence.isEmpty()
&& predictions.noDbWords()
&& digitSequence.contains(Language.PUNCTUATION_KEY)
&& !digitSequence.startsWith(EmojiLanguage.EMOJI_SEQUENCE)
&& Text.containsOtherThan1(digitSequence);
}

6
app/src/main/java/io/github/sspanak/tt9/languages/Characters.java
View file

@ -85,6 +85,10 @@ public class Characters {
}
}
return availableEmoji.size() > 0 ? availableEmoji : new ArrayList<>(TextEmoticons);
return availableEmoji.isEmpty() ? new ArrayList<>(TextEmoticons) : availableEmoji;
}
public static int getMaxEmojiLevel() {
return Emoji.size();
}
}

15
app/src/main/java/io/github/sspanak/tt9/languages/EmojiLanguage.java
View file

@ -1,11 +1,14 @@
package io.github.sspanak.tt9.languages;
import androidx.annotation.NonNull;
import java.util.ArrayList;
import java.util.Locale;
public class EmojiLanguage extends Language {
final public static String EMOJI_SEQUENCE = "11";
final public static String CUSTOM_EMOJI_SEQUENCE = EMOJI_SEQUENCE + "1";
final private static int CUSTOM_EMOJI_KEY = 3;
final public static String CUSTOM_EMOJI_SEQUENCE = EMOJI_SEQUENCE + CUSTOM_EMOJI_KEY;
public EmojiLanguage() {
id = Integer.parseInt(EMOJI_SEQUENCE);
@ -23,4 +26,14 @@ public class EmojiLanguage extends Language {
public ArrayList<String> getKeyCharacters(int key, int characterGroup) {
return key == 1 && characterGroup >= 0 ? new ArrayList<>(Characters.getEmoji(characterGroup)) : super.getKeyCharacters(key, characterGroup);
}
public static String validateEmojiSequence(@NonNull String sequence, int next) {
if (sequence.startsWith(CUSTOM_EMOJI_SEQUENCE) || (sequence.equals(EMOJI_SEQUENCE) && next == CUSTOM_EMOJI_KEY)) {
return CUSTOM_EMOJI_SEQUENCE;
} else if (sequence.startsWith(EMOJI_SEQUENCE) && (next > 1 || sequence.length() == Characters.getMaxEmojiLevel() + 1)) {
return sequence;
} else {
return sequence + next;
}
}
}