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

Android theme: Incoming quotes take color from containing message

Browse source
This commit is contained in:
Scott Nonnenberg 2018-10-18 11:57:10 -07:00
parent f21f83a163
commit fbaef50c4a
2 changed files with 46 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ts/components/conversation/Message.tsx
View file

@ -557,7 +557,13 @@ export class Message extends React.Component<Props, State> {
}
public renderQuote() {
const { conversationType, direction, i18n, quote } = this.props;
const {
conversationType,
authorColor,
direction,
i18n,
quote,
} = this.props;
if (!quote) {
return null;
@ -565,6 +571,8 @@ export class Message extends React.Component<Props, State> {
const withContentAbove =
conversationType === 'group' && direction === 'incoming';
const quoteColor =
direction === 'incoming' ? authorColor : quote.authorColor;
return (
<Quote
@ -576,7 +584,7 @@ export class Message extends React.Component<Props, State> {
authorPhoneNumber={quote.authorPhoneNumber}
authorProfileName={quote.authorProfileName}
authorName={quote.authorName}
authorColor={quote.authorColor}
authorColor={quoteColor}
referencedMessageNotFound={quote.referencedMessageNotFound}
isFromMe={quote.isFromMe}
withContentAbove={withContentAbove}