Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-23 01:48:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to new design for avatars: individual/group icons/colors

Browse Source 
And two initials.
This commit is contained in:
Scott Nonnenberg
2018-09-26 17:23:17 -07:00
parent cf16ced91c
commit 8f3e3b7aaf
21 changed files with 1210 additions and 1017 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/views/contact_list_view.js
View File

@@ -25,9 +25,6 @@
this.contactView = null;
}
const avatar = this.model.getAvatar();
const avatarPath = avatar && avatar.url;
const color = avatar && avatar.color;
const isMe = this.ourNumber === this.model.id;
this.contactView = new Whisper.ReactWrapperView({
@@ -35,8 +32,8 @@
Component: window.Signal.Components.ContactListItem,
props: {
isMe,
color,
avatarPath,
color: this.model.getColor(),
avatarPath: this.model.getAvatarPath(),
phoneNumber: this.model.getNumber(),
name: this.model.getName(),
profileName: this.model.getProfileName(),

5
js/views/conversation_view.js
View File

@@ -145,8 +145,6 @@
});
const getHeaderProps = () => {
const avatar = this.model.getAvatar();
const avatarPath = avatar ? avatar.url : null;
const expireTimer = this.model.get('expireTimer');
const expirationSettingName = expireTimer
? Whisper.ExpirationTimerOptions.getName(expireTimer || 0)
@@ -158,7 +156,7 @@
phoneNumber: this.model.getNumber(),
profileName: this.model.getProfileName(),
color: this.model.getColor(),
avatarPath,
avatarPath: this.model.getAvatarPath(),
isVerified: this.model.isVerified(),
isMe: this.model.isMe(),
isGroup: !this.model.isPrivate(),
@@ -1401,6 +1399,7 @@
}
const message = new Whisper.Message({
conversationId: this.model.id,
quote: this.quote,
});
message.quotedMessage = this.quotedMessage;