From 2323cc21f094bbb16b8fb4f74aed6e6e4947f692 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Wed, 6 Feb 2019 16:11:08 -0700
Subject: [PATCH] note-to-self avatar

---
 .../Contents.json                             |  23 ++++++++
 .../note-24@1x.png                            | Bin 0 -> 201 bytes
 .../note-24@2x.png                            | Bin 0 -> 300 bytes
 .../note-24@3x.png                            | Bin 0 -> 447 bytes
 .../utils/OWSContactAvatarBuilder.m           |  52 +++++++++++++++++-
 5 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 Signal/Images.xcassets/note-to-self-avatar.imageset/Contents.json
 create mode 100644 Signal/Images.xcassets/note-to-self-avatar.imageset/note-24@1x.png
 create mode 100644 Signal/Images.xcassets/note-to-self-avatar.imageset/note-24@2x.png
 create mode 100644 Signal/Images.xcassets/note-to-self-avatar.imageset/note-24@3x.png

diff --git a/Signal/Images.xcassets/note-to-self-avatar.imageset/Contents.json b/Signal/Images.xcassets/note-to-self-avatar.imageset/Contents.json
new file mode 100644
index 000000000..a744eac47
--- /dev/null
+++ b/Signal/Images.xcassets/note-to-self-avatar.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "note-24@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "note-24@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "note-24@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/note-to-self-avatar.imageset/note-24@1x.png b/Signal/Images.xcassets/note-to-self-avatar.imageset/note-24@1x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3acc9b4098a3509b814975b4976a4d732d53a70d
GIT binary patch
literal 201
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjoCO|{#S9GGLLkg|>2BR0pkTG9
zi(`mK=i4wxt^*1@-pAxNsF&-1<LtXPXXy)>R!g2Q2`hbPHJzAathBMUEc^vaDuaM8
zf7_M6d14c77*rNNnwc=|c|rG?NuK*|RoNcQ)0%Tg%qCHf(bMoGqfYm&Bc~UseN5MV
vCHhFnCpqv(_AmdY%PGGS-}(Jp%}~JTUY5n~5xDj-&>0M#u6{1-oD!M<4?RiR

literal 0
HcmV?d00001

diff --git a/Signal/Images.xcassets/note-to-self-avatar.imageset/note-24@2x.png b/Signal/Images.xcassets/note-to-self-avatar.imageset/note-24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0969bcaa369d8d1da0f987c9f94603643e05a8c7
GIT binary patch
literal 300
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?2=RS;(M3{v?36ujr@
z;uw<A_;%Js-a`gFF6TQKZ!oyM(&+I~PheTRBHlzbkM+l_SM#RGt52%^dena9PV1^?
zS4zJMZD2no+acD#cwn)Nf0XL=4Xd^-eQ>*R<&QOoo@<K;`Y9S~$3KqBePXcd_u8o|
zH4mK8W0-f<P3c|U+MK)bkJ8u;N*C5XI4`r0`7XCb_{4@4OYd*Gx@nWZ?6YD?{!1-4
z2}t`Yn$2>`Ndc24tv60M<y=~RVZE*f_r{ANNy>~lDh<6X8zPkx)+klB?7YsgBYdLG
sqdVUE_409A<v-7?s#m??!63?@f6Gv{$;~AF7|^E-p00i_>zopr0Jv;*#{d8T

literal 0
HcmV?d00001

diff --git a/Signal/Images.xcassets/note-to-self-avatar.imageset/note-24@3x.png b/Signal/Images.xcassets/note-to-self-avatar.imageset/note-24@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..aaf28b6933d0f8fe1ef9e0a9d8b82860f0fb58e9
GIT binary patch
literal 447
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!oCO|{#S9FJ<{->y95KI&fq}8m
z)5S5QV$Rz;2YnA4NH{#azoJ}Xp>jz}-?c!AMj#TL#Mu+`Gh}<^4J{?N_mhhXS$6oB
zy^_l~W!WxQU0LBC&c+0WN>5{Ro^*92yX<j45>$8AZ~fA9A1(e^z2|+z?>eVU?%6l3
zV%xjbx+SIan}fVkpVqh?$u2Iwe@*J;>hx*K=NFuADO_~!=cS&eiK1J4q*g=}pUXe{
zqHUdM$oA`N3X@Xa?TyaKbo;k+qORH3<+tY)XR(=A1h7D?Zhw2*{`&6^zjM!585goL
zGBYwaF1H0*a#x-u{eh>{j-w5YK*;X;fD7zWIgv&nTZ|c`8OYY=kN`rUVL)~?4~Xqk
z9Pnp#`g}|YkR$^3utd$CSXpwuR^@`bu~GlKoxk%RE~sX`YF{ufXZ6&b^Qs@m{Jbi1
nd-{C`)|%Pu&``Q1BzS+f)Q$6<X%p81V}!xe)z4*}Q$iB}wOpl2

literal 0
HcmV?d00001

diff --git a/SignalMessaging/utils/OWSContactAvatarBuilder.m b/SignalMessaging/utils/OWSContactAvatarBuilder.m
index 2a3528148..3ae39c075 100644
--- a/SignalMessaging/utils/OWSContactAvatarBuilder.m
+++ b/SignalMessaging/utils/OWSContactAvatarBuilder.m
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 #import "OWSContactAvatarBuilder.h"
@@ -90,6 +90,27 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (nullable UIImage *)buildSavedImage
 {
+    if ([self.signalId isEqualToString:TSAccountManager.localNumber]) {
+        NSString *noteToSelfCacheKey = [NSString stringWithFormat:@"%@:note-to-self", self.cacheKey];
+        UIImage *_Nullable cachedAvatar =
+            [OWSContactAvatarBuilder.contactsManager.avatarCache imageForKey:noteToSelfCacheKey
+                                                                    diameter:(CGFloat)self.diameter];
+        if (cachedAvatar) {
+            return cachedAvatar;
+        }
+
+        UIImage *image = [self noteToSelfImageWithConversationColorName:self.colorName];
+        if (!image) {
+            OWSFailDebug(@"Could not generate avatar.");
+            return nil;
+        }
+
+        [OWSContactAvatarBuilder.contactsManager.avatarCache setImage:image
+                                                               forKey:noteToSelfCacheKey
+                                                             diameter:self.diameter];
+        return image;
+    }
+
     return [OWSContactAvatarBuilder.contactsManager imageForPhoneIdentifier:self.signalId];
 }
 
@@ -162,6 +183,35 @@ NS_ASSUME_NONNULL_BEGIN
     return image;
 }
 
+- (nullable UIImage *)noteToSelfImageWithConversationColorName:(ConversationColorName)conversationColorName
+{
+    UIImage *baseImage = [[UIImage imageNamed:@"note-to-self-avatar"] asTintedImageWithColor:UIColor.whiteColor];
+    UIColor *backgroundColor = [OWSConversationColor conversationColorOrDefaultForColorName:conversationColorName].themeColor;
+
+    CGFloat paddingFactor = 1.6;
+    CGFloat paddedWidth = baseImage.size.width * paddingFactor;
+    CGFloat paddedheight = baseImage.size.height * paddingFactor;
+
+    UIGraphicsBeginImageContextWithOptions(CGSizeMake(paddedWidth, paddedheight), NO, 0.0);
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    UIGraphicsPushContext(context);
+
+    [backgroundColor setFill];
+    CGContextFillRect(context, CGRectMake(0, 0, paddedWidth, paddedheight));
+
+    CGPoint origin = CGPointMake((paddedWidth - baseImage.size.width) / 2.0f,
+                                 (paddedheight - baseImage.size.height) / 2.0f);
+    [baseImage drawAtPoint:origin];
+
+
+    // Clean up and get the new image.
+    UIGraphicsPopContext();
+    UIImage *paddedImage = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+
+    return paddedImage;
+}
+
 @end
 
 NS_ASSUME_NONNULL_END