Improve compatibility with Java Code. (#786)

vanniktech · May 16, 2022 · 91bd342 · 91bd342
1 parent 34bc52a
commit 91bd342
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 61 deletions.
diff --git a/emoji/api/current.txt b/emoji/api/current.txt
diff --git a/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiInformation.kt b/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiInformation.kt
@@ -17,6 +17,6 @@
 package com.vanniktech.emoji
 
 data class EmojiInformation internal constructor(
-  val isOnlyEmojis: Boolean,
-  val emojis: List<EmojiRange>,
+  @JvmField val isOnlyEmojis: Boolean,
+  @JvmField val emojis: List<EmojiRange>,
 )
diff --git a/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiManager.kt b/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiManager.kt
@@ -33,7 +33,7 @@ object EmojiManager {
   internal var emojiRepetitivePattern: Regex? = null
   private var emojiReplacer: EmojiReplacer? = null
 
-  fun replaceWithImages(context: Context?, text: Spannable?, emojiSize: Float) {
+  @JvmStatic fun replaceWithImages(context: Context?, text: Spannable?, emojiSize: Float) {
     verifyInstalled()
     emojiReplacer!!.replaceWithImages(context!!, text!!, emojiSize, DEFAULT_EMOJI_REPLACER)
   }
@@ -103,7 +103,7 @@ object EmojiManager {
    *
    * [provider] the provider that should be installed.
    */
-  fun install(provider: EmojiProvider) {
+  @JvmStatic fun install(provider: EmojiProvider) {
     synchronized(EmojiManager::class.java) {
       categories = provider.categories
       emojiMap.clear()
@@ -150,7 +150,7 @@ object EmojiManager {
    *
    * @see .destroy
    */
-  fun destroy() {
+  @JvmStatic fun destroy() {
     synchronized(EmojiManager::class.java) {
       release()
       emojiMap.clear()
@@ -170,7 +170,7 @@ object EmojiManager {
    *
    * @see .destroy
    */
-  fun release() {
+  @JvmStatic fun release() {
     synchronized(EmojiManager::class.java) {
       for (emoji in emojiMap.values) {
         emoji.destroy()

diff --git a/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiPopup.kt b/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiPopup.kt
@@ -52,7 +52,7 @@ import com.vanniktech.emoji.variant.VariantEmoji
 import com.vanniktech.emoji.variant.VariantEmojiManager
 import java.lang.ref.WeakReference
 
-class EmojiPopup(
+class EmojiPopup @JvmOverloads constructor(
   /** The root View of your layout.xml which will be used for calculating the height of the keyboard. */
   rootView: View,
   private val editText: EditText,

diff --git a/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiRange.kt b/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiRange.kt
@@ -17,6 +17,6 @@
 package com.vanniktech.emoji
 
 data class EmojiRange(
-  val emoji: Emoji,
-  val range: IntRange,
+  @JvmField val emoji: Emoji,
+  @JvmField val range: IntRange,
 )
diff --git a/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiTheming.kt b/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiTheming.kt
@@ -23,48 +23,39 @@ import androidx.annotation.ColorInt
 import kotlinx.parcelize.Parcelize
 
 /** Control the colors of all Emoji UI components. */
-@Parcelize data class EmojiTheming(
+@Parcelize data class EmojiTheming @JvmOverloads constructor(
   /**
    * If set, it will be taken.
    * Otherwise it'll look for a theme attribute called emojiBackgroundColor.
    * If that isn't found, the library has a default.
    */
-  @ColorInt val backgroundColor: Int?,
+  @ColorInt @JvmField val backgroundColor: Int? = null,
   /**
    * If set, it will be taken.
    * Otherwise it'll take the color from your theme.
    */
-  @ColorInt val primaryColor: Int?,
+  @ColorInt @JvmField val primaryColor: Int? = null,
   /**
    * If set, it will be taken.
    * Otherwise it'll take the color from your theme.
    */
-  @ColorInt val secondaryColor: Int?,
+  @ColorInt @JvmField val secondaryColor: Int? = null,
   /**
    * If set, it will be taken.
    * Otherwise it'll look for a theme attribute called emojiDividerColor.
    * If that isn't found, the library has a default.
    */
-  @ColorInt val dividerColor: Int?,
+  @ColorInt @JvmField val dividerColor: Int? = null,
   /**
    * If set, it will be taken.
    * Otherwise it'll look for a theme attribute called emojiTextColor.
    * If that isn't found, the library has a default.
    */
-  @ColorInt val textColor: Int?,
+  @ColorInt @JvmField val textColor: Int? = null,
   /**
    * If set, it will be taken.
    * Otherwise it'll look for a theme attribute called emojiTextSecondaryColor.
    * If that isn't found, the library has a default.
    */
-  @ColorInt val textSecondaryColor: Int?,
-) : Parcelable {
-  constructor() : this(
-    backgroundColor = null,
-    primaryColor = null,
-    secondaryColor = null,
-    dividerColor = null,
-    textColor = null,
-    textSecondaryColor = null,
-  )
-}
+  @ColorInt @JvmField val textSecondaryColor: Int? = null,
+) : Parcelable
diff --git a/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiView.kt b/emoji/src/main/kotlin/com/vanniktech/emoji/EmojiView.kt
@@ -79,7 +79,7 @@ class EmojiView @JvmOverloads constructor(
    * Call this method to set up the EmojiView.
    * Once you're done with it, please call [.tearDown].
    */
-  fun setUp(
+  @JvmOverloads fun setUp(
     rootView: View,
     onEmojiClickListener: OnEmojiClickListener?,
     onEmojiBackspaceClickListener: OnEmojiBackspaceClickListener?,

diff --git a/emoji/src/main/kotlin/com/vanniktech/emoji/search/SearchEmojiResult.kt b/emoji/src/main/kotlin/com/vanniktech/emoji/search/SearchEmojiResult.kt
@@ -19,10 +19,10 @@ package com.vanniktech.emoji.search
 import com.vanniktech.emoji.Emoji
 
 data class SearchEmojiResult(
-  val emoji: Emoji,
-  val shortcode: String,
+  @JvmField val emoji: Emoji,
+  @JvmField val shortcode: String,
   /** The range in [shortcode], which matches the query. This is used for highlighting. */
-  val range: IntRange,
+  @JvmField val range: IntRange,
 ) {
   init {
     require(range.first in shortcode.indices) { "Index ${range.first} is out of bounds in $shortcode" }