Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 16:49:40 +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

5
app/src/main/java/org/thoughtcrime/securesms/calls/links/EditCallLinkNameDialogFragment.kt
View File

@@ -27,10 +27,8 @@ import androidx.compose.ui.Alignment.Companion.End
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.tooling.preview.Preview
@@ -43,6 +41,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
import kotlinx.coroutines.launch
import org.signal.core.ui.compose.Buttons
import org.signal.core.ui.compose.Scaffolds
import org.signal.core.ui.compose.SignalIcons
import org.signal.core.util.BreakIteratorCompat
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.calls.links.details.CallLinkDetailsViewModel
@@ -134,7 +133,7 @@ private fun EditCallLinkNameScreen(
title = stringResource(id = R.string.EditCallLinkNameDialogFragment__edit_call_name),
onNavigationClick = onNavigationClick,
navigationIcon = if (showNavigationIcon) {
ImageVector.vectorResource(id = R.drawable.symbol_arrow_start_24)
SignalIcons.ArrowStart.imageVector
} else {
null
},

9
app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt
View File

@@ -26,10 +26,8 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.core.app.ShareCompat
@@ -43,6 +41,7 @@ import org.signal.core.ui.compose.DayNightPreviews
import org.signal.core.ui.compose.Dividers
import org.signal.core.ui.compose.Previews
import org.signal.core.ui.compose.Rows
import org.signal.core.ui.compose.SignalIcons
import org.signal.core.util.concurrent.LifecycleDisposable
import org.signal.core.util.logging.Log
import org.signal.ringrtc.CallLinkState
@@ -290,19 +289,19 @@ private fun CreateCallLinkBottomSheetContent(
Rows.TextRow(
text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__share_link_via_signal),
icon = ImageVector.vectorResource(id = R.drawable.symbol_forward_24),
icon = SignalIcons.Forward.imageVector,
onClick = onShareViaSignalClicked
)
Rows.TextRow(
text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__copy_link),
icon = ImageVector.vectorResource(id = R.drawable.symbol_copy_android_24),
icon = SignalIcons.Copy.imageVector,
onClick = onCopyLinkClicked
)
Rows.TextRow(
text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__share_link),
icon = ImageVector.vectorResource(id = R.drawable.symbol_share_android_24),
icon = SignalIcons.Share.imageVector,
onClick = onShareLinkClicked
)

13
app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsScreen.kt
View File

