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

Rewrite fallbackphoto system.

Browse Source
This commit is contained in:
Alex Hart
2024-06-12 15:59:35 -03:00
committed by Greyson Parrelli
parent d698f74d0b
commit 11557e4815
42 changed files with 676 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java
View File

@@ -8,12 +8,8 @@ import android.widget.FrameLayout;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.FallbackPhoto20dp;
import org.thoughtcrime.securesms.contacts.avatars.GeneratedContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
import org.thoughtcrime.securesms.conversation.colors.AvatarColor;
import org.thoughtcrime.securesms.avatar.fallback.FallbackAvatar;
import org.thoughtcrime.securesms.components.AvatarImageView;
import org.thoughtcrime.securesms.databinding.ReviewBannerViewBinding;
import org.thoughtcrime.securesms.recipients.Recipient;
@@ -39,10 +35,10 @@ public class ReviewBannerView extends FrameLayout {
binding = ReviewBannerViewBinding.bind(this);
FallbackPhotoProvider provider = new FallbackPhotoProvider();
FallbackAvatarProvider provider = new FallbackAvatarProvider();
binding.bannerBottomRightAvatar.setFallbackPhotoProvider(provider);
binding.bannerTopLeftAvatar.setFallbackPhotoProvider(provider);
binding.bannerBottomRightAvatar.setFallbackAvatarProvider(provider);
binding.bannerTopLeftAvatar.setFallbackAvatarProvider(provider);
binding.bannerClose.setOnClickListener(v -> {
if (onHideListener != null && onHideListener.onHide()) {
@@ -86,44 +82,14 @@ public class ReviewBannerView extends FrameLayout {
binding.bannerTapToReview.setOnClickListener(l);
}
private static final class FallbackPhotoProvider extends Recipient.FallbackPhotoProvider {
private static final class FallbackAvatarProvider implements AvatarImageView.FallbackAvatarProvider {
@Override
public @NonNull
FallbackContactPhoto getPhotoForGroup() {
throw new UnsupportedOperationException("This provider does not support groups");
}
public @NonNull FallbackAvatar getFallbackAvatar(@NonNull Recipient recipient) {
if (recipient.isIndividual() && !recipient.isSelf()) {
return new FallbackAvatar.Resource.Person(recipient.getAvatarColor());
}
@Override
public @NonNull FallbackContactPhoto getPhotoForResolvingRecipient() {
throw new UnsupportedOperationException("This provider does not support resolving recipients");
}
@Override
public @NonNull FallbackContactPhoto getPhotoForLocalNumber() {
return new ResourceContactPhoto(R.drawable.symbol_note_light_24, R.drawable.symbol_note_light_24);
}
@NonNull
@Override
public FallbackContactPhoto getPhotoForRecipientWithName(String name, int targetSize) {
return new FixedSizeGeneratedContactPhoto(name, R.drawable.ic_profile_outline_20);
}
@NonNull
@Override
public FallbackContactPhoto getPhotoForRecipientWithoutName() {
return new FallbackPhoto20dp(R.drawable.ic_profile_outline_20);
}
}
private static final class FixedSizeGeneratedContactPhoto extends GeneratedContactPhoto {
public FixedSizeGeneratedContactPhoto(@NonNull String name, int fallbackResId) {
super(name, fallbackResId);
}
@Override
protected Drawable newFallbackDrawable(@NonNull Context context, @NonNull AvatarColor color, boolean inverted) {
return new FallbackPhoto20dp(getFallbackResId()).asDrawable(context, color, inverted);
return recipient.getFallbackAvatar();
}
}