Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-06-08 08:17:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Display contact color in background for generated avatars

Browse Source 
Fixes #7028
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2017-10-04 15:23:33 -07:00
parent 42f613e722
commit ac282ccf70
9 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
+8 -1
View File
@@ -36,6 +36,7 @@ import android.widget.TextView;
import org.thoughtcrime.securesms.color.MaterialColor;
import org.thoughtcrime.securesms.color.MaterialColors;
import org.thoughtcrime.securesms.components.ThreadPhotoRailView;
import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
import org.thoughtcrime.securesms.crypto.IdentityKeyParcelable;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.Address;
@@ -203,7 +204,13 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
}
private void setHeader(@NonNull Recipient recipient) {
this.avatar.setImageDrawable(recipient.getContactPhoto().asCallCard(this));
ContactPhoto contactPhoto = recipient.getContactPhoto();
if (contactPhoto.isGenerated() || contactPhoto.isResource()) this.avatar.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
else this.avatar.setScaleType(ImageView.ScaleType.CENTER_CROP);
this.avatar.setImageDrawable(contactPhoto.asCallCard(this));
this.avatar.setBackgroundColor(recipient.getColor().toActionBarColor(this));
this.toolbarLayout.setTitle(recipient.toShortString());
this.toolbarLayout.setContentScrimColor(recipient.getColor().toActionBarColor(this));
}