feat: really basic unicode emoji picker

Signed-off-by: Infi <infi@infi.sh>

app/src/main/assets/metadata/emoji.json.LICENCE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

app/src/main/java/chat/revolt/RevoltApplication.kt

@@ -6,7 +6,12 @@ import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
 class RevoltApplication : Application() {
+    companion object {
+        lateinit var instance: RevoltApplication
+    }
+
     init {
+        instance = this
         DynamicColors.applyToActivitiesIfAvailable(this)
     }
 }

app/src/main/java/chat/revolt/components/chat/MessageField.kt

@@ -1,17 +1,21 @@
 package chat.revolt.components.chat
 
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.expandIn
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.shrinkOut
-import androidx.compose.animation.slideOutVertically
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
@@ -39,11 +43,13 @@ import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.IntSize
 import androidx.compose.ui.unit.dp
 import chat.revolt.R
 import chat.revolt.activities.RevoltTweenFloat
@@ -56,6 +62,7 @@ fun MessageField(
     value: TextFieldValue,
     onValueChange: (TextFieldValue) -> Unit,
     onAddAttachment: () -> Unit,
+    onPickEmoji: () -> Unit,
     onSendMessage: () -> Unit,
     channelType: ChannelType,
     channelName: String,
@@ -160,29 +167,59 @@ fun MessageField(
                         )
                     },
                     trailingIcon = {
-                        AnimatedVisibility(sendButtonVisible,
+                        Row {
-                            enter = slideInVertically(
-                                animationSpec = RevoltTweenInt,
-                                initialOffsetY = { it }
-                            ) + fadeIn(animationSpec = RevoltTweenFloat),
-                            exit = slideOutVertically(
-                                animationSpec = RevoltTweenInt,
-                                targetOffsetY = { it }
-                            ) + fadeOut(animationSpec = RevoltTweenFloat)) {
                             Icon(
-                                when {
+                                painter = painterResource(R.drawable.ic_emoticon_24dp),
-                                    editMode -> Icons.Default.Edit
+                                tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f),
-                                    else -> Icons.Default.Send
+                                contentDescription = stringResource(id = R.string.pick_emoji_alt),
-                                },
-                                tint = MaterialTheme.colorScheme.primary,
-                                contentDescription = stringResource(id = R.string.send_alt),
                                 modifier = Modifier
                                     .clip(CircleShape)
                                     .size(32.dp)
-                                    .clickable { onSendMessage() }
+                                    .clickable {
+                                        focusRequester.freeFocus() // hide keyboard because it's annoying
+                                        onPickEmoji()
+                                    }
                                     .padding(4.dp)
-                                    .testTag("send_message")
+                                    .testTag("pick_emoji")
                             )
+
+                            Spacer(modifier = Modifier.width(8.dp))
+
+                            AnimatedVisibility(sendButtonVisible,
+                                enter = expandIn(initialSize = { full ->
+                                    IntSize(
+                                        0,
+                                        full.height
+                                    )
+                                }) + slideInHorizontally(
+                                    animationSpec = RevoltTweenInt,
+                                    initialOffsetX = { -it }
+                                ) + fadeIn(animationSpec = RevoltTweenFloat),
+                                exit = shrinkOut(targetSize = { full ->
+                                    IntSize(
+                                        0,
+                                        full.height
+                                    )
+                                }) + slideOutHorizontally(
+                                    animationSpec = RevoltTweenInt,
+                                    targetOffsetX = { it }
+                                ) + fadeOut(animationSpec = RevoltTweenFloat)) {
+                                Icon(
+                                    when {
+                                        editMode -> Icons.Default.Edit
+                                        else -> Icons.Default.Send
+                                    },
+                                    tint = MaterialTheme.colorScheme.primary,
+                                    contentDescription = stringResource(id = R.string.send_alt),
+                                    modifier = Modifier
+                                        .padding(end = 8.dp)
+                                        .clip(CircleShape)
+                                        .clickable { onSendMessage() }
+                                        .size(32.dp)
+                                        .padding(4.dp)
+                                        .testTag("send_message")
+                                )
+                            }
                         }
                     }
                 )
@@ -199,6 +236,7 @@ fun MessageFieldPreview() {
         onValueChange = {},
         onSendMessage = {},
         onAddAttachment = {},
+        onPickEmoji = {},
         channelType = ChannelType.TextChannel,
         channelName = "general"
     )

app/src/main/java/chat/revolt/components/emoji/EmojiPicker.kt

