mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Move to new colors, switch incoming/outgoing colors

Browse source
This commit is contained in:
Scott Nonnenberg 2018-09-25 17:26:06 -07:00
parent cd60bdd08a
commit 10c53bddb0
22 changed files with 1116 additions and 1233 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/models/messages.js
View file

@ -394,7 +394,6 @@
const contact = this.findAndFormatContact(phoneNumber);
const contactModel = this.findContact(phoneNumber);
const authorColor = contactModel ? contactModel.getColor() : null;
const authorAvatar = contactModel ? contactModel.getAvatar() : null;
const authorAvatarPath = authorAvatar ? authorAvatar.url : null;
@ -407,6 +406,7 @@
const conversation = this.getConversation();
const isGroup = conversation && !conversation.isPrivate();
const conversationColor = conversation && conversation.getColor();
const attachments = this.get('attachments');
const firstAttachment = attachments && attachments[0];
@ -421,7 +421,7 @@
authorName: contact.name,
authorProfileName: contact.profileName,
authorPhoneNumber: contact.phoneNumber,
authorColor,
conversationColor,
conversationType: isGroup ? 'group' : 'direct',
attachment: this.getPropsForAttachment(firstAttachment),
quote: this.getPropsForQuote(),
@ -536,7 +536,6 @@
const authorPhoneNumber = author;
const authorProfileName = contact ? contact.getProfileName() : null;
const authorName = contact ? contact.getName() : null;
const authorColor = contact ? contact.getColor() : 'grey';
const isFromMe = contact ? contact.id === this.OUR_NUMBER : false;
const onClick = () => {
this.trigger('scroll-to-message', {
@ -557,7 +556,6 @@
authorPhoneNumber,
authorProfileName,
authorName,
authorColor,
onClick,
referencedMessageNotFound,
};