mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-22 01:40:07 +01:00
Centralize common icons into SignalIcons.
This commit is contained in:
committed by
Greyson Parrelli
parent
e6918b592e
commit
ce46c44b5d
@@ -26,13 +26,12 @@ import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.graphics.vector.ImageVector
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.res.vectorResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import org.signal.core.ui.compose.AllDevicePreviews
|
||||
import org.signal.core.ui.compose.Previews
|
||||
import org.signal.core.ui.compose.Scaffolds
|
||||
import org.signal.core.ui.compose.SignalIcons
|
||||
import org.thoughtcrime.securesms.R
|
||||
import org.thoughtcrime.securesms.components.compose.ScreenTitlePane
|
||||
import org.thoughtcrime.securesms.window.AppScaffold
|
||||
@@ -62,7 +61,7 @@ fun RecipientPickerScaffold(
|
||||
Scaffolds.DefaultTopAppBar(
|
||||
title = if (!isSplitPane) title else "",
|
||||
titleContent = { _, titleText -> Text(text = titleText, 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 = onNavigateUpClick,
|
||||
actions = { topAppBarActions() }
|
||||
|
||||
@@ -42,6 +42,7 @@ import androidx.core.widget.TextViewCompat
|
||||
import org.signal.core.ui.compose.BottomSheets
|
||||
import org.signal.core.ui.compose.DayNightPreviews
|
||||
import org.signal.core.ui.compose.Previews
|
||||
import org.signal.core.ui.compose.SignalIcons
|
||||
import org.signal.core.util.getParcelableCompat
|
||||
import org.signal.core.util.isNotNullOrBlank
|
||||
import org.thoughtcrime.securesms.AvatarPreviewActivity
|
||||
@@ -220,7 +221,7 @@ private fun Content(
|
||||
val textColor = LocalContentColor.current
|
||||
|
||||
AboutRow(
|
||||
startIcon = ImageVector.vectorResource(R.drawable.symbol_edit_24),
|
||||
startIcon = SignalIcons.Edit.imageVector,
|
||||
text = {
|
||||
Row {
|
||||
AndroidView(factory = ::EmojiTextView) {
|
||||
@@ -289,7 +290,7 @@ private fun Content(
|
||||
|
||||
if (model.formattedE164.isNotNullOrBlank()) {
|
||||
AboutRow(
|
||||
startIcon = ImageVector.vectorResource(R.drawable.symbol_phone_24),
|
||||
startIcon = SignalIcons.Phone.imageVector,
|
||||
text = model.formattedE164,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
)
|
||||
|
||||
@@ -42,12 +42,10 @@ import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.focus.FocusRequester
|
||||
import androidx.compose.ui.focus.focusRequester
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.graphics.vector.ImageVector
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.dimensionResource
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.res.vectorResource
|
||||
import androidx.compose.ui.text.input.ImeAction
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
import androidx.compose.ui.text.input.VisualTransformation
|
||||
@@ -68,6 +66,7 @@ import org.signal.core.ui.compose.Dialogs
|
||||
import org.signal.core.ui.compose.Dividers
|
||||
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.TextFields
|
||||
import org.signal.core.util.E164Util
|
||||
import org.signal.core.util.getParcelableExtraCompat
|
||||
@@ -134,7 +133,7 @@ class FindByActivity : PassphraseRequiredActivity() {
|
||||
Scaffolds.Settings(
|
||||
title = stringResource(id = title),
|
||||
onNavigationClick = { finishAfterTransition() },
|
||||
navigationIcon = ImageVector.vectorResource(id = R.drawable.symbol_arrow_start_24)
|
||||
navigationIcon = SignalIcons.ArrowStart.imageVector
|
||||
) {
|
||||
Content(
|
||||
paddingValues = it,
|
||||
@@ -390,7 +389,7 @@ private fun Content(
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Buttons.Small(onClick = onQrCodeScanClicked) {
|
||||
Icon(painter = painterResource(id = R.drawable.symbol_qrcode_24), contentDescription = stringResource(id = R.string.FindByActivity__qr_scan_button))
|
||||
Icon(painter = SignalIcons.QrCode.painter, contentDescription = stringResource(id = R.string.FindByActivity__qr_scan_button))
|
||||
Spacer(modifier = Modifier.width(10.dp))
|
||||
Text(
|
||||
text = stringResource(id = R.string.FindByActivity__qr_scan_button),
|
||||
|
||||
Reference in New Issue
Block a user