@@ -0,0 +1,85 @@
+package chat.revolt.components.emoji
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.lazy.grid.GridCells
+import androidx.compose.foundation.lazy.grid.GridItemSpan
+import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.LocalTextStyle
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.revolt.internals.EmojiMetadata
+import chat.revolt.internals.EmojiPickerItem
+
+@Composable
+fun EmojiPicker(
+    onEmojiSelected: (String) -> Unit,
+) {
+    val metadata = remember { EmojiMetadata() }
+    val pickerList = remember(metadata) { metadata.flatPickerList() }
+    val spanCount = 9 // https://github.com/googlefonts/emoji-metadata/#readme
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+    ) {
+        Row {
+            Text("Categories", fontWeight = FontWeight.Black)
+        }
+        LazyVerticalGrid(
+            columns = GridCells.Fixed(spanCount),
+            horizontalArrangement = Arrangement.spacedBy(4.dp),
+            verticalArrangement = Arrangement.spacedBy(4.dp),
+            modifier = Modifier.weight(1f)
+        ) {
+            items(
+                pickerList.size,
+                span = {
+                    val item = pickerList[it]
+                    when (item) {
+                        is EmojiPickerItem.Emoji -> GridItemSpan(1)
+                        is EmojiPickerItem.Category -> GridItemSpan(spanCount)
+                    }
+                }
+            ) { index ->
+                when (val item = pickerList[index]) {
+                    is EmojiPickerItem.Emoji -> {
+                        Column(
+                            modifier = Modifier
+                                .clip(CircleShape)
+                                .clickable {
+                                    onEmojiSelected(item.emoji)
+                                }
+                                .aspectRatio(1f)
+                                .weight(1f),
+                            horizontalAlignment = Alignment.CenterHorizontally,
+                            verticalArrangement = Arrangement.Center,
+                        ) {
+                            Text(item.emoji, style = LocalTextStyle.current.copy(fontSize = 20.sp))
+                        }
+                    }
+
+                    is EmojiPickerItem.Category -> {
+                        Text(
+                            stringResource(item.category.nameResource),
+                            fontWeight = FontWeight.Black
+                        )
+                    }
+                }
+            }
+        }
+    }
+}

app/src/main/java/chat/revolt/internals/EmojiMetadata.kt

@@ -0,0 +1,82 @@
+package chat.revolt.internals
+
+import android.content.Context
+import chat.revolt.R
+import chat.revolt.RevoltApplication
+import chat.revolt.api.RevoltJson
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.ListSerializer
+
+@Serializable
+data class Emoji(
+    val base: List<Long>,
+    val alternates: List<List<Long>>,
+    val emoticons: List<String>,
+    val shortcodes: List<String>,
+    val animated: Boolean,
+)
+
+@Serializable
+data class EmojiGroup(
+    val group: String,
+    val emoji: List<Emoji>,
+)
+
+enum class EmojiCategory(val googleName: String, val nameResource: Int) {
+    Smileys("Smileys and emotions", R.string.emoji_category_smileys),
+    People("People", R.string.emoji_category_people),
+    Animals("Animals and nature", R.string.emoji_category_animals),
+    Food("Food and drink", R.string.emoji_category_food),
+    Travel("Travel and places", R.string.emoji_category_travel),
+    Activities("Activities and events", R.string.emoji_category_activities),
+    Objects("Objects", R.string.emoji_category_objects),
+    Symbols("Symbols", R.string.emoji_category_symbols),
+    Flags("Flags", R.string.emoji_category_flags),
+}
+
+sealed class EmojiPickerItem {
+    data class Emoji(val emoji: String) : EmojiPickerItem()
+    data class Category(val category: EmojiCategory) : EmojiPickerItem()
+}
+
+class EmojiMetadata {
+    private var metadata: List<EmojiGroup>
+
+    private fun initMetadata(context: Context): List<EmojiGroup> {
+        val json = context.assets.open("metadata/emoji.json").use {
+            it.reader().readText()
+        }
+        return RevoltJson.decodeFromString(ListSerializer(EmojiGroup.serializer()), json)
+    }
+
+    fun pickerList(): Map<EmojiCategory, List<Emoji>> {
+        val map = mutableMapOf<EmojiCategory, List<Emoji>>()
+
+        for (group in metadata) {
+            val category = EmojiCategory.entries.find { it.name == group.group } ?: continue
+            map[category] = group.emoji
+        }
+
+        return map
+    }
+
+    fun flatPickerList(): List<EmojiPickerItem> {
+        val list = mutableListOf<EmojiPickerItem>()
+
+        for (group in metadata) {
+            val category = EmojiCategory.entries.find { it.googleName == group.group } ?: continue
+            list.add(EmojiPickerItem.Category(category))
+            list.addAll(group.emoji.map { emoji ->
+                EmojiPickerItem.Emoji(
+                    emoji.base.joinToString("") { String(Character.toChars(it.toInt())) }
+                )
+            })
+        }
+
+        return list
+    }
+
+    init {
+        metadata = initMetadata(RevoltApplication.instance.applicationContext)
+    }
+}

