From ecbbe30259945b2912e5b32dadb3f980218ed748 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Wed, 22 May 2019 22:51:01 +0200 Subject: [PATCH] remove unused inverted-avatars --- .../securesms/components/AvatarImageView.java | 2 +- .../avatars/FallbackContactPhoto.java | 1 - .../avatars/GeneratedContactPhoto.java | 9 ++---- .../avatars/ResourceContactPhoto.java | 11 +------ .../avatars/TransparentContactPhoto.java | 30 ------------------- .../securesms/recipients/Recipient.java | 2 +- 6 files changed, 5 insertions(+), 50 deletions(-) delete mode 100644 src/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java diff --git a/src/org/thoughtcrime/securesms/components/AvatarImageView.java b/src/org/thoughtcrime/securesms/components/AvatarImageView.java index 03c7a622a..0757b25b3 100644 --- a/src/org/thoughtcrime/securesms/components/AvatarImageView.java +++ b/src/org/thoughtcrime/securesms/components/AvatarImageView.java @@ -59,7 +59,7 @@ public class AvatarImageView extends AppCompatImageView { setAvatarClickHandler(recipient, quickContactEnabled); } } else { - setImageDrawable(new GeneratedContactPhoto("+").asDrawable(getContext(), ThemeUtil.getDummyContactColor(getContext()), false)); + setImageDrawable(new GeneratedContactPhoto("+").asDrawable(getContext(), ThemeUtil.getDummyContactColor(getContext()))); super.setOnClickListener(listener); } } diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java index 8d8bf0ed8..d33323098 100644 --- a/src/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java +++ b/src/org/thoughtcrime/securesms/contacts/avatars/FallbackContactPhoto.java @@ -6,7 +6,6 @@ import android.graphics.drawable.Drawable; public interface FallbackContactPhoto { public Drawable asDrawable(Context context, int color); - public Drawable asDrawable(Context context, int color, boolean inverted); public Drawable asCallCard(Context context); } diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java index 61e6f06f6..374711074 100644 --- a/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java +++ b/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java @@ -25,20 +25,15 @@ public class GeneratedContactPhoto implements FallbackContactPhoto { @Override public Drawable asDrawable(Context context, int color) { - return asDrawable(context, color, false); - } - - @Override - public Drawable asDrawable(Context context, int color, boolean inverted) { int targetSize = context.getResources().getDimensionPixelSize(R.dimen.contact_photo_target_size); return TextDrawable.builder() .beginConfig() .width(targetSize) .height(targetSize) - .textColor(inverted ? color : Color.WHITE) + .textColor(Color.WHITE) .endConfig() - .buildRound(getCharacter(name), inverted ? Color.WHITE : color); + .buildRound(getCharacter(name), color); } private String getCharacter(String name) { diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java index edb902c35..690b24d49 100644 --- a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java +++ b/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java @@ -28,20 +28,11 @@ public class ResourceContactPhoto implements FallbackContactPhoto { @Override public Drawable asDrawable(Context context, int color) { - return asDrawable(context, color, false); - } - - @Override - public Drawable asDrawable(Context context, int color, boolean inverted) { - Drawable background = TextDrawable.builder().buildRound(" ", inverted ? Color.WHITE : color); + Drawable background = TextDrawable.builder().buildRound(" ", color); RoundedDrawable foreground = (RoundedDrawable) RoundedDrawable.fromDrawable(context.getResources().getDrawable(resourceId)); foreground.setScaleType(ImageView.ScaleType.CENTER); - if (inverted) { - foreground.setColorFilter(color, PorterDuff.Mode.SRC_ATOP); - } - return new ExpandingLayerDrawable(new Drawable[] {background, foreground}); } diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java deleted file mode 100644 index 33c2064b1..000000000 --- a/src/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.thoughtcrime.securesms.contacts.avatars; - -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; - -import com.makeramen.roundedimageview.RoundedDrawable; - -import org.thoughtcrime.securesms.R; - -public class TransparentContactPhoto implements FallbackContactPhoto { - - public TransparentContactPhoto() {} - - @Override - public Drawable asDrawable(Context context, int color) { - return asDrawable(context, color, false); - } - - @Override - public Drawable asDrawable(Context context, int color, boolean inverted) { - return RoundedDrawable.fromDrawable(context.getResources().getDrawable(android.R.color.transparent)); - } - - @Override - public Drawable asCallCard(Context context) { - return ContextCompat.getDrawable(context, R.drawable.ic_contact_picture_large); - } - -} diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java index ce2a402fc..4eaa4d89e 100644 --- a/src/org/thoughtcrime/securesms/recipients/Recipient.java +++ b/src/org/thoughtcrime/securesms/recipients/Recipient.java @@ -203,7 +203,7 @@ public class Recipient { } public synchronized @NonNull Drawable getFallbackAvatarDrawable(Context context) { - return getFallbackContactPhoto().asDrawable(context, getFallbackAvatarColor(context), false); + return getFallbackContactPhoto().asDrawable(context, getFallbackAvatarColor(context)); } public synchronized @NonNull FallbackContactPhoto getFallbackContactPhoto() {