kopia lustrzana https://github.com/ryukoposting/Signal-Android
Update some keyboard action handling.
rodzic
5da7052da3
commit
377841db26
|
@ -20,7 +20,9 @@ import androidx.annotation.StringRes;
|
||||||
import androidx.core.widget.TextViewCompat;
|
import androidx.core.widget.TextViewCompat;
|
||||||
|
|
||||||
import org.thoughtcrime.securesms.R;
|
import org.thoughtcrime.securesms.R;
|
||||||
|
import org.thoughtcrime.securesms.util.EditTextExtensionsKt;
|
||||||
import org.thoughtcrime.securesms.util.ServiceUtil;
|
import org.thoughtcrime.securesms.util.ServiceUtil;
|
||||||
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
||||||
import org.thoughtcrime.securesms.util.ViewUtil;
|
import org.thoughtcrime.securesms.util.ViewUtil;
|
||||||
|
|
||||||
public final class ContactFilterView extends FrameLayout {
|
public final class ContactFilterView extends FrameLayout {
|
||||||
|
@ -52,6 +54,8 @@ public final class ContactFilterView extends FrameLayout {
|
||||||
this.clearToggle = findViewById(R.id.search_clear);
|
this.clearToggle = findViewById(R.id.search_clear);
|
||||||
this.toggleContainer = findViewById(R.id.toggle_container);
|
this.toggleContainer = findViewById(R.id.toggle_container);
|
||||||
|
|
||||||
|
EditTextExtensionsKt.setIncognitoKeyboardEnabled(searchText, TextSecurePreferences.isIncognitoKeyboardEnabled(context));
|
||||||
|
|
||||||
this.keyboardToggle.setOnClickListener(new View.OnClickListener() {
|
this.keyboardToggle.setOnClickListener(new View.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
|
|
@ -11,7 +11,9 @@ import androidx.constraintlayout.widget.ConstraintLayout
|
||||||
import androidx.core.animation.addListener
|
import androidx.core.animation.addListener
|
||||||
import androidx.core.widget.addTextChangedListener
|
import androidx.core.widget.addTextChangedListener
|
||||||
import org.thoughtcrime.securesms.R
|
import org.thoughtcrime.securesms.R
|
||||||
|
import org.thoughtcrime.securesms.util.TextSecurePreferences
|
||||||
import org.thoughtcrime.securesms.util.ViewUtil
|
import org.thoughtcrime.securesms.util.ViewUtil
|
||||||
|
import org.thoughtcrime.securesms.util.setIncognitoKeyboardEnabled
|
||||||
import org.thoughtcrime.securesms.util.visible
|
import org.thoughtcrime.securesms.util.visible
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -39,6 +41,8 @@ class Material3SearchToolbar @JvmOverloads constructor(
|
||||||
close.setOnClickListener { collapse() }
|
close.setOnClickListener { collapse() }
|
||||||
clear.setOnClickListener { input.setText("") }
|
clear.setOnClickListener { input.setText("") }
|
||||||
|
|
||||||
|
input.setIncognitoKeyboardEnabled(TextSecurePreferences.isIncognitoKeyboardEnabled(context))
|
||||||
|
|
||||||
input.addTextChangedListener(afterTextChanged = {
|
input.addTextChangedListener(afterTextChanged = {
|
||||||
clear.visible = !it.isNullOrBlank()
|
clear.visible = !it.isNullOrBlank()
|
||||||
listener?.onSearchTextChange(it?.toString() ?: "")
|
listener?.onSearchTextChange(it?.toString() ?: "")
|
||||||
|
|
|
@ -20,6 +20,8 @@ import androidx.core.content.ContextCompat;
|
||||||
|
|
||||||
import org.thoughtcrime.securesms.R;
|
import org.thoughtcrime.securesms.R;
|
||||||
import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
|
import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
|
||||||
|
import org.thoughtcrime.securesms.util.EditTextExtensionsKt;
|
||||||
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
||||||
|
|
||||||
public class SearchToolbar extends LinearLayout {
|
public class SearchToolbar extends LinearLayout {
|
||||||
|
|
||||||
|
@ -57,6 +59,8 @@ public class SearchToolbar extends LinearLayout {
|
||||||
SearchView searchView = (SearchView) searchItem.getActionView();
|
SearchView searchView = (SearchView) searchItem.getActionView();
|
||||||
EditText searchText = searchView.findViewById(R.id.search_src_text);
|
EditText searchText = searchView.findViewById(R.id.search_src_text);
|
||||||
|
|
||||||
|
EditTextExtensionsKt.setIncognitoKeyboardEnabled(searchText, TextSecurePreferences.isIncognitoKeyboardEnabled(getContext()));
|
||||||
|
|
||||||
searchView.setSubmitButtonEnabled(false);
|
searchView.setSubmitButtonEnabled(false);
|
||||||
searchView.setMaxWidth(Integer.MAX_VALUE);
|
searchView.setMaxWidth(Integer.MAX_VALUE);
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,8 @@ import androidx.appcompat.widget.AppCompatEditText;
|
||||||
import org.thoughtcrime.securesms.R;
|
import org.thoughtcrime.securesms.R;
|
||||||
import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
|
import org.thoughtcrime.securesms.components.emoji.EmojiProvider.EmojiDrawable;
|
||||||
import org.thoughtcrime.securesms.keyvalue.SignalStore;
|
import org.thoughtcrime.securesms.keyvalue.SignalStore;
|
||||||
|
import org.thoughtcrime.securesms.util.EditTextExtensionsKt;
|
||||||
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
@ -48,6 +50,8 @@ public class EmojiEditText extends AppCompatEditText {
|
||||||
listener.onFocusChange(v, hasFocus);
|
listener.onFocusChange(v, hasFocus);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
EditTextExtensionsKt.setIncognitoKeyboardEnabled(this, TextSecurePreferences.isIncognitoKeyboardEnabled(context));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void insertEmoji(String emoji) {
|
public void insertEmoji(String emoji) {
|
||||||
|
|
Ładowanie…
Reference in New Issue