diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2022-02-23 12:37:03 +0300 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2022-02-23 12:37:03 +0300 |
| commit | ad493938a03cadb4747613040bad9c28cf244789 (patch) | |
| tree | 28f9571e6c153c878e6918845f77741e57d31906 /src/main/res | |
| parent | 4129ca6af8f22fc64cca891052615d3d2755ad79 (diff) | |
bump appcompat, migrate to emoji2 and get rid of emoji flavor
Diffstat (limited to 'src/main/res')
| -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/create_public_channel_dialog.xml | 2 | ||||
| -rw-r--r-- | src/main/res/layout/dialog_quickedit.xml | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index d19bf93e9..f2b4b00d7 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -106,7 +106,7 @@ app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint"> - <eu.siacs.conversations.ui.widget.EmojiWrapperEditText + <EditText android:id="@+id/muc_edit_title" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -120,7 +120,7 @@ app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint"> - <eu.siacs.conversations.ui.widget.EmojiWrapperEditText + <EditText 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 2296699a5..3883a0f5e 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"> - <eu.siacs.conversations.ui.widget.EmojiWrapperEditText + <EditText android:id="@+id/group_chat_name" style="@style/Widget.Conversations.EditText" android:layout_width="match_parent" diff --git a/src/main/res/layout/create_public_channel_dialog.xml b/src/main/res/layout/create_public_channel_dialog.xml index 048244d0c..2dcd8f3d8 100644 --- a/src/main/res/layout/create_public_channel_dialog.xml +++ b/src/main/res/layout/create_public_channel_dialog.xml @@ -26,7 +26,7 @@ app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint"> - <eu.siacs.conversations.ui.widget.EmojiWrapperEditText + <EditText 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 0b3219fec..6255cf0e4 100644 --- a/src/main/res/layout/dialog_quickedit.xml +++ b/src/main/res/layout/dialog_quickedit.xml @@ -16,7 +16,7 @@ app:errorTextAppearance="@style/TextAppearance.Conversations.Design.Error" app:hintTextAppearance="@style/TextAppearance.Conversations.Design.Hint"> - <eu.siacs.conversations.ui.widget.EmojiWrapperEditText + <EditText android:id="@+id/input_edit_text" style="@style/Widget.Conversations.EditText" android:layout_width="match_parent" @@ -25,7 +25,7 @@ android:inputType="textPersonName"> <requestFocus/> - </eu.siacs.conversations.ui.widget.EmojiWrapperEditText> + </EditText> </com.google.android.material.textfield.TextInputLayout> </LinearLayout> |