Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 08:39:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Centralize common icons into SignalIcons.

Browse Source
This commit is contained in:
jeffrey-signal
2026-01-28 09:48:47 -05:00
committed by Greyson Parrelli
parent e6918b592e
commit ce46c44b5d
152 changed files with 411 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerManagementScreen.kt
View File

@@ -67,6 +67,7 @@ import org.signal.core.ui.compose.Dividers
import org.signal.core.ui.compose.DropdownMenus
import org.signal.core.ui.compose.Previews
import org.signal.core.ui.compose.Scaffolds
import org.signal.core.ui.compose.SignalIcons
import org.signal.core.ui.compose.Snackbars
import org.signal.core.ui.compose.copied.androidx.compose.DragAndDropEvent
import org.signal.core.ui.compose.copied.androidx.compose.DraggableItem
@@ -81,6 +82,7 @@ import org.thoughtcrime.securesms.stickers.StickerPreviewDataFactory
import org.thoughtcrime.securesms.stickers.manage.AvailableStickerPack.DownloadStatus
import org.thoughtcrime.securesms.window.getWindowSizeClass
import java.text.NumberFormat
import org.signal.core.ui.R as CoreUiR
object StickerManagementScreen {
/**
@@ -277,7 +279,7 @@ private fun TopAppBar(
modifier = Modifier.padding(end = 16.dp)
) {
Icon(
imageVector = ImageVector.vectorResource(R.drawable.symbol_arrow_start_24),
imageVector = SignalIcons.ArrowStart.imageVector,
contentDescription = stringResource(R.string.DefaultTopAppBar__navigate_up_content_description)
)
}
@@ -325,7 +327,7 @@ private fun MultiSelectTopAppBar(
Scaffolds.DefaultTopAppBar(
title = pluralStringResource(R.plurals.StickerManagement_title_n_selected, selectedItemCount, NumberFormat.getInstance().format(selectedItemCount)),
titleContent = { _, title -> Text(text = title, style = MaterialTheme.typography.titleLarge) },
navigationIcon = ImageVector.vectorResource(R.drawable.symbol_x_24),
navigationIcon = SignalIcons.X.imageVector,
navigationContentDescription = stringResource(R.string.StickerManagement_accessibility_exit_multi_select_mode),
onNavigationClick = onExitClick
)
@@ -546,7 +548,7 @@ private fun InstalledStickersContent(
visible = multiSelectEnabled,
items = listOf(
ActionItem(
iconRes = R.drawable.symbol_check_circle_24,
iconRes = CoreUiR.drawable.symbol_check_circle_24,
title = if (selectedPackIds.size == packs.size) {
stringResource(R.string.StickerManagement_action_deselect_all)
} else {
@@ -555,7 +557,7 @@ private fun InstalledStickersContent(
action = callbacks::onSelectAllToggle
),
ActionItem(
iconRes = R.drawable.symbol_trash_24,
iconRes = CoreUiR.drawable.symbol_trash_24,
title = stringResource(R.string.StickerManagement_action_delete_selected),
action = { callbacks.onRemoveClick(selectedPackIds) }
)

11
app/src/main/java/org/thoughtcrime/securesms/stickers/manage/StickerPackListItems.kt
View File

@@ -34,6 +34,7 @@ import androidx.compose.ui.unit.dp
import org.signal.core.ui.compose.DayNightPreviews
import org.signal.core.ui.compose.DropdownMenus
import org.signal.core.ui.compose.Previews
import org.signal.core.ui.compose.SignalIcons
import org.signal.core.ui.compose.theme.SignalTheme
import org.signal.core.util.nullIfBlank
import org.signal.glide.compose.GlideImage
@@ -131,7 +132,7 @@ fun AvailableStickerPackRow(
)
MenuItem(
icon = ImageVector.vectorResource(R.drawable.symbol_forward_24),
icon = SignalIcons.Forward.imageVector,
text = stringResource(R.string.StickerManagement_menu_forward_pack),
onClick = {
onForwardClick(pack)
@@ -199,7 +200,7 @@ fun InstalledStickerPackRow(
modifier = modifier.background(SignalTheme.colors.colorSurface2)
) {
MenuItem(
icon = ImageVector.vectorResource(R.drawable.symbol_forward_24),
icon = SignalIcons.Forward.imageVector,
text = stringResource(R.string.StickerManagement_menu_forward_pack),
onClick = {
onForwardClick(pack)
@@ -208,7 +209,7 @@ fun InstalledStickerPackRow(
)
MenuItem(
icon = ImageVector.vectorResource(R.drawable.symbol_check_circle_24),
icon = SignalIcons.CheckCircle.imageVector,
text = stringResource(R.string.StickerManagement_menu_select_pack),
onClick = {
onSelectionToggle(pack)
@@ -217,7 +218,7 @@ fun InstalledStickerPackRow(
)
MenuItem(
icon = ImageVector.vectorResource(R.drawable.symbol_trash_24),
icon = SignalIcons.Trash.imageVector,
text = stringResource(R.string.StickerManagement_menu_remove_pack),
onClick = {
onRemoveClick(pack)
@@ -402,7 +403,7 @@ private fun MenuItem(
@Composable
private fun MenuItemPreview() = Previews.Preview {
MenuItem(
icon = ImageVector.vectorResource(R.drawable.symbol_forward_24),
icon = SignalIcons.Forward.imageVector,
text = "Forward",
onClick = { }
)

5
app/src/main/java/org/thoughtcrime/securesms/stickers/preview/StickerPackPreviewActivityV2.kt
View File

@@ -52,6 +52,7 @@ import org.signal.core.ui.compose.Buttons
import org.signal.core.ui.compose.DayNightPreviews
import org.signal.core.ui.compose.Previews
import org.signal.core.ui.compose.Scaffolds
import org.signal.core.ui.compose.SignalIcons
import org.signal.core.util.orNull
import org.signal.core.util.toOptional
import org.signal.glide.compose.GlideImage
@@ -235,7 +236,7 @@ private fun TopAppBar(
Scaffolds.DefaultTopAppBar(
title = "", // TODO collapse title into top app bar on scroll
titleContent = { _, text -> Text(text = text, style = MaterialTheme.typography.titleLarge) },
navigationIcon = ImageVector.vectorResource(R.drawable.symbol_arrow_start_24),
navigationIcon = SignalIcons.ArrowStart.imageVector,
navigationContentDescription = stringResource(R.string.DefaultTopAppBar__navigate_up_content_description),
onNavigationClick = onNavigateUp,
actions = {
@@ -245,7 +246,7 @@ private fun TopAppBar(
modifier = Modifier.padding(horizontal = 8.dp)
) {
Icon(
imageVector = ImageVector.vectorResource(R.drawable.symbol_forward_24),
imageVector = SignalIcons.Forward.imageVector,
contentDescription = stringResource(R.string.StickerManagement_menu_forward_pack)
)
}