From 4e225bd12dafd0bd8347ed1b691f00aebd627461 Mon Sep 17 00:00:00 2001 From: Thodoris1999 Date: Sat, 18 Aug 2018 13:12:43 +0300 Subject: [PATCH] fixes --- .../java/gr/thmmy/mthmmy/utils/EditorView.java | 1 - .../java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java | 2 +- .../thmmy/mthmmy/utils/ImageKeyboardAdapter.java | 4 ---- app/src/main/res/drawable/emojI_wink.gif | Bin 944 -> 0 bytes 4 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 app/src/main/res/drawable/emojI_wink.gif diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/EditorView.java b/app/src/main/java/gr/thmmy/mthmmy/utils/EditorView.java index 28b9df00..2eee42d3 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/utils/EditorView.java +++ b/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) { - setOrientation(VERTICAL); LayoutInflater.from(context).inflate(R.layout.editor_view, this, true); editText = findViewById(R.id.editor_edittext); diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java b/app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java index 74c408f0..06dff3d4 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java +++ b/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); 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_grin, ";D"); // removed repeated angry emoji diff --git a/app/src/main/java/gr/thmmy/mthmmy/utils/ImageKeyboardAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/utils/ImageKeyboardAdapter.java index c175994c..b19b6204 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/utils/ImageKeyboardAdapter.java +++ b/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) { this.context = context; this.emojiIds = emojiIds; - // sort images by width - Arrays.sort(this.emojiIds, (img1, img2) -> - context.getResources().getDrawable(img1).getIntrinsicWidth() - - context.getResources().getDrawable(img2).getIntrinsicWidth()); } @Override diff --git a/app/src/main/res/drawable/emojI_wink.gif b/app/src/main/res/drawable/emojI_wink.gif deleted file mode 100644 index 1022bce73302590eed867b0d65b7f21cf1bc1e82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 944 zcmZ?wbhEHb6k-r!_{IPP|NlPk|8X@c*_FLJM|e{g*M&vATYI=B7Vvc!NM2aL_-?1z zkE2>Yj_H0rsCs)9_ta9sRh<$)jvIVCW%vD@&$qL#yC-t>6-mF^F8=+nN^X$o#l>t7 z*YPL2a`qL7e%z<>{jA%pQjRTsf(#56|HFE&+--6H<|nUF}+`xe1F}}`uno)?~9&4 zPn-T;_CLEsG0RVIUM2VAO`<=~*!{Vi|L1P@-|La@k6Nv07Rd5qO!MR|4ilVR#(roz z-@Wy+_ctk?m@l)qPOv1HDLX(c(}zFFi8bAWE!~3=6w=s$;(u;G*N|Xm#{gF&Jp*Qt zI>nzXta3nF2c#YpO>FG{8yK3J%gahjONyJjTZ#$`^7C?Yva@=cGBeWCQd3gXl9Lh> zdNSkVQetDGV`8HsBf`U4LgPY$ql0!u2L|~2`T8^!d8dYiczNwQ>FMF_=E_j!5*fJj zWRUYoCr1Z+JD)P!G#l#^URFUTEiKH=OifCSjciW8h(2i;WniYSr>7gSX2PVtP;te; z6$&R8DYbHosQUyw3~F+pt|2iwW1?eHONUj0Q^LfBDs0Cj3{57nd_3sP&X8>}gJDrh zyQOY`$E1Lbj?D^ciAFM&lh&*d5->A}Sz*l4)5?9NJ~#!YY#*41b+sI z(rF+QS%6AefJ)iel^Q_7=j9a?6cWWYfbemUKJJ6mWtDs=jeuyqFFKc&ye=o2`Mii&90i6~c%@D%C(A?4%6lB%b N(Kf-l%?s!>YXI3HX50V(