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

Migrate legacy png and webp to signal symbols.

Browse Source
This commit is contained in:
Cody Henthorne
2024-01-24 14:16:02 -05:00
committed by Nicholas Tinsley
parent c021d26103
commit 0036b8e2d6
355 changed files with 512 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View File

@@ -1567,7 +1567,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
}
private void setStatusIcons(MessageRecord messageRecord, boolean hasWallpaper) {
bodyText.setCompoundDrawablesWithIntrinsicBounds(0, 0, messageRecord.isKeyExchange() ? R.drawable.ic_menu_login : 0, 0);
bodyText.setCompoundDrawablesWithIntrinsicBounds(0, 0, messageRecord.isKeyExchange() ? R.drawable.symbol_key_24 : 0, 0);
if (!messageRecord.isMediaPending() && messageRecord.isFailed()) {
alertView.setFailed();

12
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationOptionsMenu.kt
View File

@@ -16,7 +16,6 @@ import io.reactivex.rxjava3.kotlin.subscribeBy
import org.signal.core.util.concurrent.LifecycleDisposable
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.recipients.Recipient
/**
@@ -107,8 +106,6 @@ internal object ConversationOptionsMenu {
if (!recipient.isGroup) {
if (isPushAvailable) {
menuInflater.inflate(R.menu.conversation_callable_secure, menu)
} else if (!recipient.isReleaseNotes && SignalStore.misc().smsExportPhase.allowSmsFeatures()) {
menuInflater.inflate(R.menu.conversation_callable_insecure, menu)
}
} else if (recipient.isGroup) {
if (isActiveV2Group) {
@@ -141,8 +138,6 @@ internal object ConversationOptionsMenu {
if (isPushAvailable) {
hideMenuItem(menu, R.id.menu_call_secure)
hideMenuItem(menu, R.id.menu_video_secure)
} else {
hideMenuItem(menu, R.id.menu_call_insecure)
}
hideMenuItem(menu, R.id.menu_mute_notifications)
}
@@ -153,8 +148,6 @@ internal object ConversationOptionsMenu {
hideMenuItem(menu, R.id.menu_video_secure)
hideMenuItem(menu, R.id.menu_expiring_messages)
hideMenuItem(menu, R.id.menu_expiring_messages_off)
} else {
hideMenuItem(menu, R.id.menu_call_insecure)
}
hideMenuItem(menu, R.id.menu_mute_notifications)
}
@@ -199,9 +192,8 @@ internal object ConversationOptionsMenu {
override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
when (menuItem.itemId) {
R.id.menu_call_secure -> callback.handleDial(true)
R.id.menu_call_secure -> callback.handleDial()
R.id.menu_video_secure -> callback.handleVideo()
R.id.menu_call_insecure -> callback.handleDial(false)
R.id.menu_view_media -> callback.handleViewMedia()
R.id.menu_add_shortcut -> callback.handleAddShortcut()
R.id.menu_search -> callback.handleSearch()
@@ -266,7 +258,7 @@ internal object ConversationOptionsMenu {
fun onOptionsMenuCreated(menu: Menu)
fun handleVideo()
fun handleDial(isSecure: Boolean)
fun handleDial()
fun handleViewMedia()
fun handleAddShortcut()
fun handleSearch()

3
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
View File

@@ -118,7 +118,8 @@ public class ConversationTitleView extends ConstraintLayout {
Drawable endDrawable = null;
if (recipient != null && recipient.isBlocked()) {
startDrawable = ContextUtil.requireDrawable(getContext(), R.drawable.ic_block_white_18dp);
startDrawable = ContextUtil.requireDrawable(getContext(), R.drawable.symbol_block_16);
startDrawable.setBounds(0, 0, ViewUtil.dpToPx(18), ViewUtil.dpToPx(18));
} else if (recipient != null && recipient.isMuted()) {
startDrawable = ContextUtil.requireDrawable(getContext(), R.drawable.ic_bell_disabled_16);
startDrawable.setBounds(0, 0, ViewUtil.dpToPx(18), ViewUtil.dpToPx(18));

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeAdapter.java
View File

@@ -64,7 +64,7 @@ final class SafetyNumberChangeAdapter extends ListAdapter<ChangedRecipient, Safe
if (changedRecipient.isUnverified() || changedRecipient.isVerified()) {
subtitle.setText(R.string.safety_number_change_dialog__previous_verified);
Drawable check = DrawableUtil.tint(ContextUtil.requireDrawable(itemView.getContext(), R.drawable.check), ContextCompat.getColor(itemView.getContext(), R.color.signal_text_secondary));
Drawable check = DrawableUtil.tint(ContextUtil.requireDrawable(itemView.getContext(), R.drawable.symbol_check_24), ContextCompat.getColor(itemView.getContext(), R.color.signal_text_secondary));
check.setBounds(0, 0, ViewUtil.dpToPx(12), ViewUtil.dpToPx(12));
subtitle.setCompoundDrawables(check, null, null, null);
} else if (changedRecipient.getRecipient().hasAUserSetDisplayName(itemView.getContext())) {

11
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View File

@@ -3094,14 +3094,9 @@ class ConversationFragment :
this@ConversationFragment.handleVideoCall()
}
override fun handleDial(isSecure: Boolean) {
override fun handleDial() {
val recipient: Recipient = viewModel.recipientSnapshot ?: return
if (isSecure) {
CommunicationActions.startVoiceCall(this@ConversationFragment, recipient)
} else {
CommunicationActions.startInsecureCall(this@ConversationFragment, recipient)
}
CommunicationActions.startVoiceCall(this@ConversationFragment, recipient)
}
override fun handleViewMedia() {
@@ -3500,7 +3495,7 @@ class ConversationFragment :
.toTypedArray()
MaterialAlertDialogBuilder(requireContext())
.setIcon(R.drawable.ic_warning)
.setIcon(R.drawable.symbol_error_triangle_fill_24)
.setTitle(R.string.ConversationFragment__no_longer_verified)
.setItems(unverifiedNames) { _, which: Int -> VerifyIdentityActivity.startOrShowExchangeMessagesDialog(requireContext(), unverifiedIdentities[which], false) }
.show()

2
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt
View File

@@ -560,7 +560,7 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
binding.body.setCompoundDrawablesWithIntrinsicBounds(
0,
0,
if (record.isKeyExchange) R.drawable.ic_menu_login else 0,
if (record.isKeyExchange) R.drawable.symbol_key_24 else 0,
0
)