mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix incorrect emoji style from being used on some devices.

fork-5.53.8
Cody Henthorne 2022-09-29 17:10:52 -04:00
rodzic 063f4d2994
commit 1b784d6522
3 zmienionych plików z 7 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
Wyświetl plik

@ -40,6 +40,7 @@ public class EmojiEditText extends AppCompatEditText {
if (!isInEditMode() && (forceCustom || !SignalStore.settings().isPreferSystemEmoji())) { if (!isInEditMode() && (forceCustom || !SignalStore.settings().isPreferSystemEmoji())) {
setFilters(appendEmojiFilter(this.getFilters(), jumboEmoji)); setFilters(appendEmojiFilter(this.getFilters(), jumboEmoji));
setEmojiCompatEnabled(false);
} }
super.setOnFocusChangeListener((v, hasFocus) -> { super.setOnFocusChangeListener((v, hasFocus) -> {

2
app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
Wyświetl plik

@ -97,6 +97,8 @@ public class EmojiTextView extends AppCompatTextView {
} }
textDirection = getLayoutDirection() == LAYOUT_DIRECTION_LTR ? TextDirectionHeuristics.FIRSTSTRONG_RTL : TextDirectionHeuristics.ANYRTL_LTR; textDirection = getLayoutDirection() == LAYOUT_DIRECTION_LTR ? TextDirectionHeuristics.FIRSTSTRONG_RTL : TextDirectionHeuristics.ANYRTL_LTR;
setEmojiCompatEnabled(SignalStore.settings().isPreferSystemEmoji() && !forceCustom);
} }
@Override @Override

4
app/src/main/java/org/thoughtcrime/securesms/components/emoji/SimpleEmojiTextView.kt
Wyświetl plik

@ -17,6 +17,10 @@ open class SimpleEmojiTextView @JvmOverloads constructor(
private var bufferType: BufferType? = null private var bufferType: BufferType? = null
private val sizeChangeDebouncer: ThrottledDebouncer = ThrottledDebouncer(200) private val sizeChangeDebouncer: ThrottledDebouncer = ThrottledDebouncer(200)
init {
isEmojiCompatEnabled = SignalStore.settings().isPreferSystemEmoji
}
override fun setText(text: CharSequence?, type: BufferType?) { override fun setText(text: CharSequence?, type: BufferType?) {
bufferType = type bufferType = type
val candidates = if (isInEditMode) null else EmojiProvider.getCandidates(text) val candidates = if (isInEditMode) null else EmojiProvider.getCandidates(text)