Merge branch 'mkirk/blue-group' into release/2.30.2

7 years ago · 97d6ac3706
parent ebd3560547 d5f69e4bba
commit 97d6ac3706
2 changed files with 5 additions and 0 deletions
--- a/SignalMessaging/categories/UIColor+OWS.m
+++ b/SignalMessaging/categories/UIColor+OWS.m
@ -198,6 +198,7 @@ NS_ASSUME_NONNULL_BEGIN
 // TODO: Remove
 + (UIColor *)ows_darkSkyBlueColor
 {
+    // HEX 0xc2090EA
    return [UIColor colorWithRed:32.f / 255.f green:144.f / 255.f blue:234.f / 255.f alpha:1.f];
 }

--- a/SignalMessaging/utils/OWSGroupAvatarBuilder.m
+++ b/SignalMessaging/utils/OWSGroupAvatarBuilder.m
@ -66,8 +66,12 @@ NS_ASSUME_NONNULL_BEGIN
        return cachedAvatar;
    }

+#ifdef SHOW_COLOR_PICKER
    UIColor *backgroundColor =
        [OWSConversationColor conversationColorOrDefaultForColorName:conversationColorName].themeColor;
+#else
+    UIColor *backgroundColor = UIColor.ows_darkSkyBlueColor;
+#endif
    UIImage *_Nullable image =
        [OWSGroupAvatarBuilder groupAvatarImageWithBackgroundColor:backgroundColor diameter:diameter];
    if (!image) {