@@ -21,9 +21,7 @@ import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
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 androidx.core.app.ShareCompat
import androidx.fragment.app.FragmentActivity
@@ -37,6 +35,7 @@ import org.signal.core.ui.compose.Dividers
import org.signal.core.ui.compose.Previews
import org.signal.core.ui.compose.Rows
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.util.concurrent.LifecycleDisposable
import org.signal.ringrtc.CallLinkState.Restrictions
@@ -199,7 +198,7 @@ fun CallLinkDetailsScreen(
},
onNavigationClick = callback::onNavigationClicked,
navigationIcon = if (showNavigationIcon) {
ImageVector.vectorResource(id = R.drawable.symbol_arrow_start_24)
SignalIcons.ArrowStart.imageVector
} else {
null
}
@@ -253,7 +252,7 @@ fun CallLinkDetailsScreen(
item {
Rows.TextRow(
text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__share_link_via_signal),
icon = ImageVector.vectorResource(id = R.drawable.symbol_forward_24),
icon = SignalIcons.Forward.imageVector,
onClick = callback::onShareLinkViaSignalClicked
)
}
@@ -261,7 +260,7 @@ fun CallLinkDetailsScreen(
item {
Rows.TextRow(
text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__copy_link),
icon = ImageVector.vectorResource(id = R.drawable.symbol_copy_android_24),
icon = SignalIcons.Copy.imageVector,
onClick = callback::onCopyClicked
)
}
@@ -269,7 +268,7 @@ fun CallLinkDetailsScreen(
item {
Rows.TextRow(
text = stringResource(id = R.string.CallLinkDetailsFragment__share_link),
icon = ImageVector.vectorResource(id = R.drawable.symbol_link_24),
icon = SignalIcons.Link.imageVector,
onClick = callback::onShareClicked
)
}
@@ -277,7 +276,7 @@ fun CallLinkDetailsScreen(
item {
Rows.TextRow(
text = stringResource(id = R.string.CallLinkDetailsFragment__delete_call_link),
icon = ImageVector.vectorResource(id = R.drawable.symbol_trash_24),
icon = SignalIcons.Trash.imageVector,
foregroundTint = MaterialTheme.colorScheme.error,
onClick = callback::onDeleteClicked
)

3
app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogAdapter.kt
View File

@@ -26,6 +26,7 @@ import org.thoughtcrime.securesms.util.adapter.mapping.PagingMappingAdapter
import org.thoughtcrime.securesms.util.setRelativeDrawables
import org.thoughtcrime.securesms.util.visible
import java.util.Locale
import org.signal.core.ui.R as CoreUiR
/**
* RecyclerView Adapter for the Call Log screen
@@ -390,7 +391,7 @@ class CallLogAdapter(
private fun presentCallType(model: CallModel) {
when (model.call.record.type) {
CallTable.Type.AUDIO_CALL -> {
binding.callType.setImageResource(R.drawable.symbol_phone_24)
binding.callType.setImageResource(CoreUiR.drawable.symbol_phone_24)
binding.callType.contentDescription = context.getString(R.string.CallLogAdapter__start_a_voice_call)
binding.callType.setOnClickListener { onStartAudioCallClicked(model.call.peer) }
binding.callType.visible = true

9
app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogContextMenu.kt
View File

@@ -17,6 +17,7 @@ import org.thoughtcrime.securesms.conversation.ConversationIntents
import org.thoughtcrime.securesms.database.CallTable
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.util.CommunicationActions
import org.signal.core.ui.R as CoreUiR
/**
* Context menu for row items on the Call Log screen.
@@ -88,7 +89,7 @@ class CallLogContextMenu(
}
return ActionItem(
iconRes = R.drawable.symbol_phone_24,
iconRes = CoreUiR.drawable.symbol_phone_24,
title = fragment.getString(R.string.CallContextMenu__audio_call)
) {
CommunicationActions.startVoiceCall(fragment, call.peer) {
@@ -114,7 +115,7 @@ class CallLogContextMenu(
private fun getInfoActionItem(peer: Recipient, messageIds: LongArray): ActionItem {
return ActionItem(
iconRes = R.drawable.symbol_info_24,
iconRes = CoreUiR.drawable.symbol_info_24,
title = fragment.getString(R.string.CallContextMenu__info)
) {
val intent = when {
@@ -127,7 +128,7 @@ class CallLogContextMenu(
private fun getSelectActionItem(call: CallLogRow): ActionItem {
return ActionItem(
iconRes = R.drawable.symbol_check_circle_24,
iconRes = CoreUiR.drawable.symbol_check_circle_24,
title = fragment.getString(R.string.CallContextMenu__select)
) {
callbacks.startSelection(call)
@@ -140,7 +141,7 @@ class CallLogContextMenu(
}
return ActionItem(
iconRes = R.drawable.symbol_trash_24,
iconRes = CoreUiR.drawable.symbol_trash_24,
title = fragment.getString(R.string.CallContextMenu__delete)
) {
callbacks.deleteCall(call)

5
app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt
View File

@@ -65,6 +65,7 @@ import org.thoughtcrime.securesms.util.visible
import org.thoughtcrime.securesms.window.getWindowSizeClass
import org.thoughtcrime.securesms.window.isSplitPane
import java.util.Objects
import org.signal.core.ui.R as CoreUiR
/**
* Call Log tab.
@@ -161,13 +162,13 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal
binding.bottomActionBar.setItems(
listOf(
ActionItem(
iconRes = R.drawable.symbol_check_circle_24,
iconRes = CoreUiR.drawable.symbol_check_circle_24,
title = getString(R.string.CallLogFragment__select_all)
) {
viewModel.selectAll()
},
ActionItem(
iconRes = R.drawable.symbol_trash_24,
iconRes = CoreUiR.drawable.symbol_trash_24,
title = getString(R.string.CallLogFragment__delete),
action = this::handleDeleteSelectedRows
)

5
app/src/main/java/org/thoughtcrime/securesms/calls/quality/CallQualityDiagnosticsScreen.kt
View File

@@ -16,14 +16,13 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
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.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.ui.compose.horizontalGutters
import org.signal.storageservice.protos.calls.quality.SubmitCallQualitySurveyRequest
import org.thoughtcrime.securesms.R
@@ -35,7 +34,7 @@ fun CallQualityDiagnosticsScreen(
) {
Scaffolds.Settings(
title = stringResource(R.string.CallQualityDiagnosticsScreen__diagnostic_information),
navigationIcon = ImageVector.vectorResource(R.drawable.symbol_arrow_start_24),
navigationIcon = SignalIcons.ArrowStart.imageVector,
navigationContentDescription = stringResource(R.string.CallQualityDiagnosticsScreen__close),
onNavigationClick = onNavigationClick
) {

5
app/src/main/java/org/thoughtcrime/securesms/calls/quality/CallQualitySomethingElseScreen.kt
View File

@@ -23,12 +23,11 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
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.Buttons
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.ui.compose.horizontalGutters
import org.thoughtcrime.securesms.R
@@ -41,7 +40,7 @@ fun CallQualitySomethingElseScreen(
) {
Scaffolds.Settings(
title = stringResource(R.string.CallQualitySomethingElseScreen__title),
navigationIcon = ImageVector.vectorResource(R.drawable.symbol_arrow_start_24),
navigationIcon = SignalIcons.ArrowStart.imageVector,
onNavigationClick = onCancelClick,
navigationContentDescription = stringResource(R.string.CallQualitySomethingElseScreen__back),
modifier = Modifier.imePadding()