fix createEmoji to return unicode

snuhcs-course · Nov 15, 2023 · 81f574f · 81f574f
1 parent 63f14f0
commit 81f574f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/android/app/src/main/java/com/goliath/emojihub/viewmodels/EmojiViewModel.kt b/android/app/src/main/java/com/goliath/emojihub/viewmodels/EmojiViewModel.kt
@@ -41,15 +41,7 @@ class EmojiViewModel @Inject constructor(
     }
 
     fun createEmoji(videoUri: Uri): Pair<String, String>? {
-        val (emojiName, emojiUnicode) = emojiUseCase.createEmoji(videoUri)?: return null
-
-        val emojiCharArray = emojiUnicode.replace("U+", "")
-            .split(" ").map {
-            val codePoint = it.toInt(16)
-                codePoint.toChar()
-        }.toCharArray()
-        val emoji = String(emojiCharArray)
-        return Pair(emojiName, emoji)
+        return emojiUseCase.createEmoji(videoUri)
     }
 
     suspend fun uploadEmoji(emojiUnicode: String, emojiLabel: String, videoFile: File): Boolean {

diff --git a/android/app/src/main/java/com/goliath/emojihub/views/TransformVideoPage.kt b/android/app/src/main/java/com/goliath/emojihub/views/TransformVideoPage.kt
@@ -33,6 +33,7 @@ import androidx.media3.common.Player
 import androidx.media3.exoplayer.ExoPlayer
 import androidx.media3.ui.PlayerView
 import com.goliath.emojihub.LocalNavController
+import com.goliath.emojihub.extensions.toEmoji
 import com.goliath.emojihub.viewmodels.EmojiViewModel
 import com.goliath.emojihub.views.components.CustomDialog
 import kotlinx.coroutines.launch
@@ -130,7 +131,7 @@ fun TransformVideoPage(
                     horizontalAlignment = Alignment.CenterHorizontally
                 ) {
                     Text(
-                        text = resultEmoji!!.second,
+                        text = resultEmoji!!.second.toEmoji(),
                         fontSize = 48.sp
                     )
                     Text (