diff --git a/Habitica/res/layout/activity_task_form.xml b/Habitica/res/layout/activity_task_form.xml index a29773e67..a732d73d0 100644 --- a/Habitica/res/layout/activity_task_form.xml +++ b/Habitica/res/layout/activity_task_form.xml @@ -24,7 +24,7 @@ android:layout_height="72dp" app:hintTextAppearance="@style/TextAppearance.AppCompat"> - - - - - - - - - - - - - - - { View view; @Bind(R.id.editText) - EditText editText; + EmojiconEditText editText; @Bind(R.id.btnAdd) Button btnAdd; diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/CheckListAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/CheckListAdapter.java index 446d914eb..d88f9de38 100644 --- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/CheckListAdapter.java +++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/CheckListAdapter.java @@ -14,6 +14,7 @@ import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter; import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperViewHolder; import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem; +import com.rockerhieu.emojicon.EmojiconEditText; import java.util.ArrayList; import java.util.Collections; @@ -80,7 +81,7 @@ public class CheckListAdapter extends RecyclerView.Adapter for (ChecklistItem item : this.Item.checklist) { LinearLayout itemView = (LinearLayout) layoutInflater.inflate(R.layout.checklist_item_row, null); CheckBox checkbox = (CheckBox) itemView.findViewById(R.id.checkBox); - TextView textView = (TextView) itemView.findViewById(R.id.checkedTextView); + EmojiconTextView textView = (EmojiconTextView) itemView.findViewById(R.id.checkedTextView); // Populate the data into the template view using the data object textView.setText(item.getText()); checkbox.setChecked(item.getCompleted());