app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt

@@ -15,9 +15,11 @@ import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInHorizontally
 import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.imePadding
@@ -73,6 +75,7 @@ import chat.revolt.api.settings.FilePickerFeatureFlagVariates
 import chat.revolt.components.chat.Message
 import chat.revolt.components.chat.MessageField
 import chat.revolt.components.chat.SystemMessage
+import chat.revolt.components.emoji.EmojiPicker
 import chat.revolt.components.media.InbuiltMediaPicker
 import chat.revolt.components.screens.chat.AttachmentManager
 import chat.revolt.components.screens.chat.ChannelHeader
@@ -131,7 +134,10 @@ fun ChannelScreen(
             // This is so you can "toggle" the file in the picker.
             // If the file was picked via DocumentsUI we don't want toggling functionality as
             // if you specifically opened it from DocumentsUI you probably want to send it anyway.
-            if (viewModel.pendingAttachments.any { it.pickerIdentifier == pickerIdentifier }) {
+            if (
+                pickerIdentifier != null &&
+                viewModel.pendingAttachments.any { it.pickerIdentifier == pickerIdentifier }
+            ) {
                 viewModel.pendingAttachments.removeIf { it.pickerIdentifier == pickerIdentifier }
                 return
             }
@@ -487,8 +493,11 @@ fun ChannelScreen(
                                 FeatureFlags.filePickerType == FilePickerFeatureFlagVariates.TiramisuMediaPermissions
                                         && isTiramisu -> {
                                     focusManager.clearFocus()
-                                    viewModel.inbuiltFilePickerOpen =
+                                    if (viewModel.currentBottomPane == BottomPane.InbuiltMediaPicker) {
-                                        !viewModel.inbuiltFilePickerOpen
+                                        viewModel.currentBottomPane = BottomPane.None
+                                    } else {
+                                        viewModel.currentBottomPane = BottomPane.InbuiltMediaPicker
+                                    }
                                 }
 
                                 FeatureFlags.filePickerType == FilePickerFeatureFlagVariates.DocumentsUI
@@ -497,6 +506,14 @@ fun ChannelScreen(
                                 }
                             }
                         },
+                        onPickEmoji = {
+                            focusManager.clearFocus()
+                            if (viewModel.currentBottomPane == BottomPane.EmojiPicker) {
+                                viewModel.currentBottomPane = BottomPane.None
+                            } else {
+                                viewModel.currentBottomPane = BottomPane.EmojiPicker
+                            }
+                        },
                         channelType = channel.channelType,
                         channelName = channel.name ?: ChannelUtils.resolveDMName(channel)
                         ?: stringResource(
@@ -507,20 +524,20 @@ fun ChannelScreen(
                         editMode = viewModel.editingMessage != null,
                         cancelEdit = viewModel::cancelEditingMessage,
                         onFocusChange = { nowFocused ->
-                            if (nowFocused && viewModel.inbuiltFilePickerOpen) {
+                            if (nowFocused && viewModel.currentBottomPane != BottomPane.None) {
-                                viewModel.inbuiltFilePickerOpen = false
+                                viewModel.currentBottomPane = BottomPane.None
                             }
                         },
                     )
                 }
             }
 
-            AnimatedVisibility(visible = viewModel.inbuiltFilePickerOpen) {
+            AnimatedVisibility(visible = viewModel.currentBottomPane == BottomPane.InbuiltMediaPicker) {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
                     InbuiltMediaPicker(
                         onOpenDocumentsUi = {
                             pickFileLauncher.launch(arrayOf("*/*"))
-                            viewModel.inbuiltFilePickerOpen = false
+                            viewModel.currentBottomPane = BottomPane.None
                         },
                         onOpenCamera = {
                             // Create a new content URI to store the captured image.
@@ -543,10 +560,10 @@ fun ChannelScreen(
                             )
 
                             pickCameraLauncher.launch(capturedPhotoUri.value)
-                            viewModel.inbuiltFilePickerOpen = false
+                            viewModel.currentBottomPane = BottomPane.None
                         },
                         onClose = {
-                            viewModel.inbuiltFilePickerOpen = false
+                            viewModel.currentBottomPane = BottomPane.None
                         },
                         onMediaSelected = { media ->
                             try {
@@ -571,6 +588,17 @@ fun ChannelScreen(
                     )
                 }
             }
+
+            AnimatedVisibility(visible = viewModel.currentBottomPane == BottomPane.EmojiPicker) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .fillMaxHeight(0.5f)
+                        .background(MaterialTheme.colorScheme.surfaceColorAtElevation(1.dp))
+                ) {
+                    EmojiPicker(onEmojiSelected = viewModel::putAtCursorPosition)
+                }
+            }
         }
     }
 }

