diff options
| -rw-r--r-- | src/compat/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java (renamed from src/compat/java/eu/siacs/conversations/ui/widget/AbstractEditMessage.java) | 6 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/widget/EditMessage.java | 2 | ||||
| -rw-r--r-- | src/main/res/layout/activity_muc_details.xml | 4 | ||||
| -rw-r--r-- | src/main/res/layout/create_conference_dialog.xml | 2 | ||||
| -rw-r--r-- | src/main/res/layout/dialog_quickedit.xml | 4 | ||||
| -rw-r--r-- | src/system/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java (renamed from src/system/java/eu/siacs/conversations/ui/widget/AbstractEditMessage.java) | 6 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/compat/java/eu/siacs/conversations/ui/widget/AbstractEditMessage.java b/src/compat/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java index 3620accbd..af6587ef5 100644 --- a/src/compat/java/eu/siacs/conversations/ui/widget/AbstractEditMessage.java +++ b/src/compat/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java @@ -4,13 +4,13 @@ import android.content.Context; import android.support.text.emoji.widget.EmojiAppCompatEditText; 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); } - public AbstractEditMessage(Context context, AttributeSet attrs) { + public EmojiWrapperEditText(Context context, AttributeSet attrs) { super(context, attrs); } diff --git a/src/main/java/eu/siacs/conversations/ui/widget/EditMessage.java b/src/main/java/eu/siacs/conversations/ui/widget/EditMessage.java index 61a0272b7..33220bde3 100644 --- a/src/main/java/eu/siacs/conversations/ui/widget/EditMessage.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/EditMessage.java @@ -22,7 +22,7 @@ import android.view.inputmethod.InputConnection; import eu.siacs.conversations.Config; 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; protected Handler mTypingHandler = new Handler(); diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 2d5c09a48..fe335c046 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -98,7 +98,7 @@ app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" 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:layout_width="match_parent" android:layout_height="wrap_content" @@ -112,7 +112,7 @@ app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" 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:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/src/main/res/layout/create_conference_dialog.xml b/src/main/res/layout/create_conference_dialog.xml index e81257223..89811fa07 100644 --- a/src/main/res/layout/create_conference_dialog.xml +++ b/src/main/res/layout/create_conference_dialog.xml @@ -28,7 +28,7 @@ app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint"> - <android.support.design.widget.TextInputEditText + <eu.siacs.conversations.ui.widget.EmojiWrapperEditText android:id="@+id/group_chat_name" style="@style/Widget.Conversations.EditText" android:layout_width="match_parent" diff --git a/src/main/res/layout/dialog_quickedit.xml b/src/main/res/layout/dialog_quickedit.xml index 5dc56613d..00189eec3 100644 --- a/src/main/res/layout/dialog_quickedit.xml +++ b/src/main/res/layout/dialog_quickedit.xml @@ -18,7 +18,7 @@ app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint"> - <android.support.design.widget.TextInputEditText + <eu.siacs.conversations.ui.widget.EmojiWrapperEditText android:id="@+id/input_edit_text" style="@style/Widget.Conversations.EditText" android:layout_width="match_parent" @@ -27,7 +27,7 @@ android:inputType="textPersonName"> <requestFocus/> - </android.support.design.widget.TextInputEditText> + </eu.siacs.conversations.ui.widget.EmojiWrapperEditText> </android.support.design.widget.TextInputLayout> </LinearLayout> diff --git a/src/system/java/eu/siacs/conversations/ui/widget/AbstractEditMessage.java b/src/system/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java index 5f35e00b4..be21c56f6 100644 --- a/src/system/java/eu/siacs/conversations/ui/widget/AbstractEditMessage.java +++ b/src/system/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java @@ -4,13 +4,13 @@ import android.content.Context; import android.support.v7.widget.AppCompatEditText; 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); } - public AbstractEditMessage(Context context, AttributeSet attrs) { + public EmojiWrapperEditText(Context context, AttributeSet attrs) { super(context, attrs); } }
\ No newline at end of file |