add keyboard layout（2017-09-05）

CarGuo · Sep 5, 2017 · 35d38bb · 35d38bb
1 parent 2667e58
commit 35d38bb
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 28 deletions.
diff --git a/app/src/main/java/com/example/richtext/MainActivity.java b/app/src/main/java/com/example/richtext/MainActivity.java
@@ -240,7 +240,7 @@ public LinkSpan getCustomLinkSpan(Context context, String url, int color, SpanUr
         }
     };
 
-    @OnClick({R.id.emoji_show_bottom, R.id.emoji_show_at, R.id.insert_text_btn, R.id.jump_btn, R.id.emoji_show_topic, R.id.jump_mvvm})
+    @OnClick({R.id.emoji_show_bottom, R.id.emoji_show_at, R.id.insert_text_btn, R.id.jump_btn, R.id.emoji_show_topic, R.id.jump_mvvm, R.id.emoji_edit_text})
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.emoji_show_bottom:
@@ -288,6 +288,9 @@ public void onClick(View view) {
             case R.id.jump_mvvm:
                 startActivity(new Intent(MainActivity.this, MVVMActivity.class));
                 break;
+            case R.id.emoji_edit_text:
+                emojiLayout.setVisibility(View.GONE);
+                break;
         }
     }
 

diff --git a/app/src/main/java/com/example/richtext/NewEmojiActivity.java b/app/src/main/java/com/example/richtext/NewEmojiActivity.java
@@ -56,12 +56,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         emojiLayout.setEditTextSmile(editText);
         keyboardLayout.setEmojiLayout(emojiLayout);
-        emojiLayout.setEditTextClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                keyboardLayout.hideEmojiKeyLockHeight();
-            }
-        });
 
     }
 
@@ -87,12 +81,15 @@ private void initEmoji() {
         SmileUtils.addPatternAll(SmileUtils.getEmoticons(), strings, data);
     }
 
-    @OnClick({R.id.emoji_show_bottom})
+    @OnClick({R.id.emoji_show_bottom, R.id.edit_text})
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.emoji_show_bottom:
                 keyboardLayout.showEmojiKeyLockHeight();
                 break;
+            case R.id.edit_text:
+                keyboardLayout.hideEmojiKeyLockHeight();
+                break;
         }
     }
 }
diff --git a/app/src/main/java/com/example/richtext/model/MVViewModel.java b/app/src/main/java/com/example/richtext/model/MVViewModel.java
@@ -239,6 +239,10 @@ public void showEmoji() {
         }
     }
 
+    public void hideEmojiLayout() {
+        emojiShow.set(false);
+    }
+
     private final OnEditTextUtilJumpListener onEditTextUtilJumpListener = new OnEditTextUtilJumpListener() {
         @Override
         public void notifyAt() {

diff --git a/app/src/main/res/layout/activity_mvvm.xml b/app/src/main/res/layout/activity_mvvm.xml
@@ -75,6 +75,7 @@
             android:textColor="@color/white"
             android:textColorHint="@color/graY"
             android:visibility="@{viewmodel.editTextShow ? View.VISIBLE : View.GONE}"
+            android:onClick="@{() -> viewmodel.hideEmojiLayout()}"
             app:atResult="@{viewmodel.atResult}"
             app:atResultByEnter="@{viewmodel.atResultByEnter}"
             app:editTextAtUtilJumpListener="@{viewmodel.editJump}"
@@ -116,12 +117,15 @@
             android:id="@+id/mvvm_rich_text_edit_img_btn"
             android:layout_width="wrap_content"
             android:layout_height="40dp"
-            android:layout_below="@+id/mvvm_rich_text_base_line"
-            android:layout_margin="10dp"
-            android:layout_toRightOf="@+id/mvvm_rich_text_edit_text_btn"
             android:onClick="@{() -> viewmodel.showEmoji()}"
             android:text="表情"
-            android:visibility="@{viewmodel.editTextShow ? View.VISIBLE : View.GONE}" />
+            android:visibility="@{viewmodel.editTextShow ? View.VISIBLE : View.GONE}"
+            android:layout_marginLeft="11dp"
+            android:layout_alignBaseline="@+id/mvvm_rich_text_edit_text_btn"
+            android:layout_alignBottom="@+id/mvvm_rich_text_edit_text_btn"
+            android:layout_toRightOf="@+id/mvvm_rich_text_edit_text_btn"
+            android:layout_toEndOf="@+id/mvvm_rich_text_edit_text_btn"
+            android:layout_marginStart="11dp" />
 
         <com.shuyu.textutillib.EmojiLayout
             android:id="@+id/mvvm_rich_text_edit_emojiLayout"

diff --git a/textUtilsLib/src/main/java/com/shuyu/textutillib/EmojiLayout.java b/textUtilsLib/src/main/java/com/shuyu/textutillib/EmojiLayout.java
@@ -44,7 +44,6 @@ public class EmojiLayout extends LinearLayout {
     private Drawable focusIndicator;
     private Drawable unFocusIndicator;
     private String deleteIconName = "delete_expression";
-    private View.OnClickListener editTextClickListener;
 
     private int richMarginBottom;
     private int richMarginTop;
@@ -283,22 +282,7 @@ public RichEditText getEditTextSmile() {
         return editTextEmoji;
     }
 
-
-    public void setEditTextClickListener(OnClickListener editTextClickListener) {
-        this.editTextClickListener = editTextClickListener;
-    }
-
     public void setEditTextSmile(RichEditText editTextSmile) {
         this.editTextEmoji = editTextSmile;
-        editTextSmile.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (editTextClickListener != null) {
-                    editTextClickListener.onClick(v);
-                } else {
-                    setVisibility(GONE);
-                }
-            }
-        });
     }
 }