Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-04 15:35:38 +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
app/src/main/java/org/thoughtcrime/securesms/profiles/edit/CreateProfileFragment.java
+3 -1
View File
@@ -22,6 +22,7 @@ import com.airbnb.lottie.SimpleColorFilter;
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import org.signal.core.ui.compose.SignalIcons;
import org.signal.core.util.EditTextUtil;
import org.signal.core.util.StreamUtil;
import org.signal.core.util.concurrent.SimpleTask;
@@ -46,6 +47,7 @@ import org.thoughtcrime.securesms.util.text.AfterTextChanged;
import java.io.IOException;
import java.io.InputStream;
import java.util.Objects;
import static org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity.EXCLUDE_SYSTEM;
import static org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity.GROUP_ID;
@@ -296,7 +298,7 @@ public class CreateProfileFragment extends LoggingFragment {
binding.whoCanFindMeDescription.setText(R.string.PhoneNumberPrivacy_everyone);
break;
case NOT_DISCOVERABLE:
binding.whoCanFindMeIcon.setImageResource(R.drawable.symbol_lock_24);
binding.whoCanFindMeIcon.setImageResource(org.signal.core.ui.R.drawable.symbol_lock_24);
binding.whoCanFindMeDescription.setText(R.string.PhoneNumberPrivacy_nobody);
break;
}
app/src/main/java/org/thoughtcrime/securesms/profiles/manage/EditProfileFragment.kt
+3 -2
View File
@@ -49,6 +49,7 @@ import org.thoughtcrime.securesms.util.navigation.safeNavigate
import org.thoughtcrime.securesms.util.views.SimpleProgressDialog
import java.util.Arrays
import java.util.Optional
import org.signal.core.ui.R as CoreUiR
/**
* Fragment for editing your profile after you're already registered.
@@ -320,13 +321,13 @@ class EditProfileFragment : LoggingFragment() {
private fun presentAboutEmoji(aboutEmoji: String?) {
if (aboutEmoji.isNullOrEmpty()) {
binding.manageProfileAboutIcon.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.symbol_edit_24, null))
binding.manageProfileAboutIcon.setImageDrawable(ResourcesCompat.getDrawable(resources, CoreUiR.drawable.symbol_edit_24, null))
} else {
val emoji = EmojiUtil.convertToDrawable(requireContext(), aboutEmoji)
if (emoji != null) {
binding.manageProfileAboutIcon.setImageDrawable(emoji)
} else {
binding.manageProfileAboutIcon.setImageDrawable(ResourcesCompat.getDrawable(resources, R.drawable.symbol_edit_24, null))
binding.manageProfileAboutIcon.setImageDrawable(ResourcesCompat.getDrawable(resources, CoreUiR.drawable.symbol_edit_24, null))
}
}
}
app/src/main/java/org/thoughtcrime/securesms/profiles/username/NewWaysToConnectDialogFragment.kt
+2 -3
View File
@@ -21,17 +21,16 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.graphics.vector.ImageVector
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.style.TextAlign
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.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.compose.ComposeDialogFragment
import org.thoughtcrime.securesms.profiles.manage.EditProfileActivity
@@ -80,7 +79,7 @@ private fun NewWaysToConnectDialogContent(
Scaffolds.Settings(
title = "",
onNavigationClick = onNotNowClick,
navigationIcon = ImageVector.vectorResource(id = R.drawable.symbol_x_24)
navigationIcon = SignalIcons.X.imageVector
) {
Column(modifier = Modifier.padding(it)) {
LazyColumn(modifier = Modifier.weight(1f)) {