sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use EmojiWrapperEditText for most relevant text inputs

This commit is contained in:
Daniel Gultsch 2018-06-29 13:40:55 +02:00
parent af420c84a0
commit 9ef7570d48
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compat/java/eu/siacs/conversations/ui/widget/AbstractEditMessage.java → src/compat/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java
View File

@ -4,13 +4,13 @@ import android.content.Context;
import android.support.text.emoji.widget.EmojiAppCompatEditText; import android.support.text.emoji.widget.EmojiAppCompatEditText;
import android.util.AttributeSet; import android.util.AttributeSet;
public abstract class AbstractEditMessage extends EmojiAppCompatEditText { public class EmojiWrapperEditText extends EmojiAppCompatEditText {
public AbstractEditMessage(Context context) { public EmojiWrapperEditText(Context context) {
super(context); super(context);
} }
public AbstractEditMessage(Context context, AttributeSet attrs) { public EmojiWrapperEditText(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
} }

2
src/main/java/eu/siacs/conversations/ui/widget/EditMessage.java
View File

@ -22,7 +22,7 @@ import android.view.inputmethod.InputConnection;
import eu.siacs.conversations.Config; import eu.siacs.conversations.Config;
import eu.siacs.conversations.R; import eu.siacs.conversations.R;
public class EditMessage extends AbstractEditMessage { public class EditMessage extends EmojiWrapperEditText {
private static final InputFilter SPAN_FILTER = (source, start, end, dest, dstart, dend) -> source instanceof Spanned ? source.toString() : source; private static final InputFilter SPAN_FILTER = (source, start, end, dest, dstart, dend) -> source instanceof Spanned ? source.toString() : source;
protected Handler mTypingHandler = new Handler(); protected Handler mTypingHandler = new Handler();

4
src/main/res/layout/activity_muc_details.xml
View File

@ -98,7 +98,7 @@
app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint"> app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
<android.support.design.widget.TextInputEditText <eu.siacs.conversations.ui.widget.EmojiWrapperEditText
android:id="@+id/muc_edit_title" android:id="@+id/muc_edit_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -112,7 +112,7 @@
app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint"> app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
<android.support.design.widget.TextInputEditText <eu.siacs.conversations.ui.widget.EmojiWrapperEditText
android:id="@+id/muc_edit_subject" android:id="@+id/muc_edit_subject"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

2
src/main/res/layout/create_conference_dialog.xml
View File

@ -28,7 +28,7 @@
app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint"> app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
<android.support.design.widget.TextInputEditText <eu.siacs.conversations.ui.widget.EmojiWrapperEditText
android:id="@+id/group_chat_name" android:id="@+id/group_chat_name"
style="@style/Widget.Conversations.EditText" style="@style/Widget.Conversations.EditText"
android:layout_width="match_parent" android:layout_width="match_parent"

4
src/main/res/layout/dialog_quickedit.xml
View File

@ -18,7 +18,7 @@
app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error"
app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint"> app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint">
<android.support.design.widget.TextInputEditText <eu.siacs.conversations.ui.widget.EmojiWrapperEditText
android:id="@+id/input_edit_text" android:id="@+id/input_edit_text"
style="@style/Widget.Conversations.EditText" style="@style/Widget.Conversations.EditText"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -27,7 +27,7 @@
android:inputType="textPersonName"> android:inputType="textPersonName">
<requestFocus/> <requestFocus/>
</android.support.design.widget.TextInputEditText> </eu.siacs.conversations.ui.widget.EmojiWrapperEditText>
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
</LinearLayout> </LinearLayout>

6
src/system/java/eu/siacs/conversations/ui/widget/AbstractEditMessage.java → src/system/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java
View File

@ -4,13 +4,13 @@ import android.content.Context;
import android.support.v7.widget.AppCompatEditText; import android.support.v7.widget.AppCompatEditText;
import android.util.AttributeSet; import android.util.AttributeSet;
public abstract class AbstractEditMessage extends AppCompatEditText { public class EmojiWrapperEditText extends AppCompatEditText {
public AbstractEditMessage(Context context) { public EmojiWrapperEditText(Context context) {
super(context); super(context);
} }
public AbstractEditMessage(Context context, AttributeSet attrs) { public EmojiWrapperEditText(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
} }
} }