app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenViewModel.kt

@@ -55,6 +55,14 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.datetime.Instant
 
+sealed class BottomPane {
+    data object None : BottomPane()
+
+    @FeatureFlag("TiramisuFilePicker")
+    data object InbuiltMediaPicker : BottomPane()
+    data object EmojiPicker : BottomPane()
+}
+
 class ChannelScreenViewModel : ViewModel() {
     var activeChannel by mutableStateOf<Channel?>(null)
 
@@ -69,8 +77,7 @@ class ChannelScreenViewModel : ViewModel() {
     var pendingReplies = mutableStateListOf<SendMessageReply>()
     var pendingAttachments = mutableStateListOf<FileArgs>()
 
-    @FeatureFlag("TiramisuFilePicker")
+    var currentBottomPane by mutableStateOf<BottomPane>(BottomPane.None)
-    var inbuiltFilePickerOpen by mutableStateOf(false)
 
     var pendingUploadProgress by mutableFloatStateOf(0f)
 
@@ -443,6 +450,25 @@ class ChannelScreenViewModel : ViewModel() {
         pendingMessageContent = ""
     }
 
+    fun putAtCursorPosition(content: String) {
+        val currentContent = pendingMessageContent
+        val currentSelection = textSelection
+
+        // if out of bounds, just append
+        if (currentSelection.start > currentContent.length) {
+            pendingMessageContent = currentContent + content
+            textSelection = TextRange(currentContent.length + content.length)
+            return
+        }
+
+        val newContent = currentContent.substring(0, currentSelection.start) +
+                content +
+                currentContent.substring(currentSelection.end)
+
+        pendingMessageContent = newContent
+        textSelection = TextRange(currentSelection.start + content.length)
+    }
+
     suspend fun checkShouldDenyMessageField() {
         if (activeChannel == null) return
 

app/src/main/res/drawable/ic_emoticon_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M12,2C6.47,2 2,6.5 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M15.5,8A1.5,1.5 0 0,1 17,9.5A1.5,1.5 0 0,1 15.5,11A1.5,1.5 0 0,1 14,9.5A1.5,1.5 0 0,1 15.5,8M8.5,8A1.5,1.5 0 0,1 10,9.5A1.5,1.5 0 0,1 8.5,11A1.5,1.5 0 0,1 7,9.5A1.5,1.5 0 0,1 8.5,8M12,17.5C9.67,17.5 7.69,16.04 6.89,14H17.11C16.3,16.04 14.33,17.5 12,17.5Z" />
+</vector>

app/src/main/res/values/strings.xml

@@ -91,6 +91,7 @@
     <string name="typing_several">Several people are typing</string>
 
     <string name="send_alt">Send</string>
+    <string name="pick_emoji_alt">Pick emoji</string>
     <string name="add_attachment_alt">Add attachment</string>
     <string name="remove_attachment_alt">Remove attachment</string>
     <string name="remove_reply_alt">Remove reply</string>
@@ -98,6 +99,16 @@
     <string name="reply_mention_off">\@ off</string>
     <string name="too_many_replies">You can only reply to %1$d messages at a time.</string>
 
+    <string name="emoji_category_smileys">Smileys &amp; Emotions</string>
+    <string name="emoji_category_people">People &amp; Body</string>
+    <string name="emoji_category_animals">Animals &amp; Nature</string>
+    <string name="emoji_category_food">Food &amp; Drink</string>
+    <string name="emoji_category_travel">Travel &amp; Places</string>
+    <string name="emoji_category_activities">Activities</string>
+    <string name="emoji_category_objects">Objects</string>
+    <string name="emoji_category_symbols">Symbols</string>
+    <string name="emoji_category_flags">Flags</string>
+
     <string name="badge_bot_alt">Bot</string>
     <string name="badge_masquerade_alt">From linked channel</string>
     <string name="badge_platform_moderation_alt">Platform moderation</string>