Browse Source

fixes

pull/45/head
Thodoris1999 6 years ago
parent
commit
4e225bd12d
  1. 1
      app/src/main/java/gr/thmmy/mthmmy/utils/EditorView.java
  2. 2
      app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java
  3. 4
      app/src/main/java/gr/thmmy/mthmmy/utils/ImageKeyboardAdapter.java
  4. BIN
      app/src/main/res/drawable/emojI_wink.gif

1
app/src/main/java/gr/thmmy/mthmmy/utils/EditorView.java

@ -38,7 +38,6 @@ public class EditorView extends LinearLayout {
} }
private void init(Context context, AttributeSet attrs) { private void init(Context context, AttributeSet attrs) {
setOrientation(VERTICAL);
LayoutInflater.from(context).inflate(R.layout.editor_view, this, true); LayoutInflater.from(context).inflate(R.layout.editor_view, this, true);
editText = findViewById(R.id.editor_edittext); editText = findViewById(R.id.editor_edittext);

2
app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java

@ -37,7 +37,7 @@ public class EmojiKeyboard extends LinearLayout {
LayoutInflater.from(context).inflate(R.layout.emoji_keyboard, this, true); LayoutInflater.from(context).inflate(R.layout.emoji_keyboard, this, true);
emojis.append(R.drawable.emoji_smiley, ":)"); emojis.append(R.drawable.emoji_smiley, ":)");
emojis.append(R.drawable.emojI_wink, ";)"); emojis.append(R.drawable.emoji_wink, ";)");
emojis.append(R.drawable.emoji_cheesy, ":D"); emojis.append(R.drawable.emoji_cheesy, ":D");
emojis.append(R.drawable.emoji_grin, ";D"); emojis.append(R.drawable.emoji_grin, ";D");
// removed repeated angry emoji // removed repeated angry emoji

4
app/src/main/java/gr/thmmy/mthmmy/utils/ImageKeyboardAdapter.java

@ -18,10 +18,6 @@ public class ImageKeyboardAdapter extends BaseAdapter {
public ImageKeyboardAdapter(Context context, Integer[] emojiIds) { public ImageKeyboardAdapter(Context context, Integer[] emojiIds) {
this.context = context; this.context = context;
this.emojiIds = emojiIds; this.emojiIds = emojiIds;
// sort images by width
Arrays.sort(this.emojiIds, (img1, img2) ->
context.getResources().getDrawable(img1).getIntrinsicWidth() -
context.getResources().getDrawable(img2).getIntrinsicWidth());
} }
@Override @Override

BIN
app/src/main/res/drawable/emojI_wink.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 944 B

Loading…
Cancel
Save