Merge branch 'editor_view' of https://github.com/ThmmyNoLife/mTHMMY into editor_view

# Conflicts:
#	app/src/main/java/gr/thmmy/mthmmy/utils/EmojiKeyboard.java

app/src/main/java/gr/thmmy/mthmmy/activities/TestEditView.java

@@ -10,7 +10,6 @@ import gr.thmmy.mthmmy.utils.EditorView;
 import gr.thmmy.mthmmy.utils.EmojiKeyboard;
 
 public class TestEditView extends AppCompatActivity implements EmojiKeyboard.EmojiKeyboardOwner {
-
     EmojiKeyboard emojiKeyboard;
     EditorView editorView;
 
@@ -19,8 +18,8 @@ public class TestEditView extends AppCompatActivity implements EmojiKeyboard.Emo
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_test_edit_view);
 
-        editorView = (EditorView) findViewById(R.id.editor_view);
-        emojiKeyboard = (EmojiKeyboard) findViewById(R.id.emoji_keyboard);
+        editorView = findViewById(R.id.editor_view);
+        emojiKeyboard = findViewById(R.id.emoji_keyboard);
 
         InputConnection ic = editorView.getInputConnection();
         emojiKeyboard.setInputConnection(ic);

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

@@ -41,14 +41,17 @@ public class EditorView extends LinearLayout {
         setOrientation(VERTICAL);
         LayoutInflater.from(context).inflate(R.layout.editor_view, this, true);
 
-        editText = (EditText) findViewById(R.id.editor_edittext);
-        emojiButton = (AppCompatImageButton) findViewById(R.id.emoji_keyboard_button);
+        editText = findViewById(R.id.editor_edittext);
+        emojiButton = findViewById(R.id.emoji_keyboard_button);
+
         editText.setOnTouchListener((v, event) -> {
             if (emojiKeyboardVisible) return true;
             return false;
         });
+
         emojiButton.setOnClickListener(view -> {
             InputMethodManager imm = (InputMethodManager) context.getSystemService(Activity.INPUT_METHOD_SERVICE);
+            assert imm != null;
             if (emojiKeyboardVisible) {
                 editText.requestFocus();
                 imm.showSoftInput(editText, InputMethodManager.SHOW_IMPLICIT);
@@ -61,7 +64,8 @@ public class EditorView extends LinearLayout {
             emojiKeyboardVisible = !emojiKeyboardVisible;
             emojiKeyboardOwner.setEmojiKeyboardVisible(emojiKeyboardVisible);
         });
-        submitButton = (AppCompatImageButton) findViewById(R.id.submit_button);
+
+        submitButton = findViewById(R.id.submit_button);
     }
 
     public Editable getText() {

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

@@ -36,131 +36,129 @@ public class EmojiKeyboard extends LinearLayout {
     public void init(Context context, AttributeSet attrs) {
         LayoutInflater.from(context).inflate(R.layout.emoji_keyboard, this, true);
 
-        emojis.append(R.drawable.smiley, ":)");
-        emojis.append(R.drawable.wink, ";)");
-        emojis.append(R.drawable.cheesy, ":D");
-        emojis.append(R.drawable.grin, ";D");
-        // second alias: ^angry^
-        emojis.append(R.drawable.angry, ">:(");
-        emojis.append(R.drawable.sad, ":(");
-        emojis.append(R.drawable.shocked, ":o");
-        emojis.append(R.drawable.cool, "8))");
-        emojis.append(R.drawable.huh, ":???:");
-        emojis.append(R.drawable.rolleyes, "::)");
-        emojis.append(R.drawable.tongue, ":P");
-        emojis.append(R.drawable.embarrassed, ":-[");
-        emojis.append(R.drawable.lipsrsealed, ":-X");
-        emojis.append(R.drawable.undecided, ":-\\\\");
-        emojis.append(R.drawable.kiss, ":-*");
-        emojis.append(R.drawable.cry, ":'(");
+        emojis.append(R.drawable.emoji_smiley, ":)");
+        emojis.append(R.drawable.emojI_wink, ";)");
+        emojis.append(R.drawable.emoji_cheesy, ":D");
+        emojis.append(R.drawable.emoji_grin, ";D");
+        // removed repeated angry emoji
+        emojis.append(R.drawable.emoji_angry, ">:(");
+        emojis.append(R.drawable.emoji_sad, ":(");
+        emojis.append(R.drawable.emoji_shocked, ":o");
+        emojis.append(R.drawable.emoji_cool, "8))");
+        emojis.append(R.drawable.emoji_huh, ":???:");
+        emojis.append(R.drawable.emoji_rolleyes, "::)");
+        emojis.append(R.drawable.emoji_tongue, ":P");
+        emojis.append(R.drawable.emoji_embarrassed, ":-[");
+        emojis.append(R.drawable.emoji_lipsrsealed, ":-X");
+        emojis.append(R.drawable.emoji_undecided, ":-\\\\");
+        emojis.append(R.drawable.emoji_kiss, ":-*");
+        emojis.append(R.drawable.emoji_cry, ":'(");
+        emojis.append(R.drawable.emoji_heart, "<3");
+        // removed repeated lock emoji
+        emojis.append(R.drawable.emoji_locked, "^lock^");
+        emojis.append(R.drawable.emoji_roll_over, "^rollover^");
+        emojis.append(R.drawable.emoji_redface, "^redface^");
+        emojis.append(R.drawable.emoji_confused, "^confused^");
+        emojis.append(R.drawable.emoji_innocent, "^innocent^");
+        emojis.append(R.drawable.emoji_sleep, "^sleep^");
+        emojis.append(R.drawable.emoji_lips_sealed, "^sealed^");
+        emojis.append(R.drawable.emoji_cool2, "^cool^");
+        emojis.append(R.drawable.emoji_crazy, "^crazy^");
+        emojis.append(R.drawable.emoji_mad, "^mad^");
+        emojis.append(R.drawable.emoji_wav, "^wav^");
+        emojis.append(R.drawable.emoji_binkybaby, "^binkybaby^");
+        emojis.append(R.drawable.emoji_police, "^police^");
+        emojis.append(R.drawable.emoji_dontknow, "^dontknow^");
+        //removed repeated angry hot emoji
+        emojis.append(R.drawable.emoji_angry_hot, "^angryhot^");
+        emojis.append(R.drawable.emoji_foyska, "^fouska^");
+        emojis.append(R.drawable.emoji_e10_7_3e, "^sfinaki^");
+        emojis.append(R.drawable.emoji_bang_head, "^banghead^");
+        emojis.append(R.drawable.emoji_crybaby, "^crybaby^");
+        emojis.append(R.drawable.emoji_hello, "^hello^");
+        emojis.append(R.drawable.emoji_jerk, "^jerk^");
+        emojis.append(R.drawable.emoji_nono, "^nono^");
+        emojis.append(R.drawable.emoji_notworthy, "^notworthy^");
+        emojis.append(R.drawable.emoji_off_topic, "^off-topic^");
+        emojis.append(R.drawable.emoji_puke, "^puke^");
+        emojis.append(R.drawable.emoji_shout, "^shout^");
+        emojis.append(R.drawable.emoji_slurp, "^slurp^");
+        emojis.append(R.drawable.emoji_superconfused, "^superconfused^");
+        emojis.append(R.drawable.emoji_superinnocent, "^superinnocent^");
+        emojis.append(R.drawable.emoji_cell_phone, "^cellPhone^");
+        emojis.append(R.drawable.emoji_idiot, "^idiot^");
+        emojis.append(R.drawable.emoji_knuppel, "^knuppel^");
+        emojis.append(R.drawable.emoji_tickedoff, "^tickedOff^");
+        emojis.append(R.drawable.emoji_peace, "^peace^");
+        emojis.append(R.drawable.emoji_suspicious, "^suspicious^");
+        emojis.append(R.drawable.emoji_caffine, "^caffine^");
+        emojis.append(R.drawable.emoji_argue, "^argue^");
+        emojis.append(R.drawable.emoji_banned2, "^banned2^");
+        emojis.append(R.drawable.emoji_banned, "^banned^");
+        emojis.append(R.drawable.emoji_bath, "^bath^");
+        emojis.append(R.drawable.emoji_beg, "^beg^");
+        emojis.append(R.drawable.emoji_bluescreen, "^bluescreen^");
+        emojis.append(R.drawable.emoji_boil, "^boil^");
+        emojis.append(R.drawable.emoji_bye, "^bye^");
+        emojis.append(R.drawable.emoji_callmerip, "^callmerip^");
+        emojis.append(R.drawable.emoji_carnaval, "^carnaval^");
+        emojis.append(R.drawable.emoji_clap, "^clap^");
+        emojis.append(R.drawable.emoji_coffeepot, "^coffepot^");
+        emojis.append(R.drawable.emoji_crap, "^crap^");
+        emojis.append(R.drawable.emoji_curses, "^curses^");
+        emojis.append(R.drawable.emoji_funny, "^funny^");
+        emojis.append(R.drawable.emoji_guitar1, "^guitar^");
+        emojis.append(R.drawable.emoji_icon_kissy, "^kissy^");
+        emojis.append(R.drawable.emoji_band, "^band^");
+        emojis.append(R.drawable.emoji_ivres, "^ivres^");
+        emojis.append(R.drawable.emoji_kaloe, "^kaloe^");
+        emojis.append(R.drawable.emoji_kremala, "^kremala^");
+        emojis.append(R.drawable.emoji_moon, "^moon^");
+        emojis.append(R.drawable.emoji_mopping, "^mopping^");
+        emojis.append(R.drawable.emoji_mountza, "^mountza^");
+        emojis.append(R.drawable.emoji_pcsleep, "^pcsleep^");
+        emojis.append(R.drawable.emoji_pinokio, "^pinokio^");
+        emojis.append(R.drawable.emoji_poke, "^poke^");
+        emojis.append(R.drawable.emoji_seestars, "^seestars^");
+        emojis.append(R.drawable.emoji_sfyri, "^sfyri^");
+        emojis.append(R.drawable.emoji_spam2, "^spam^");
+        emojis.append(R.drawable.emoji_esuper, "^super^");
+        emojis.append(R.drawable.emoji_tafos, "^tafos^");
+        emojis.append(R.drawable.emoji_tomatomourh, "^tomato^");
+        emojis.append(R.drawable.emoji_ytold, "^ytold^");
+        emojis.append(R.drawable.emoji_beer2, "^beer^");
+        emojis.append(R.drawable.emoji_yu, "^yue^");
+        emojis.append(R.drawable.emoji_a_eatpaper, "^eatpaper^");
+        emojis.append(R.drawable.emoji_fritz, "^fritz^");
+        emojis.append(R.drawable.emoji_wade, "^wade^");
+        emojis.append(R.drawable.emoji_lypi, "^lypi^");
+        emojis.append(R.drawable.emoji_megashok1wq, "^aytoxeir^");
+        emojis.append(R.drawable.emoji_victory, "^victory^");
+        emojis.append(R.drawable.emoji_filarakia, "^filarakia^");
+        emojis.append(R.drawable.emoji_bonjour_97213, "^hat^");
+        emojis.append(R.drawable.emoji_curtseyqi9, "^miss^");
+        emojis.append(R.drawable.emoji_rofl, "^rolfmao^");
+        emojis.append(R.drawable.emoji_question, "^que^");
+        emojis.append(R.drawable.emoji_shifty, "^shifty^");
+        emojis.append(R.drawable.emoji_shy, "^shy^");
+        emojis.append(R.drawable.emoji_music, "^music_listen^");
+        emojis.append(R.drawable.emoji_shamed_bag, "^bagface^");
+        emojis.append(R.drawable.emoji_rotfl, "^rotate^");
+        emojis.append(R.drawable.emoji_love, "^love^");
+        emojis.append(R.drawable.emoji_speech, "^speech^");
+        emojis.append(R.drawable.emoji_facepalm, "^facepalm^");
+        emojis.append(R.drawable.emoji_shocked2, "^shocked^");
+        emojis.append(R.drawable.emoji_extremely_shocked, "^ex_shocked^");
+        emojis.append(R.drawable.emoji_smurf, "^smurf^");
 
-        emojis.append(R.drawable.heart, "<3");
-        // this was twice in the original page for some reason, with another alias "locked"
-        emojis.append(R.drawable.locked, "^lock^");
-        emojis.append(R.drawable.roll_over, "^rollover^");
-        emojis.append(R.drawable.redface, "^redface^");
-        emojis.append(R.drawable.confused, "^confused^");
-        emojis.append(R.drawable.innocent, "^innocent^");
-        emojis.append(R.drawable.sleep, "^sleep^");
-        emojis.append(R.drawable.lips_sealed, "^sealed^");
-        emojis.append(R.drawable.cool, "^cool^");
-        emojis.append(R.drawable.crazy, "^crazy^");
-        emojis.append(R.drawable.mad, "^mad^");
-        emojis.append(R.drawable.wav, "^wav^");
-        emojis.append(R.drawable.binkybaby, "^binkybaby^");
-        emojis.append(R.drawable.police, "^police^");
-        emojis.append(R.drawable.dontknow, "^dontknow^");
-        // the next two are the same thing?
-        emojis.append(R.drawable.angry4, ":angry4:");
-        emojis.append(R.drawable.angry_hot, "^angryhot^");
-        emojis.append(R.drawable.foyska, "^fouska^");
-        emojis.append(R.drawable.e10_7_3e, "^sfinaki^");
-        emojis.append(R.drawable.bang_head, "^banghead^");
-        emojis.append(R.drawable.crybaby, "^crybaby^");
-        emojis.append(R.drawable.hello, "^hello^");
-        emojis.append(R.drawable.jerk, "^jerk^");
-        emojis.append(R.drawable.nono, "^nono^");
-        emojis.append(R.drawable.notworthy, "^notworthy^");
-        emojis.append(R.drawable.off_topic, "^off-topic^");
-        emojis.append(R.drawable.puke, "^puke^");
-        emojis.append(R.drawable.shout, "^shout^");
-        emojis.append(R.drawable.slurp, "^slurp^");
-        emojis.append(R.drawable.superconfused, "^superconfused^");
-        emojis.append(R.drawable.superinnocent, "^superinnocent^");
-        emojis.append(R.drawable.cell_phone, "^cellPhone^");
-        emojis.append(R.drawable.idiot, "^idiot^");
-        emojis.append(R.drawable.knuppel, "^knuppel^");
-        emojis.append(R.drawable.tickedoff, "^tickedOff^");
-        emojis.append(R.drawable.peace, "^peace^");
-        emojis.append(R.drawable.suspicious, "^suspicious^");
-        emojis.append(R.drawable.caffine, "^caffine^");
-        emojis.append(R.drawable.argue, "^argue^");
-        emojis.append(R.drawable.banned2, "^banned2^");
-        emojis.append(R.drawable.banned, "^banned^");
-        emojis.append(R.drawable.bath, "^bath^");
-        emojis.append(R.drawable.beg, "^beg^");
-        emojis.append(R.drawable.bluescreen, "^bluescreen^");
-        emojis.append(R.drawable.boil, "^boil^");
-        emojis.append(R.drawable.bye, "^bye^");
-        emojis.append(R.drawable.callmerip, "^callmerip^");
-        emojis.append(R.drawable.carnaval, "^carnaval^");
-        emojis.append(R.drawable.clap, "^clap^");
-        emojis.append(R.drawable.coffeepot, "^coffepot^");
-        emojis.append(R.drawable.crap, "^crap^");
-        emojis.append(R.drawable.curses, "^curses^");
-        emojis.append(R.drawable.funny, "^funny^");
-        emojis.append(R.drawable.guitar1, "^guitar^");
-        emojis.append(R.drawable.icon_kissy, "^kissy^");
-        emojis.append(R.drawable.band, "^band^");
-        emojis.append(R.drawable.ivres, "^ivres^");
-        emojis.append(R.drawable.kaloe, "^kaloe^");
-        emojis.append(R.drawable.kremala, "^kremala^");
-        emojis.append(R.drawable.moon, "^moon^");
-        emojis.append(R.drawable.mopping, "^mopping^");
-        emojis.append(R.drawable.mountza, "^mountza^");
-        emojis.append(R.drawable.pcsleep, "^pcsleep^");
-        emojis.append(R.drawable.pinokio, "^pinokio^");
-        emojis.append(R.drawable.poke, "^poke^");
-        emojis.append(R.drawable.seestars, "^seestars^");
-        emojis.append(R.drawable.sfyri, "^sfyri^");
-        emojis.append(R.drawable.spam2, "^spam^");
-        emojis.append(R.drawable.esuper, "^super^");
-        emojis.append(R.drawable.tafos, "^tafos^");
-        emojis.append(R.drawable.tomatomourh, "^tomato^");
-        emojis.append(R.drawable.ytold, "^ytold^");
-        emojis.append(R.drawable.beer2, "^beer^");
-        emojis.append(R.drawable.yu, "^yue^");
-        emojis.append(R.drawable.a_eatpaper, "^eatpaper^");
-        emojis.append(R.drawable.fritz, "^fritz^");
-        emojis.append(R.drawable.wade, "^wade^");
-        emojis.append(R.drawable.lypi, "^lypi^");
-        emojis.append(R.drawable.megashok1wq, "^aytoxeir^");
-        emojis.append(R.drawable.victory, "^victory^");
-        emojis.append(R.drawable.filarakia, "^filarakia^");
-        emojis.append(R.drawable.bonjour_97213, "^hat^");
-        emojis.append(R.drawable.curtseyqi9, "^miss^");
-        emojis.append(R.drawable.rofl, "^rolfmao^");
-        emojis.append(R.drawable.question, "^que^");
-        emojis.append(R.drawable.shifty, "^shifty^");
-        emojis.append(R.drawable.shy, "^shy^");
-        emojis.append(R.drawable.music, "^music_listen^");
-        emojis.append(R.drawable.shamed_bag, "^bagface^");
-        emojis.append(R.drawable.rotfl, "^rotate^");
-        emojis.append(R.drawable.love, "^love^");
-        emojis.append(R.drawable.speech, "^speech^");
-        emojis.append(R.drawable.facepalm, "^facepalm^");
-        emojis.append(R.drawable.shocked, "^shocked^");
-        emojis.append(R.drawable.extremely_shocked, "^ex_shocked^");
-        emojis.append(R.drawable.smurf, "^smurf^");
-
-        GridView emojiGridView = (GridView) findViewById(R.id.emoji_gridview);
+        GridView emojiGridView = findViewById(R.id.emoji_gridview);
         emojiGridView.setAdapter(new ImageKeyboardAdapter(context, getEmojiArray()));
         emojiGridView.setOnItemClickListener((parent, view, position, id) -> {
             if (inputConnection == null) return;
             String value = emojis.valueAt(position);
             inputConnection.commitText(value, 1);
         });
-        AppCompatImageButton backspaceButton = (AppCompatImageButton) findViewById(R.id.backspace_button);
+        AppCompatImageButton backspaceButton = findViewById(R.id.backspace_button);
         // backspace behavior
         final Handler handler = new Handler();
         Runnable longPressed = new Runnable() {