diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ad3118218e..a5c8590177 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -160,12 +160,6 @@ android:value=".MainActivity" /> - - diff --git a/app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java b/app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java index a4de055d79..02ae868dd5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java @@ -38,7 +38,6 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActivity { .setOnDismissListener(dialog13 -> finish()) .create(); - dialog.setIcon(getResources().getDrawable(R.drawable.icon_dialog)); dialog.show(); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java index ef74eb153d..17c0ff087c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java @@ -374,7 +374,7 @@ public class PassphrasePromptActivity extends PassphraseActivity { @Override public void onAuthenticationSucceeded(@NonNull BiometricPrompt.AuthenticationResult result) { Log.i(TAG, "onAuthenticationSucceeded"); - fingerprintPrompt.setImageResource(R.drawable.ic_check_white_48dp); + fingerprintPrompt.setImageResource(R.drawable.symbol_check_white_48); fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.green_500), PorterDuff.Mode.SRC_IN); fingerprintPrompt.animate().setInterpolator(new BounceInterpolator()).scaleX(1.1f).scaleY(1.1f).setDuration(500).setListener(new AnimationCompleteListener() { @Override @@ -388,7 +388,7 @@ public class PassphrasePromptActivity extends PassphraseActivity { public void onAuthenticationFailed() { Log.w(TAG, "onAuthenticationFailed()"); - fingerprintPrompt.setImageResource(R.drawable.ic_close_white_48dp); + fingerprintPrompt.setImageResource(R.drawable.symbol_x_white_48); fingerprintPrompt.getBackground().setColorFilter(getResources().getColor(R.color.red_500), PorterDuff.Mode.SRC_IN); TranslateAnimation shake = new TranslateAnimation(0, 30, 0, 0); diff --git a/app/src/main/java/org/thoughtcrime/securesms/PromptMmsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PromptMmsActivity.java deleted file mode 100644 index c7d400247f..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/PromptMmsActivity.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.thoughtcrime.securesms; - -import android.content.Intent; -import android.os.Bundle; -import android.widget.Button; - -import org.thoughtcrime.securesms.preferences.MmsPreferencesActivity; - -public class PromptMmsActivity extends PassphraseRequiredActivity { - - @Override - protected void onCreate(Bundle bundle, boolean ready) { - setContentView(R.layout.prompt_apn_activity); - initializeResources(); - } - - private void initializeResources() { - Button okButton = findViewById(R.id.ok_button); - Button cancelButton = findViewById(R.id.cancel_button); - - okButton.setOnClickListener(v -> { - Intent intent = new Intent(PromptMmsActivity.this, MmsPreferencesActivity.class); - intent.putExtras(PromptMmsActivity.this.getIntent().getExtras()); - startActivity(intent); - finish(); - }); - - cancelButton.setOnClickListener(v -> finish()); - } - -} diff --git a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java index 200079e0c2..309df0d43c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java @@ -765,7 +765,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan if (isFinishing()) return; // XXX Stuart added this check above, not sure why, so I'm repeating in ignorance. - moxie new MaterialAlertDialogBuilder(this) .setTitle(R.string.RedPhone_number_not_registered) - .setIcon(R.drawable.ic_warning) + .setIcon(R.drawable.symbol_error_triangle_fill_24) .setMessage(R.string.RedPhone_the_number_you_dialed_does_not_support_secure_voice) .setCancelable(true) .setPositiveButton(R.string.RedPhone_got_it, (d, w) -> handleTerminate(event.getRecipient(), HangupMessage.Type.NORMAL)) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java b/app/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java index 2ffe74ca5c..49217180d1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/DeliveryStatusView.java @@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.components; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; +import android.graphics.PorterDuff; import android.os.Bundle; import android.os.Parcelable; import android.util.AttributeSet; @@ -146,7 +147,7 @@ public class DeliveryStatusView extends AppCompatImageView { setVisibility(View.VISIBLE); ViewUtil.setPaddingStart(this, 0); ViewUtil.setPaddingEnd(this, horizontalPadding); - setImageResource(R.drawable.ic_delivery_status_sending); + setImageResource(R.drawable.symbol_messagestatus_sending_24); updateContentDescription(); } @@ -156,7 +157,7 @@ public class DeliveryStatusView extends AppCompatImageView { ViewUtil.setPaddingStart(this, horizontalPadding); ViewUtil.setPaddingEnd(this, 0); clearAnimation(); - setImageResource(R.drawable.ic_delivery_status_sent); + setImageResource(R.drawable.symbol_messagestatus_sent_24); updateContentDescription(); } @@ -166,7 +167,7 @@ public class DeliveryStatusView extends AppCompatImageView { ViewUtil.setPaddingStart(this, horizontalPadding); ViewUtil.setPaddingEnd(this, 0); clearAnimation(); - setImageResource(R.drawable.ic_delivery_status_delivered); + setImageResource(R.drawable.symbol_messagestatus_delivered_24); updateContentDescription(); } @@ -176,12 +177,12 @@ public class DeliveryStatusView extends AppCompatImageView { ViewUtil.setPaddingStart(this, horizontalPadding); ViewUtil.setPaddingEnd(this, 0); clearAnimation(); - setImageResource(R.drawable.ic_delivery_status_read); + setImageResource(R.drawable.symbol_messagestatus_read_24); updateContentDescription(); } public void setTint(int color) { - setColorFilter(color); + setColorFilter(color, PorterDuff.Mode.SRC_IN); } private void updateContentDescription() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java index 92b26ce15a..61a6442c01 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java @@ -1,12 +1,11 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import android.graphics.PorterDuff; -import android.graphics.PorterDuffColorFilter; import android.graphics.drawable.Drawable; import android.text.SpannableStringBuilder; import android.util.AttributeSet; +import androidx.annotation.DrawableRes; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; @@ -15,11 +14,10 @@ import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.emoji.SimpleEmojiTextView; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.ContextUtil; +import org.thoughtcrime.securesms.util.DrawableUtil; import org.thoughtcrime.securesms.util.SpanUtil; import org.thoughtcrime.securesms.util.ViewUtil; -import java.util.Objects; - public class FromTextView extends SimpleEmojiTextView { private static final String TAG = Log.tag(FromTextView.class); @@ -71,17 +69,23 @@ public class FromTextView extends SimpleEmojiTextView { setText(builder); - if (recipient.isBlocked()) setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_block_grey600_18dp, 0, 0, 0); + if (recipient.isBlocked()) setCompoundDrawablesRelativeWithIntrinsicBounds(getBlocked(), null, null, null); else if (recipient.isMuted()) setCompoundDrawablesRelativeWithIntrinsicBounds(getMuted(), null, null, null); else setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0); } + private Drawable getBlocked() { + return getDrawable(R.drawable.symbol_block_16); + } + private Drawable getMuted() { - Drawable mutedDrawable = Objects.requireNonNull(ContextCompat.getDrawable(getContext(), R.drawable.ic_bell_disabled_16)); + return getDrawable(R.drawable.ic_bell_disabled_16); + } + private Drawable getDrawable(@DrawableRes int drawable) { + Drawable mutedDrawable = ContextUtil.requireDrawable(getContext(), drawable); mutedDrawable.setBounds(0, 0, ViewUtil.dpToPx(18), ViewUtil.dpToPx(18)); - mutedDrawable.setColorFilter(new PorterDuffColorFilter(ContextCompat.getColor(getContext(), R.color.signal_icon_tint_secondary), PorterDuff.Mode.SRC_IN)); - + DrawableUtil.tint(mutedDrawable, ContextCompat.getColor(getContext(), R.color.signal_icon_tint_secondary)); return mutedDrawable; } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/SharedContactView.java b/app/src/main/java/org/thoughtcrime/securesms/components/SharedContactView.java index 5d4c7836df..966ea72257 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/SharedContactView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/SharedContactView.java @@ -173,13 +173,13 @@ public class SharedContactView extends LinearLayout implements RecipientForeverO private void presentAvatar(@Nullable Uri uri) { if (uri != null) { glideRequests.load(new DecryptableUri(uri)) - .fallback(R.drawable.ic_contact_picture) + .fallback(R.drawable.symbol_person_display_40) .circleCrop() .diskCacheStrategy(DiskCacheStrategy.ALL) .dontAnimate() .into(avatarView); } else { - glideRequests.load(R.drawable.ic_contact_picture) + glideRequests.load(R.drawable.symbol_person_display_40) .circleCrop() .diskCacheStrategy(DiskCacheStrategy.ALL) .into(avatarView); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java index 42da090d0e..302a470468 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java @@ -553,7 +553,7 @@ public class ThumbnailView extends FrameLayout { if (slide.isInProgress() || doNotShowMissingThumbnailImage) { return request; } else { - return request.apply(RequestOptions.errorOf(R.drawable.ic_missing_thumbnail_picture)); + return request.apply(RequestOptions.errorOf(R.drawable.missing_thumbnail)); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java index 435a1ba6f0..c540c86ff3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java @@ -32,7 +32,7 @@ public class UntrustedSendDialog extends AlertDialog.Builder implements DialogIn this.resendListener = resendListener; setTitle(R.string.UntrustedSendDialog_send_message); - setIcon(R.drawable.ic_warning); + setIcon(R.drawable.symbol_error_triangle_fill_24); setMessage(message); setPositiveButton(R.string.UntrustedSendDialog_send, this); setNegativeButton(android.R.string.cancel, null); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java index 70324e3f60..5216663fb3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java @@ -31,7 +31,7 @@ public class UnverifiedSendDialog extends AlertDialog.Builder implements DialogI this.resendListener = resendListener; setTitle(R.string.UnverifiedSendDialog_send_message); - setIcon(R.drawable.ic_warning); + setIcon(R.drawable.symbol_error_triangle_fill_24); setMessage(message); setPositiveButton(R.string.UnverifiedSendDialog_send, this); setNegativeButton(android.R.string.cancel, null); diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt index 5f2bdc5513..71466609e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/AppSettingsFragment.kt @@ -219,7 +219,7 @@ class AppSettingsFragment : DSLSettingsFragment( clickPref( title = DSLSettingsText.from(R.string.preferences__privacy), - icon = DSLSettingsIcon.from(R.drawable.symbol_lock_24), + icon = DSLSettingsIcon.from(R.drawable.symbol_lock_white_48), onClick = { findNavController().safeNavigate(R.id.action_appSettingsFragment_to_privacySettingsFragment) }, diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt index 99b815363e..490f08e375 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/privacy/PrivacySettingsFragment.kt @@ -193,7 +193,7 @@ class PrivacySettingsFragment : DSLSettingsFragment(R.string.preferences__privac MaterialAlertDialogBuilder(requireContext()).apply { setTitle(R.string.ApplicationPreferencesActivity_disable_passphrase) setMessage(R.string.ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications) - setIcon(R.drawable.ic_warning) + setIcon(R.drawable.symbol_error_triangle_fill_24) setPositiveButton(R.string.ApplicationPreferencesActivity_disable) { _, _ -> MasterSecretUtil.changeMasterSecretPassphrase( activity, diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/verify/SafetyNumberQrView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/verify/SafetyNumberQrView.kt index 4de5e7bb4f..2db7ec70d2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/verify/SafetyNumberQrView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/verify/SafetyNumberQrView.kt @@ -149,7 +149,7 @@ class SafetyNumberQrView : ConstraintLayout { fun animateVerifiedSuccess() { val qrBitmap = (qrCode.drawable as BitmapDrawable).bitmap - val qrSuccess: Bitmap = createVerifiedBitmap(qrBitmap.width, qrBitmap.height, R.drawable.ic_check_white_48dp) + val qrSuccess: Bitmap = createVerifiedBitmap(qrBitmap.width, qrBitmap.height, R.drawable.symbol_check_white_48) qrVerified.setImageBitmap(qrSuccess) qrVerified.background.setColorFilter(resources.getColor(R.color.green_500), PorterDuff.Mode.MULTIPLY) tapLabel.setText(context.getString(R.string.verify_display_fragment__successful_match)) @@ -158,7 +158,7 @@ class SafetyNumberQrView : ConstraintLayout { fun animateVerifiedFailure() { val qrBitmap = (qrCode.drawable as BitmapDrawable).bitmap - val qrSuccess: Bitmap = createVerifiedBitmap(qrBitmap.width, qrBitmap.height, R.drawable.ic_close_white_48dp) + val qrSuccess: Bitmap = createVerifiedBitmap(qrBitmap.width, qrBitmap.height, R.drawable.symbol_x_white_48) qrVerified.setImageBitmap(qrSuccess) qrVerified.background.setColorFilter(resources.getColor(R.color.red_500), PorterDuff.Mode.MULTIPLY) tapLabel.setText(context.getString(R.string.verify_display_fragment__failed_to_verify_safety_number)) diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java index c213932581..2a452af5e1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java @@ -32,7 +32,7 @@ public class TransparentContactPhoto implements FallbackContactPhoto { @Override public Drawable asCallCard(@NonNull Context context) { - return ContextCompat.getDrawable(context, R.drawable.ic_contact_picture_large); + return ContextCompat.getDrawable(context, R.drawable.symbol_person_display_40); } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java index 446e97417f..b359d9b5c1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java @@ -139,7 +139,6 @@ class ContactFieldAdapter extends RecyclerView.Adapter 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() diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java index cfd3251162..9220b32ec2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationTitleView.java @@ -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)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeAdapter.java index 04606087cb..2faa2558b0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ui/error/SafetyNumberChangeAdapter.java @@ -64,7 +64,7 @@ final class SafetyNumberChangeAdapter extends ListAdapter VerifyIdentityActivity.startOrShowExchangeMessagesDialog(requireContext(), unverifiedIdentities[which], false) } .show() diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt index d45c80de5b..ea66e6c7e8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt @@ -560,7 +560,7 @@ open class V2ConversationItemTextOnlyViewHolder>( 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 ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/DeviceTransferSetupFragment.java b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/DeviceTransferSetupFragment.java index 2a7ec0b2de..99c83754cd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/DeviceTransferSetupFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/devicetransfer/DeviceTransferSetupFragment.java @@ -282,7 +282,7 @@ public abstract class DeviceTransferSetupFragment extends LoggingFragment { Permissions.with(this) .request(WifiDirect.requiredPermission()) .ifNecessary() - .withRationaleDialog(getString(getErrorTextForStep(SetupStep.PERMISSIONS_DENIED)), false, R.drawable.ic_location_on_white_24dp) + .withRationaleDialog(getString(getErrorTextForStep(SetupStep.PERMISSIONS_DENIED)), false, R.drawable.symbol_location_white_24) .withPermanentDenialDialog(getString(getErrorTextForStep(SetupStep.PERMISSIONS_DENIED))) .onAllGranted(() -> viewModel.onPermissionsGranted()) .onAnyDenied(() -> viewModel.onLocationPermissionDenied()) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java index 42ab61358f..6eb15f6804 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java @@ -126,7 +126,7 @@ public class FcmRefreshJob extends BaseJob { builder.setSmallIcon(R.drawable.ic_notification); builder.setLargeIcon(BitmapFactory.decodeResource(context.getResources(), - R.drawable.ic_action_warning_red)); + R.drawable.symbol_error_triangle_fill_32)); builder.setContentTitle(context.getString(R.string.GcmRefreshJob_Permanent_Signal_communication_failure)); builder.setContentText(context.getString(R.string.GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services)); builder.setTicker(context.getString(R.string.GcmRefreshJob_Permanent_Signal_communication_failure)); diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt index 80130dda44..c50c9f501d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt @@ -586,7 +586,7 @@ class MediaPreviewV2Fragment : LoggingFragment(R.layout.fragment_media_preview_v val attachment: DatabaseAttachment = mediaItem.attachment ?: return MaterialAlertDialogBuilder(requireContext()).apply { - setIcon(R.drawable.ic_warning) + setIcon(R.drawable.symbol_error_triangle_fill_24) setTitle(R.string.MediaPreviewActivity_media_delete_confirmation_title) setMessage(R.string.MediaPreviewActivity_media_delete_confirmation_message) setCancelable(true) diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java index b3b26a5e9a..7261aea644 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AudioSlide.java @@ -91,6 +91,6 @@ public class AudioSlide extends Slide { @Override public @DrawableRes int getPlaceholderRes(Theme theme) { - return R.drawable.ic_audio; + return R.drawable.symbol_speaker_fill_24; } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt index 27e02d1eff..ffa3d61e5e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt @@ -194,7 +194,7 @@ sealed class NotificationBuilder(protected val context: Context) { val markAsRead: PendingIntent? = conversation.getMarkAsReadIntent(context) if (markAsRead != null) { val markAsReadAction: NotificationCompat.Action = - NotificationCompat.Action.Builder(R.drawable.check, context.getString(R.string.MessageNotifier_mark_read), markAsRead) + NotificationCompat.Action.Builder(R.drawable.symbol_check_24, context.getString(R.string.MessageNotifier_mark_read), markAsRead) .setSemanticAction(NotificationCompat.Action.SEMANTIC_ACTION_MARK_AS_READ) .setShowsUserInterface(false) .build() @@ -239,7 +239,7 @@ sealed class NotificationBuilder(protected val context: Context) { val markAsRead: PendingIntent? = state.getMarkAsReadIntent(context) if (markAsRead != null) { - val markAllAsReadAction = NotificationCompat.Action(R.drawable.check, context.getString(R.string.MessageNotifier_mark_all_as_read), markAsRead) + val markAllAsReadAction = NotificationCompat.Action(R.drawable.symbol_check_24, context.getString(R.string.MessageNotifier_mark_all_as_read), markAsRead) builder.addAction(markAllAsReadAction) builder.extend(NotificationCompat.WearableExtender().addAction(markAllAsReadAction)) } @@ -248,7 +248,7 @@ sealed class NotificationBuilder(protected val context: Context) { override fun addTurnOffJoinedNotificationsAction(pendingIntent: PendingIntent?) { if (pendingIntent != null) { val turnOffTheseNotifications = NotificationCompat.Action( - R.drawable.check, + R.drawable.symbol_check_24, context.getString(R.string.MessageNotifier_turn_off_these_notifications), pendingIntent ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt index 6c5354dc6b..30523116ec 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationFactory.kt @@ -357,7 +357,7 @@ object NotificationFactory { builder.apply { setSmallIcon(R.drawable.ic_notification) - setLargeIcon(BitmapFactory.decodeResource(context.resources, R.drawable.ic_action_warning_red)) + setLargeIcon(BitmapFactory.decodeResource(context.resources, R.drawable.symbol_error_triangle_fill_32)) setContentTitle(context.getString(R.string.MessageNotifier_message_delivery_failed)) setContentText(context.getString(R.string.MessageNotifier_failed_to_deliver_message)) setTicker(context.getString(R.string.MessageNotifier_error_delivering_message)) diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java index 263445075f..6b1d0049e2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java @@ -272,7 +272,7 @@ public class KeyCachingService extends Service { builder.setPriority(Notification.PRIORITY_MIN); builder.setOngoing(true); - builder.addAction(R.drawable.ic_menu_lock_dark, getString(R.string.KeyCachingService_lock), buildLockIntent()); + builder.addAction(R.drawable.symbol_lock_24, getString(R.string.KeyCachingService_lock), buildLockIntent()); builder.setContentIntent(buildLaunchIntent()); stopForeground(true); diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java index f0b3aff133..b5133581e2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java @@ -25,6 +25,8 @@ import org.thoughtcrime.securesms.database.model.StickerPackRecord; import org.thoughtcrime.securesms.glide.cache.ApngOptions; import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri; import org.thoughtcrime.securesms.mms.GlideRequests; +import org.thoughtcrime.securesms.util.DrawableUtil; +import org.thoughtcrime.securesms.util.ViewUtil; import org.thoughtcrime.securesms.util.adapter.SectionedRecyclerViewAdapter; import org.thoughtcrime.securesms.util.adapter.StableIdGenerator; @@ -304,10 +306,10 @@ final class StickerManagementAdapter extends SectionedRecyclerViewAdapter - diff --git a/app/src/main/res/drawable/conversation_attachment_close_circle.xml b/app/src/main/res/drawable/conversation_attachment_close_circle.xml index 86741f86e3..c373951010 100644 --- a/app/src/main/res/drawable/conversation_attachment_close_circle.xml +++ b/app/src/main/res/drawable/conversation_attachment_close_circle.xml @@ -2,14 +2,19 @@ - - - + + + - - - + diff --git a/app/src/main/res/drawable/conversation_attachment_edit.xml b/app/src/main/res/drawable/conversation_attachment_edit.xml index 4e3413c1cb..68a2276f7c 100644 --- a/app/src/main/res/drawable/conversation_attachment_edit.xml +++ b/app/src/main/res/drawable/conversation_attachment_edit.xml @@ -7,7 +7,7 @@ - + + + + + + + + diff --git a/app/src/main/res/drawable/ic_phone_right_unlock_solid_24.xml b/app/src/main/res/drawable/ic_phone_right_unlock_solid_24.xml deleted file mode 100644 index e3321a7147..0000000000 --- a/app/src/main/res/drawable/ic_phone_right_unlock_solid_24.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/missing_thumbnail.xml b/app/src/main/res/drawable/missing_thumbnail.xml new file mode 100644 index 0000000000..130c3efda1 --- /dev/null +++ b/app/src/main/res/drawable/missing_thumbnail.xml @@ -0,0 +1,9 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_arrow_down_tint_24.xml b/app/src/main/res/drawable/symbol_arrow_down_tint_24.xml new file mode 100644 index 0000000000..862b6da2b9 --- /dev/null +++ b/app/src/main/res/drawable/symbol_arrow_down_tint_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/symbol_arrow_right_24.xml b/app/src/main/res/drawable/symbol_arrow_right_24.xml new file mode 100644 index 0000000000..fd74d60b42 --- /dev/null +++ b/app/src/main/res/drawable/symbol_arrow_right_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_block_16.xml b/app/src/main/res/drawable/symbol_block_16.xml new file mode 100644 index 0000000000..6cbc444693 --- /dev/null +++ b/app/src/main/res/drawable/symbol_block_16.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/app/src/main/res/drawable/symbol_caption_24.xml b/app/src/main/res/drawable/symbol_caption_24.xml new file mode 100644 index 0000000000..6491f07976 --- /dev/null +++ b/app/src/main/res/drawable/symbol_caption_24.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/symbol_chat_fill_24.xml b/app/src/main/res/drawable/symbol_chat_fill_24.xml new file mode 100644 index 0000000000..28047c1b99 --- /dev/null +++ b/app/src/main/res/drawable/symbol_chat_fill_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/symbol_check_circle_fill_24.xml b/app/src/main/res/drawable/symbol_check_circle_fill_24.xml new file mode 100644 index 0000000000..424b509e30 --- /dev/null +++ b/app/src/main/res/drawable/symbol_check_circle_fill_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/symbol_check_white_48.xml b/app/src/main/res/drawable/symbol_check_white_48.xml new file mode 100644 index 0000000000..865dd86791 --- /dev/null +++ b/app/src/main/res/drawable/symbol_check_white_48.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/symbol_chevron_down_24.xml b/app/src/main/res/drawable/symbol_chevron_down_24.xml new file mode 100644 index 0000000000..e300419e90 --- /dev/null +++ b/app/src/main/res/drawable/symbol_chevron_down_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/symbol_chevron_left_16.xml b/app/src/main/res/drawable/symbol_chevron_left_16.xml new file mode 100644 index 0000000000..da621f4f2e --- /dev/null +++ b/app/src/main/res/drawable/symbol_chevron_left_16.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_chevron_up_24.xml b/app/src/main/res/drawable/symbol_chevron_up_24.xml new file mode 100644 index 0000000000..09de6950f0 --- /dev/null +++ b/app/src/main/res/drawable/symbol_chevron_up_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/symbol_edit_white_24.xml b/app/src/main/res/drawable/symbol_edit_white_24.xml new file mode 100644 index 0000000000..bceba41ca0 --- /dev/null +++ b/app/src/main/res/drawable/symbol_edit_white_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/symbol_error_circle_fill_16.xml b/app/src/main/res/drawable/symbol_error_circle_fill_16.xml new file mode 100644 index 0000000000..00ba6e098a --- /dev/null +++ b/app/src/main/res/drawable/symbol_error_circle_fill_16.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/symbol_error_triangle_fill_24.xml b/app/src/main/res/drawable/symbol_error_triangle_fill_24.xml new file mode 100644 index 0000000000..7b528c4399 --- /dev/null +++ b/app/src/main/res/drawable/symbol_error_triangle_fill_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/symbol_error_triangle_fill_32.xml b/app/src/main/res/drawable/symbol_error_triangle_fill_32.xml new file mode 100644 index 0000000000..ae636547de --- /dev/null +++ b/app/src/main/res/drawable/symbol_error_triangle_fill_32.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/symbol_key_24.xml b/app/src/main/res/drawable/symbol_key_24.xml new file mode 100644 index 0000000000..c0996ce8bf --- /dev/null +++ b/app/src/main/res/drawable/symbol_key_24.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_link_slash_16.xml b/app/src/main/res/drawable/symbol_link_slash_16.xml new file mode 100644 index 0000000000..93f717b2df --- /dev/null +++ b/app/src/main/res/drawable/symbol_link_slash_16.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/symbol_location_white_24.xml b/app/src/main/res/drawable/symbol_location_white_24.xml new file mode 100644 index 0000000000..457840435b --- /dev/null +++ b/app/src/main/res/drawable/symbol_location_white_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/symbol_lock_white_48.xml b/app/src/main/res/drawable/symbol_lock_white_48.xml new file mode 100644 index 0000000000..1241cdb5a8 --- /dev/null +++ b/app/src/main/res/drawable/symbol_lock_white_48.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_messagestatus_delivered_24.xml b/app/src/main/res/drawable/symbol_messagestatus_delivered_24.xml new file mode 100644 index 0000000000..9f72985338 --- /dev/null +++ b/app/src/main/res/drawable/symbol_messagestatus_delivered_24.xml @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/symbol_messagestatus_read_24.xml b/app/src/main/res/drawable/symbol_messagestatus_read_24.xml new file mode 100644 index 0000000000..bf89f552d4 --- /dev/null +++ b/app/src/main/res/drawable/symbol_messagestatus_read_24.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/app/src/main/res/drawable/symbol_messagestatus_sending_24.xml b/app/src/main/res/drawable/symbol_messagestatus_sending_24.xml new file mode 100644 index 0000000000..3e139c0fcc --- /dev/null +++ b/app/src/main/res/drawable/symbol_messagestatus_sending_24.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/symbol_messagestatus_sent_24.xml b/app/src/main/res/drawable/symbol_messagestatus_sent_24.xml new file mode 100644 index 0000000000..7d390954e1 --- /dev/null +++ b/app/src/main/res/drawable/symbol_messagestatus_sent_24.xml @@ -0,0 +1,14 @@ + + + + + + diff --git a/app/src/main/res/drawable/symbol_person_display_40.xml b/app/src/main/res/drawable/symbol_person_display_40.xml new file mode 100644 index 0000000000..24f27b6e5b --- /dev/null +++ b/app/src/main/res/drawable/symbol_person_display_40.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/symbol_phone_fill_24.xml b/app/src/main/res/drawable/symbol_phone_fill_24.xml new file mode 100644 index 0000000000..341b2d8d25 --- /dev/null +++ b/app/src/main/res/drawable/symbol_phone_fill_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/symbol_phone_fill_white_24.xml b/app/src/main/res/drawable/symbol_phone_fill_white_24.xml new file mode 100644 index 0000000000..f9d8a852e0 --- /dev/null +++ b/app/src/main/res/drawable/symbol_phone_fill_white_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/symbol_photo_slash_24.xml b/app/src/main/res/drawable/symbol_photo_slash_24.xml new file mode 100644 index 0000000000..01569947ab --- /dev/null +++ b/app/src/main/res/drawable/symbol_photo_slash_24.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/symbol_x_white_24.xml b/app/src/main/res/drawable/symbol_x_white_24.xml new file mode 100644 index 0000000000..d06acd653b --- /dev/null +++ b/app/src/main/res/drawable/symbol_x_white_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/symbol_x_white_48.xml b/app/src/main/res/drawable/symbol_x_white_48.xml new file mode 100644 index 0000000000..e569bef6f0 --- /dev/null +++ b/app/src/main/res/drawable/symbol_x_white_48.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/webrtc_call_screen_answer.xml b/app/src/main/res/drawable/webrtc_call_screen_answer.xml index 125e498ddb..32a726ff9a 100644 --- a/app/src/main/res/drawable/webrtc_call_screen_answer.xml +++ b/app/src/main/res/drawable/webrtc_call_screen_answer.xml @@ -3,7 +3,7 @@ diff --git a/app/src/main/res/layout/activity_shared_contact_details.xml b/app/src/main/res/layout/activity_shared_contact_details.xml index 67f919662e..3b941ca901 100644 --- a/app/src/main/res/layout/activity_shared_contact_details.xml +++ b/app/src/main/res/layout/activity_shared_contact_details.xml @@ -99,7 +99,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="6dp" android:tint="?attr/colorAccent" - android:src="@drawable/message_24dp"/> + android:src="@drawable/symbol_chat_fill_24"/> + android:src="@drawable/symbol_phone_fill_24"/> \ No newline at end of file diff --git a/app/src/main/res/layout/audio_view_circle_small.xml b/app/src/main/res/layout/audio_view_circle_small.xml index f7ec83b203..a57d94583a 100644 --- a/app/src/main/res/layout/audio_view_circle_small.xml +++ b/app/src/main/res/layout/audio_view_circle_small.xml @@ -41,7 +41,7 @@ android:clickable="true" android:contentDescription="@string/audio_view__download_accessibility_description" android:focusable="true" - android:src="@drawable/ic_download_circle_fill_white_48dp" + android:src="@drawable/download_attachment" android:visibility="gone" /> \ No newline at end of file diff --git a/app/src/main/res/layout/audio_view_draft_circle.xml b/app/src/main/res/layout/audio_view_draft_circle.xml index 78fd9bccaa..67585aed05 100644 --- a/app/src/main/res/layout/audio_view_draft_circle.xml +++ b/app/src/main/res/layout/audio_view_draft_circle.xml @@ -49,7 +49,7 @@ android:clickable="true" android:contentDescription="@string/audio_view__download_accessibility_description" android:focusable="true" - android:src="@drawable/ic_download_circle_fill_white_48dp" + android:src="@drawable/download_attachment" android:visibility="gone" /> \ No newline at end of file diff --git a/app/src/main/res/layout/chat_wallpaper_crop_activity.xml b/app/src/main/res/layout/chat_wallpaper_crop_activity.xml index 3c70ab7b2b..312a6b4f3c 100644 --- a/app/src/main/res/layout/chat_wallpaper_crop_activity.xml +++ b/app/src/main/res/layout/chat_wallpaper_crop_activity.xml @@ -131,7 +131,7 @@ android:text="@string/DateUtils_just_now" android:textAppearance="@style/Signal.Text.Caption" android:textColor="@color/transparent_white_80" - app:drawableEndCompat="@drawable/ic_delivery_status_read" + app:drawableEndCompat="@drawable/symbol_messagestatus_read_24" app:drawableTint="@color/transparent_white_80" /> diff --git a/app/src/main/res/layout/chat_wallpaper_preview_activity.xml b/app/src/main/res/layout/chat_wallpaper_preview_activity.xml index 6d2ed7336f..6651b89dd9 100644 --- a/app/src/main/res/layout/chat_wallpaper_preview_activity.xml +++ b/app/src/main/res/layout/chat_wallpaper_preview_activity.xml @@ -121,7 +121,7 @@ android:text="@string/DateUtils_just_now" android:textAppearance="@style/Signal.Text.Caption" android:textColor="@color/transparent_white_80" - app:drawableEndCompat="@drawable/ic_delivery_status_read" + app:drawableEndCompat="@drawable/symbol_messagestatus_read_24" app:drawableTint="@color/core_white" /> diff --git a/app/src/main/res/layout/conversation_list_item_view.xml b/app/src/main/res/layout/conversation_list_item_view.xml index 4500674edf..6d2a4182e5 100644 --- a/app/src/main/res/layout/conversation_list_item_view.xml +++ b/app/src/main/res/layout/conversation_list_item_view.xml @@ -57,7 +57,7 @@ app:layout_constraintStart_toEndOf="@id/conversation_list_item_check_container" app:layout_constraintTop_toTopOf="@id/conversation_list_item_name" app:layout_goneMarginStart="0dp" - tools:src="@drawable/ic_contact_picture" /> + tools:src="@tools:sample/avatars" /> + app:fallbackImageSize="small" /> diff --git a/app/src/main/res/layout/delete_account_country_code_text.xml b/app/src/main/res/layout/delete_account_country_code_text.xml index 850bfc08b1..946d65be52 100644 --- a/app/src/main/res/layout/delete_account_country_code_text.xml +++ b/app/src/main/res/layout/delete_account_country_code_text.xml @@ -15,7 +15,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="3dp" - android:src="@drawable/ic_add_white_original_24dp" + android:src="@drawable/symbol_plus_24" android:tint="@color/core_grey_60" android:contentDescription="+" tools:ignore="HardcodedText" /> diff --git a/app/src/main/res/layout/device_add_fragment.xml b/app/src/main/res/layout/device_add_fragment.xml index bb0b270dec..cd1a129aaf 100644 --- a/app/src/main/res/layout/device_add_fragment.xml +++ b/app/src/main/res/layout/device_add_fragment.xml @@ -45,10 +45,11 @@ diff --git a/app/src/main/res/layout/device_link_fragment.xml b/app/src/main/res/layout/device_link_fragment.xml index 4b33cefab3..23a3a42622 100644 --- a/app/src/main/res/layout/device_link_fragment.xml +++ b/app/src/main/res/layout/device_link_fragment.xml @@ -8,14 +8,15 @@ android:gravity="center"> + android:id="@+id/devices" + android:layout_width="129dp" + android:layout_height="129dp" + android:layout_marginBottom="25dp" + android:contentDescription="@string/device_link_fragment__link_device" + android:scaleType="fitXY" + android:src="@drawable/symbol_devices_24" + android:tint="@color/core_grey_25" + android:transitionName="devices" /> diff --git a/app/src/main/res/layout/document_view.xml b/app/src/main/res/layout/document_view.xml index d1ac9f7994..0b929dcef5 100644 --- a/app/src/main/res/layout/document_view.xml +++ b/app/src/main/res/layout/document_view.xml @@ -69,13 +69,13 @@ diff --git a/app/src/main/res/layout/fragment_registration_country_picker.xml b/app/src/main/res/layout/fragment_registration_country_picker.xml index f7f1fc1cbb..616d234a2e 100644 --- a/app/src/main/res/layout/fragment_registration_country_picker.xml +++ b/app/src/main/res/layout/fragment_registration_country_picker.xml @@ -12,7 +12,7 @@ android:id="@+id/country_search" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:drawableStart="@drawable/ic_menu_search_holo_light" + android:drawableStart="@drawable/symbol_search_24" android:hint="@string/country_selection_fragment__search" app:drawableTint="@color/signal_icon_tint_primary" /> diff --git a/app/src/main/res/layout/item_selectable_contact_field.xml b/app/src/main/res/layout/item_selectable_contact_field.xml index 9dbce997ac..d6037a08f6 100644 --- a/app/src/main/res/layout/item_selectable_contact_field.xml +++ b/app/src/main/res/layout/item_selectable_contact_field.xml @@ -29,7 +29,7 @@ android:layout_marginStart="24dp" android:contentDescription="@string/ContactShareEditActivity__avatar" android:visibility="gone" - tools:src="@drawable/ic_contact_picture" + tools:src="@tools:sample/avatars" tools:visibility="visible" /> \ No newline at end of file diff --git a/app/src/main/res/layout/main_activity_list_host_fragment.xml b/app/src/main/res/layout/main_activity_list_host_fragment.xml index 2648b85ecd..46430c7bfc 100644 --- a/app/src/main/res/layout/main_activity_list_host_fragment.xml +++ b/app/src/main/res/layout/main_activity_list_host_fragment.xml @@ -38,7 +38,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:src="@drawable/ic_contact_picture" /> + tools:src="@tools:sample/avatars" /> - diff --git a/app/src/main/res/layout/message_details_header.xml b/app/src/main/res/layout/message_details_header.xml index d62aef7788..906c823bab 100644 --- a/app/src/main/res/layout/message_details_header.xml +++ b/app/src/main/res/layout/message_details_header.xml @@ -69,7 +69,8 @@ android:layout_gravity="center_vertical" android:text="@string/message_recipients_list_item__resend" android:visibility="gone" - app:icon="@drawable/ic_refresh_white_18dp" + app:icon="@drawable/symbol_refresh_24" + app:iconTint="@color/signal_colorOnPrimaryContainer" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/message_details_recipient.xml b/app/src/main/res/layout/message_details_recipient.xml index a4e855ac07..1badae713a 100644 --- a/app/src/main/res/layout/message_details_recipient.xml +++ b/app/src/main/res/layout/message_details_recipient.xml @@ -31,7 +31,7 @@ app:layout_constraintEnd_toStartOf="@+id/message_details_recipient_name" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:src="@drawable/ic_contact_picture" /> + tools:src="@tools:sample/avatars" /> - - - - - - - - - - - - - -