Refactoring: Start moving most of the Trait infrastructure into its o…

…wn package. (#637)
vanniktech · Apr 28, 2022 · 3dee056 · 3dee056
1 parent b992f0d
commit 3dee056
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 21 deletions.
diff --git a/app/src/main/java/com/vanniktech/emoji/sample/CustomViewActivity.java b/app/src/main/java/com/vanniktech/emoji/sample/CustomViewActivity.java
@@ -28,7 +28,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import com.vanniktech.emoji.EmojiEditText;
 import com.vanniktech.emoji.EmojiPopup;
-import com.vanniktech.emoji.EmojiTrait;
+import com.vanniktech.emoji.traits.EmojiTrait;
 
 public class CustomViewActivity extends AppCompatActivity {
   @Override protected void onCreate(final Bundle savedInstanceState) {

diff --git a/app/src/main/java/com/vanniktech/emoji/sample/MainActivity.java b/app/src/main/java/com/vanniktech/emoji/sample/MainActivity.java
@@ -40,12 +40,12 @@
 import com.vanniktech.emoji.EmojiEditText;
 import com.vanniktech.emoji.EmojiManager;
 import com.vanniktech.emoji.EmojiPopup;
-import com.vanniktech.emoji.EmojiTrait;
 import com.vanniktech.emoji.facebook.FacebookEmojiProvider;
 import com.vanniktech.emoji.google.GoogleEmojiProvider;
 import com.vanniktech.emoji.googlecompat.GoogleCompatEmojiProvider;
 import com.vanniktech.emoji.ios.IosEmojiProvider;
 import com.vanniktech.emoji.material.MaterialEmojiLayoutFactory;
+import com.vanniktech.emoji.traits.EmojiTrait;
 import com.vanniktech.emoji.twitter.TwitterEmojiProvider;
 
 import static android.view.View.GONE;

diff --git a/emoji-material/src/main/java/com/vanniktech/emoji/material/EmojiTextInputEditText.java b/emoji-material/src/main/java/com/vanniktech/emoji/material/EmojiTextInputEditText.java
@@ -31,10 +31,10 @@
 import com.vanniktech.emoji.EmojiInput;
 import com.vanniktech.emoji.EmojiManager;
 import com.vanniktech.emoji.EmojiPopup;
-import com.vanniktech.emoji.EmojiTrait;
 import com.vanniktech.emoji.SearchInPlaceTrait;
-import com.vanniktech.emoji.ForceSingleEmojiTrait;
 import com.vanniktech.emoji.emoji.Emoji;
+import com.vanniktech.emoji.traits.EmojiTrait;
+import com.vanniktech.emoji.traits.ForceSingleEmojiTrait;
 
 public class EmojiTextInputEditText extends TextInputEditText implements EmojiEditable, EmojiInput {
   private float emojiSize;

diff --git a/emoji/src/main/java/com/vanniktech/emoji/EmojiEditText.java b/emoji/src/main/java/com/vanniktech/emoji/EmojiEditText.java
@@ -28,6 +28,8 @@
 import androidx.annotation.Px;
 import androidx.appcompat.widget.AppCompatEditText;
 import com.vanniktech.emoji.emoji.Emoji;
+import com.vanniktech.emoji.traits.EmojiTrait;
+import com.vanniktech.emoji.traits.ForceSingleEmojiTrait;
 
 /** Reference implementation for an EditText with emoji support. */
 public class EmojiEditText extends AppCompatEditText implements EmojiEditable, EmojiInput {

diff --git a/emoji/src/main/java/com/vanniktech/emoji/EmojiInput.kt b/emoji/src/main/java/com/vanniktech/emoji/EmojiInput.kt
@@ -16,6 +16,8 @@
  */
 package com.vanniktech.emoji
 
+import com.vanniktech.emoji.traits.EmojiTrait
+
 interface EmojiInput {
   /** Returns true when [enableKeyboardInput] was called and otherwise false.  */
   val isKeyboardInputDisabled: Boolean

diff --git a/emoji/src/main/java/com/vanniktech/emoji/EmojiTrait.kt b/emoji/src/main/java/com/vanniktech/emoji/EmojiTrait.kt
diff --git a/emoji/src/main/java/com/vanniktech/emoji/SearchInPlaceTrait.kt b/emoji/src/main/java/com/vanniktech/emoji/SearchInPlaceTrait.kt
@@ -6,6 +6,9 @@ import android.text.Editable
 import android.text.TextWatcher
 import android.widget.EditText
 import com.vanniktech.emoji.emoji.Emoji
+import com.vanniktech.emoji.traits.EmojiTrait
+import com.vanniktech.emoji.traits.EmojiTraitable
+import com.vanniktech.emoji.traits.EmptyEmojiTrait
 
 /**
  * Popup similar to how Telegram and Slack does it to search for an Emoji

diff --git a/emoji/src/main/java/com/vanniktech/emoji/traits/EmojiTrait.kt b/emoji/src/main/java/com/vanniktech/emoji/traits/EmojiTrait.kt
@@ -0,0 +1,6 @@
+package com.vanniktech.emoji.traits
+
+interface EmojiTrait {
+  /** Call this method to reverse the [EmojiTraitable] that you installed. */
+  fun uninstall()
+}
diff --git a/emoji/src/main/java/com/vanniktech/emoji/traits/EmojiTraitable.kt b/emoji/src/main/java/com/vanniktech/emoji/traits/EmojiTraitable.kt
@@ -0,0 +1,7 @@
+package com.vanniktech.emoji.traits
+
+import android.widget.EditText
+
+interface EmojiTraitable {
+  fun install(editText: EditText): EmojiTrait
+}
diff --git a/emoji/src/main/java/com/vanniktech/emoji/traits/EmptyEmojiTrait.kt b/emoji/src/main/java/com/vanniktech/emoji/traits/EmptyEmojiTrait.kt
@@ -0,0 +1,5 @@
+package com.vanniktech.emoji.traits
+
+internal object EmptyEmojiTrait : EmojiTrait {
+  override fun uninstall() = Unit
+}
diff --git a/...vanniktech/emoji/ForceSingleEmojiTrait.kt → ...ech/emoji/traits/ForceSingleEmojiTrait.kt b/...vanniktech/emoji/ForceSingleEmojiTrait.kt → ...ech/emoji/traits/ForceSingleEmojiTrait.kt
@@ -14,11 +14,12 @@
  * limitations under the License.
  *
  */
-package com.vanniktech.emoji
+package com.vanniktech.emoji.traits
 
 import android.text.Editable
 import android.text.TextWatcher
 import android.widget.EditText
+import com.vanniktech.emoji.OnlyEmojisInputFilter
 
 /**
  * Forces the [EditText] to only contain one Emoji,