use EmojiWrapperEditText for most relevant text inputs
This commit is contained in:
		
							parent
							
								
									af420c84a0
								
							
						
					
					
						commit
						9ef7570d48
					
				| @ -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); | ||||
|     } | ||||
| 
 | ||||
| @ -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(); | ||||
|  | ||||
| @ -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" | ||||
|  | ||||
| @ -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" | ||||
|  | ||||
| @ -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> | ||||
|  | ||||
| @ -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); | ||||
|     } | ||||
| } | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Daniel Gultsch
						Daniel Gultsch