Crash early. (#89)

vanniktech · Feb 14, 2017 · be5db45 · be5db45
1 parent 6e11413
commit be5db45
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/emoji/src/main/java/com/vanniktech/emoji/EmojiEditText.java b/emoji/src/main/java/com/vanniktech/emoji/EmojiEditText.java
@@ -21,6 +21,10 @@ public EmojiEditText(final Context context, final AttributeSet attrs) {
   }
 
   private void init(@Nullable final AttributeSet attrs) {
+    if (!isInEditMode()) {
+      EmojiManager.getInstance().verifyInstalled();
+    }
+
     if (attrs == null) {
       emojiSize = (int) getTextSize();
     } else {

diff --git a/emoji/src/main/java/com/vanniktech/emoji/EmojiManager.java b/emoji/src/main/java/com/vanniktech/emoji/EmojiManager.java
@@ -8,6 +8,9 @@
 
 import static com.vanniktech.emoji.Utils.checkNotNull;
 
+/**
+ * EmojiManager where an EmojiProvider can be installed for further usage.
+ */
 public final class EmojiManager {
   private static final EmojiManager INSTANCE = new EmojiManager();
 
@@ -22,6 +25,13 @@ static EmojiManager getInstance() {
     return INSTANCE;
   }
 
+  /**
+   * Installs the given EmojiProvider.
+   *
+   * NOTE: That only one can be present at any time.
+   *
+   * @param provider the provider that should be installed.
+   */
   public static void install(@NonNull final EmojiProvider provider) {
     INSTANCE.categories = checkNotNull(provider.getCategories(), "categories == null");
     INSTANCE.emojiTree.clear();
@@ -47,9 +57,9 @@ EmojiCategory[] getCategories() {
     return emojiTree.findEmoji(candiate);
   }
 
-  private void verifyInstalled() {
+  void verifyInstalled() {
     if (categories == null) {
-      throw new IllegalStateException("Please install an EmojiProvider through the install method first.");
+      throw new IllegalStateException("Please install an EmojiProvider through the EmojiManager.install() method first.");
     }
   }
 }
diff --git a/emoji/src/main/java/com/vanniktech/emoji/EmojiPopup.java b/emoji/src/main/java/com/vanniktech/emoji/EmojiPopup.java
@@ -252,7 +252,7 @@ private Builder(final View rootView) {
 
     /**
      * allows you to pass your own implementation of recent emojis. If not provided the default one
-     * ({@link RecentEmojiManager} will be used
+     * {@link RecentEmojiManager} will be used
      *
      * @since 0.2.0
      */
@@ -262,6 +262,7 @@ private Builder(final View rootView) {
     }
 
     @CheckResult public EmojiPopup build(@NonNull final EmojiEditText emojiEditText) {
+      EmojiManager.getInstance().verifyInstalled();
       checkNotNull(emojiEditText, "EmojiEditText can't be null");
 
       final EmojiPopup emojiPopup = new EmojiPopup(rootView, emojiEditText, recentEmoji);

diff --git a/emoji/src/main/java/com/vanniktech/emoji/EmojiTextView.java b/emoji/src/main/java/com/vanniktech/emoji/EmojiTextView.java
@@ -20,6 +20,10 @@ public EmojiTextView(final Context context, final AttributeSet attrs) {
   }
 
   private void init(@Nullable final AttributeSet attrs) {
+    if (!isInEditMode()) {
+      EmojiManager.getInstance().verifyInstalled();
+    }
+
     if (attrs == null) {
       emojiSize = (int) getTextSize();
     } else {