From f9a1cd16550319563e8c32234cc299f75bff52a6 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Tue, 29 Sep 2026 16:09:21 -0300
Subject: [PATCH] Add icons.

---
 .../main/java/org/signal/core/ui/compose/SignalIcons.kt  | 1 +
 .../src/main/res/drawable/symbol_stickerpack_plus_24.xml | 9 +++++++++
 .../main/java/org/signal/mediakeyboard/MediaKeyboard.kt  | 6 +++---
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 core/ui/src/main/res/drawable/symbol_stickerpack_plus_24.xml

diff --git a/core/ui/src/main/java/org/signal/core/ui/compose/SignalIcons.kt b/core/ui/src/main/java/org/signal/core/ui/compose/SignalIcons.kt
index 872930cf08..fb8ec07263 100644
--- a/core/ui/src/main/java/org/signal/core/ui/compose/SignalIcons.kt
+++ b/core/ui/src/main/java/org/signal/core/ui/compose/SignalIcons.kt
@@ -110,6 +110,7 @@ enum class SignalIcons(private val icon: SignalIcon) : SignalIcon by icon {
   SpeakerSlash(icon(R.drawable.symbol_speaker_slash_24)),
   Sticker(icon(R.drawable.symbol_sticker_24)),
   StickerPack(icon(R.drawable.symbol_stickerpack_24)),
+  StickerPackPlus(icon(R.drawable.symbol_stickerpack_plus_24)),
   Text(icon(R.drawable.symbol_text_24)),
   TextSquare(icon(R.drawable.symbol_text_square_24)),
   Transfer(icon(R.drawable.symbol_transfer_24)),
diff --git a/core/ui/src/main/res/drawable/symbol_stickerpack_plus_24.xml b/core/ui/src/main/res/drawable/symbol_stickerpack_plus_24.xml
new file mode 100644
index 0000000000..842257f890
--- /dev/null
+++ b/core/ui/src/main/res/drawable/symbol_stickerpack_plus_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M14.75 20.6c-3.78 0-6.85-3.07-6.85-6.85s3.07-6.85 6.85-6.85 6.85 3.07 6.85 6.85-3.07 6.85-6.85 6.85m0 1.8c4.78 0 8.65-3.87 8.65-8.65 0-4.08-2.82-7.5-6.63-8.41-0.58-3.07-2.75-4.58-5.98-4.16l-5.45 0.71C1.95 2.33 0.24 4.55 0.69 7.95l0.72 5.46c0.43 3.32 2.57 5.02 5.85 4.66a8.63 8.63 0 0 0 7.49 4.33m-3.25-7.75h2.35V17c0 0.5 0.4 0.9 0.9 0.9s0.9-0.4 0.9-0.9v-2.35H18c0.5 0 0.9-0.4 0.9-0.9s-0.4-0.9-0.9-0.9h-2.35V10.5c0-0.5-0.4-0.9-0.9-0.9s-0.9 0.4-0.9 0.9v2.35H11.5c-0.5 0-0.9 0.4-0.9 0.9s0.4 0.9 0.9 0.9m-8.31-1.48l-0.72-5.46c-0.31-2.4 0.7-3.72 3.11-4.04l5.45-0.71c2.05-0.27 3.32 0.44 3.84 2.14h-0.12a8.646 8.646 0 0 0-8.26 11.22c-1.94 0.02-3.01-1.02-3.3-3.15m0 0"/>
+</vector>
diff --git a/feature/media-keyboard/src/main/java/org/signal/mediakeyboard/MediaKeyboard.kt b/feature/media-keyboard/src/main/java/org/signal/mediakeyboard/MediaKeyboard.kt
index fb32f486c2..676df89152 100644
--- a/feature/media-keyboard/src/main/java/org/signal/mediakeyboard/MediaKeyboard.kt
+++ b/feature/media-keyboard/src/main/java/org/signal/mediakeyboard/MediaKeyboard.kt
@@ -23,7 +23,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.ArrowBack
 import androidx.compose.material.icons.automirrored.outlined.Backspace
-import androidx.compose.material.icons.outlined.AddCircleOutline
 import androidx.compose.material.icons.outlined.Clear
 import androidx.compose.material.icons.outlined.Search
 import androidx.compose.material3.Icon
@@ -52,6 +51,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import kotlinx.coroutines.flow.StateFlow
 import org.signal.core.ui.compose.CollectActions
+import org.signal.core.ui.compose.SignalIcons
 import org.signal.core.ui.compose.keyboard.KeyboardSheetDragRegion
 import org.signal.core.ui.compose.keyboard.LocalKeyboardSheetController
 import org.signal.mediakeyboard.data.MediaKeyboardRepository
@@ -209,7 +209,7 @@ private fun MediaKeyboardTopBar(
       modifier = Modifier.graphicsLayer { alpha = searchAlpha }
     ) {
       Icon(
-        imageVector = Icons.Outlined.Search,
+        imageVector = SignalIcons.Search.imageVector,
         contentDescription = stringResource(R.string.MediaKeyboard__search),
         tint = MaterialTheme.colorScheme.onSurfaceVariant
       )
@@ -248,7 +248,7 @@ private fun MediaKeyboardTopBar(
       MediaKeyboardTab.STICKER -> {
         IconButton(onClick = { onAction(MediaKeyboardAction.StickerManagementClicked) }) {
           Icon(
-            imageVector = Icons.Outlined.AddCircleOutline,
+            imageVector = SignalIcons.StickerPackPlus.imageVector,
             contentDescription = stringResource(R.string.MediaKeyboard__manage_stickers),
             tint = MaterialTheme.colorScheme.onSurfaceVariant
           )