Emoji classes are now parcelable.

vanniktech · May 5, 2022 · 913a7e0 · 913a7e0
1 parent 84070d1
commit 913a7e0
Show file tree

Hide file tree

Showing 15 changed files with 71 additions and 57 deletions.
diff --git a/emoji-facebook/build.gradle b/emoji-facebook/build.gradle
@@ -2,6 +2,7 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
 
 android {
   compileSdkVersion rootProject.ext.compileSdkVersion as int
@@ -26,4 +27,4 @@ apply plugin: "com.vanniktech.maven.publish.base"
 
 mavenPublishing {
   configure(new AndroidSingleVariantLibrary("release"))
-}
+}
diff --git a/emoji-facebook/src/main/kotlin/com/vanniktech/emoji/facebook/FacebookEmoji.kt b/emoji-facebook/src/main/kotlin/com/vanniktech/emoji/facebook/FacebookEmoji.kt
@@ -22,20 +22,23 @@ import android.graphics.BitmapFactory
 import android.graphics.Point
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import android.os.Parcelable
 import android.util.LruCache
 import com.vanniktech.emoji.emoji.Emoji
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 import java.lang.ref.SoftReference
 
-internal data class FacebookEmoji internal constructor(
+@Parcelize internal data class FacebookEmoji internal constructor(
   override val unicode: String,
   override val shortcodes: List<String>,
   private val x: Int,
   private val y: Int,
   override val isDuplicate: Boolean,
   override val variants: List<FacebookEmoji> = emptyList(),
   private var parent: FacebookEmoji? = null,
-) : Emoji {
-  override val base by lazy(LazyThreadSafetyMode.NONE) {
+) : Emoji, Parcelable {
+  @IgnoredOnParcel override val base by lazy(LazyThreadSafetyMode.NONE) {
     var result = this
     while (result.parent != null) {
       result = result.parent!!

diff --git a/emoji-google-compat/build.gradle b/emoji-google-compat/build.gradle
@@ -2,6 +2,7 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
 
 android {
   compileSdkVersion rootProject.ext.compileSdkVersion as int
@@ -27,4 +28,4 @@ apply plugin: "com.vanniktech.maven.publish.base"
 
 mavenPublishing {
   configure(new AndroidSingleVariantLibrary("release"))
-}
+}
diff --git a/emoji-google-compat/src/main/kotlin/com/vanniktech/emoji/googlecompat/GoogleCompatEmoji.kt b/emoji-google-compat/src/main/kotlin/com/vanniktech/emoji/googlecompat/GoogleCompatEmoji.kt
@@ -18,16 +18,19 @@ package com.vanniktech.emoji.googlecompat
 
 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.os.Parcelable
 import com.vanniktech.emoji.emoji.Emoji
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 
-internal data class GoogleCompatEmoji internal constructor(
+@Parcelize internal data class GoogleCompatEmoji internal constructor(
   override val unicode: String,
   override val shortcodes: List<String>,
   override val isDuplicate: Boolean,
   override val variants: List<GoogleCompatEmoji> = emptyList(),
   private var parent: GoogleCompatEmoji? = null,
-) : Emoji {
-  override val base by lazy(LazyThreadSafetyMode.NONE) {
+) : Emoji, Parcelable {
+  @IgnoredOnParcel override val base by lazy(LazyThreadSafetyMode.NONE) {
     var result = this
     while (result.parent != null) {
       result = result.parent!!

diff --git a/emoji-google/build.gradle b/emoji-google/build.gradle
@@ -2,6 +2,7 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
 
 android {
   compileSdkVersion rootProject.ext.compileSdkVersion as int
@@ -26,4 +27,4 @@ apply plugin: "com.vanniktech.maven.publish.base"
 
 mavenPublishing {
   configure(new AndroidSingleVariantLibrary("release"))
-}
+}
diff --git a/emoji-google/src/main/kotlin/com/vanniktech/emoji/google/GoogleEmoji.kt b/emoji-google/src/main/kotlin/com/vanniktech/emoji/google/GoogleEmoji.kt
@@ -22,20 +22,23 @@ import android.graphics.BitmapFactory
 import android.graphics.Point
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import android.os.Parcelable
 import android.util.LruCache
 import com.vanniktech.emoji.emoji.Emoji
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 import java.lang.ref.SoftReference
 
-internal data class GoogleEmoji internal constructor(
+@Parcelize internal data class GoogleEmoji internal constructor(
   override val unicode: String,
   override val shortcodes: List<String>,
   private val x: Int,
   private val y: Int,
   override val isDuplicate: Boolean,
   override val variants: List<GoogleEmoji> = emptyList(),
   private var parent: GoogleEmoji? = null,
-) : Emoji {
-  override val base by lazy(LazyThreadSafetyMode.NONE) {
+) : Emoji, Parcelable {
+  @IgnoredOnParcel override val base by lazy(LazyThreadSafetyMode.NONE) {
     var result = this
     while (result.parent != null) {
       result = result.parent!!

diff --git a/emoji-ios/build.gradle b/emoji-ios/build.gradle
@@ -2,6 +2,7 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
 
 android {
   compileSdkVersion rootProject.ext.compileSdkVersion as int
@@ -30,4 +31,4 @@ apply plugin: "com.vanniktech.maven.publish.base"
 
 mavenPublishing {
   configure(new AndroidSingleVariantLibrary("release"))
-}
+}
diff --git a/emoji-ios/src/main/kotlin/com/vanniktech/emoji/ios/IosEmoji.kt b/emoji-ios/src/main/kotlin/com/vanniktech/emoji/ios/IosEmoji.kt
@@ -22,20 +22,23 @@ import android.graphics.BitmapFactory
 import android.graphics.Point
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import android.os.Parcelable
 import android.util.LruCache
 import com.vanniktech.emoji.emoji.Emoji
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 import java.lang.ref.SoftReference
 
-internal data class IosEmoji internal constructor(
+@Parcelize internal data class IosEmoji internal constructor(
   override val unicode: String,
   override val shortcodes: List<String>,
   private val x: Int,
   private val y: Int,
   override val isDuplicate: Boolean,
   override val variants: List<IosEmoji> = emptyList(),
   private var parent: IosEmoji? = null,
-) : Emoji {
-  override val base by lazy(LazyThreadSafetyMode.NONE) {
+) : Emoji, Parcelable {
+  @IgnoredOnParcel override val base by lazy(LazyThreadSafetyMode.NONE) {
     var result = this
     while (result.parent != null) {
       result = result.parent!!

diff --git a/emoji-material/build.gradle b/emoji-material/build.gradle
@@ -2,6 +2,7 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
 
 android {
   compileSdkVersion rootProject.ext.compileSdkVersion as int
@@ -27,4 +28,4 @@ apply plugin: "com.vanniktech.maven.publish.base"
 
 mavenPublishing {
   configure(new AndroidSingleVariantLibrary("release"))
-}
+}
diff --git a/emoji-twitter/build.gradle b/emoji-twitter/build.gradle
@@ -2,6 +2,7 @@ import com.vanniktech.maven.publish.AndroidSingleVariantLibrary
 
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
 
 android {
   compileSdkVersion rootProject.ext.compileSdkVersion as int
@@ -26,4 +27,4 @@ apply plugin: "com.vanniktech.maven.publish.base"
 
 mavenPublishing {
   configure(new AndroidSingleVariantLibrary("release"))
-}
+}
diff --git a/emoji-twitter/src/main/kotlin/com/vanniktech/emoji/twitter/TwitterEmoji.kt b/emoji-twitter/src/main/kotlin/com/vanniktech/emoji/twitter/TwitterEmoji.kt
@@ -22,20 +22,23 @@ import android.graphics.BitmapFactory
 import android.graphics.Point
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import android.os.Parcelable
 import android.util.LruCache
 import com.vanniktech.emoji.emoji.Emoji
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 import java.lang.ref.SoftReference
 
-internal data class TwitterEmoji internal constructor(
+@Parcelize internal data class TwitterEmoji internal constructor(
   override val unicode: String,
   override val shortcodes: List<String>,
   private val x: Int,
   private val y: Int,
   override val isDuplicate: Boolean,
   override val variants: List<TwitterEmoji> = emptyList(),
   private var parent: TwitterEmoji? = null,
-) : Emoji {
-  override val base by lazy(LazyThreadSafetyMode.NONE) {
+) : Emoji, Parcelable {
+  @IgnoredOnParcel override val base by lazy(LazyThreadSafetyMode.NONE) {
     var result = this
     while (result.parent != null) {
       result = result.parent!!

diff --git a/emoji/src/main/kotlin/com/vanniktech/emoji/emoji/Emoji.kt b/emoji/src/main/kotlin/com/vanniktech/emoji/emoji/Emoji.kt
@@ -18,8 +18,9 @@ package com.vanniktech.emoji.emoji
 
 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.os.Parcelable
 
-interface Emoji {
+interface Emoji : Parcelable {
   val base: Emoji
   val unicode: String
   val shortcodes: List<String>

diff --git a/emoji/src/test/kotlin/com/vanniktech/emoji/TestEmoji.kt b/emoji/src/test/kotlin/com/vanniktech/emoji/TestEmoji.kt
@@ -1,19 +1,26 @@
 package com.vanniktech.emoji
 
 import android.content.Context
+import android.os.Parcelable
 import com.vanniktech.emoji.emoji.Emoji
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 
-class TestEmoji(
-  codePoints: IntArray,
+@Parcelize data class TestEmoji(
+  override val unicode: String,
   override val shortcodes: List<String>,
   override val isDuplicate: Boolean,
   override val variants: List<TestEmoji> = emptyList(),
-) : Emoji {
-  override val unicode: String = String(codePoints, 0, codePoints.size)
-
-  private var parent: TestEmoji? = null
-
-  override val base by lazy(LazyThreadSafetyMode.NONE) {
+  private var parent: TestEmoji? = null,
+) : Emoji, Parcelable {
+  constructor(
+    codePoints: IntArray,
+    shortcodes: List<String>,
+    isDuplicate: Boolean,
+    variants: List<TestEmoji> = emptyList(),
+  ) : this(String(codePoints, 0, codePoints.size), shortcodes, isDuplicate, variants)
+
+  @IgnoredOnParcel override val base by lazy(LazyThreadSafetyMode.NONE) {
     var result = this
     while (result.parent != null) {
       result = result.parent!!
@@ -28,27 +35,6 @@ class TestEmoji(
     }
   }
 
-  override fun equals(other: Any?): Boolean {
-    if (this === other) {
-      return true
-    }
-    if (other == null || javaClass != other.javaClass) {
-      return false
-    }
-    val emoji = other as TestEmoji
-    return (
-      unicode == emoji.unicode && shortcodes == emoji.shortcodes &&
-        variants == emoji.variants
-      )
-  }
-
-  override fun hashCode(): Int {
-    var result = unicode.hashCode()
-    result = 31 * result + shortcodes.hashCode()
-    result = 31 * result + variants.hashCode()
-    return result
-  }
-
   override fun getDrawable(context: Context) = error("Not available from tests")
   override fun destroy() = Unit
 }
diff --git a/generator/template/Emoji.kt b/generator/template/Emoji.kt
@@ -22,20 +22,23 @@ import android.graphics.BitmapFactory
 import android.graphics.Point
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
+import android.os.Parcelable
 import android.util.LruCache
 import com.vanniktech.emoji.emoji.Emoji
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 import java.lang.ref.SoftReference
 
-internal data class <%= name %> internal constructor(
+@Parcelize internal data class <%= name %> internal constructor(
   override val unicode: String,
   override val shortcodes: List<String>,
   private val x: Int,
   private val y: Int,
   override val isDuplicate: Boolean,
   override val variants: List<<%= name %>> = emptyList(),
   private var parent: <%= name %>? = null,
-) : Emoji {
-  override val base by lazy(LazyThreadSafetyMode.NONE) {
+) : Emoji, Parcelable {
+  @IgnoredOnParcel override val base by lazy(LazyThreadSafetyMode.NONE) {
     var result = this
     while (result.parent != null) {
       result = result.parent!!

diff --git a/generator/template/EmojiCompat.kt b/generator/template/EmojiCompat.kt
@@ -18,16 +18,19 @@ package com.vanniktech.emoji.<%= package %>
 
 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.os.Parcelable
 import com.vanniktech.emoji.emoji.Emoji
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
 
-internal data class <%= name %> internal constructor(
+@Parcelize internal data class <%= name %> internal constructor(
   override val unicode: String,
   override val shortcodes: List<String>,
   override val isDuplicate: Boolean,
   override val variants: List<<%= name %>> = emptyList(),
   private var parent: <%= name %>? = null,
-) : Emoji {
-  override val base by lazy(LazyThreadSafetyMode.NONE) {
+) : Emoji, Parcelable {
+  @IgnoredOnParcel override val base by lazy(LazyThreadSafetyMode.NONE) {
     var result = this
     while (result.parent != null) {
       result = result.parent!!