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

Move theme colors to core-ui.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-01-29 16:44:11 -05:00
parent d0d32c8f33
commit 5c50372021
91 changed files with 268 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/RecipientPicker.kt
View File

@@ -59,6 +59,7 @@ import org.thoughtcrime.securesms.recipients.ui.RecipientPicker.DisplayMode.Comp
import org.thoughtcrime.securesms.recipients.ui.RecipientPicker.KeyboardType
import java.util.Optional
import java.util.function.Consumer
import org.signal.core.ui.R as CoreUiR
private typealias AndroidKeyboardType = androidx.compose.ui.text.input.KeyboardType
@@ -321,7 +322,7 @@ private suspend fun showItemContextMenu(
val messageItem = ActionItem(
iconRes = R.drawable.ic_chat_message_24,
title = context.getString(R.string.NewConversationActivity__message),
tintRes = R.color.signal_colorOnSurface,
tintRes = CoreUiR.color.signal_colorOnSurface,
action = { callbacks.onMessage(recipient.id) }
)
add(messageItem)
@@ -330,7 +331,7 @@ private suspend fun showItemContextMenu(
val voiceCallItem = ActionItem(
iconRes = R.drawable.ic_phone_right_24,
title = context.getString(R.string.NewConversationActivity__audio_call),
tintRes = R.color.signal_colorOnSurface,
tintRes = CoreUiR.color.signal_colorOnSurface,
action = { callbacks.onVoiceCall(recipient) }
)
add(voiceCallItem)
@@ -340,7 +341,7 @@ private suspend fun showItemContextMenu(
val videoCallItem = ActionItem(
iconRes = R.drawable.ic_video_call_24,
title = context.getString(R.string.NewConversationActivity__video_call),
tintRes = R.color.signal_colorOnSurface,
tintRes = CoreUiR.color.signal_colorOnSurface,
action = { callbacks.onVideoCall(recipient) }
)
add(videoCallItem)
@@ -350,7 +351,7 @@ private suspend fun showItemContextMenu(
val removeItem = ActionItem(
iconRes = R.drawable.ic_minus_circle_20,
title = context.getString(R.string.NewConversationActivity__remove),
tintRes = R.color.signal_colorOnSurface,
tintRes = CoreUiR.color.signal_colorOnSurface,
action = { callbacks.onRemove(recipient) }
)
add(removeItem)
@@ -360,7 +361,7 @@ private suspend fun showItemContextMenu(
val blockItem = ActionItem(
iconRes = R.drawable.ic_block_tinted_24,
title = context.getString(R.string.NewConversationActivity__block),
tintRes = R.color.signal_colorError,
tintRes = CoreUiR.color.signal_colorError,
action = { callbacks.onBlock(recipient) }
)
add(blockItem)

3
app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientBottomSheetDialogFragment.kt
View File

@@ -47,6 +47,7 @@ import org.thoughtcrime.securesms.util.SpanUtil
import org.thoughtcrime.securesms.util.ViewUtil
import org.thoughtcrime.securesms.util.WindowUtil
import org.thoughtcrime.securesms.util.visible
import org.signal.core.ui.R as CoreUiR
/**
* A bottom sheet that shows some simple recipient details, as well as some actions (like calling,
@@ -230,7 +231,7 @@ class RecipientBottomSheetDialogFragment : FixedRoundedCornerBottomSheetDialogFr
requireContext(),
SignalSymbols.Weight.BOLD,
if (isLtr) SignalSymbols.Glyph.CHEVRON_RIGHT else SignalSymbols.Glyph.CHEVRON_LEFT,
R.color.signal_colorOutline
CoreUiR.color.signal_colorOutline
)
if (isLtr) {