Merge branch 'charlesmchen/conversationColorsFeatureFlag'

7 years ago · dd2c0c3a92
parent e6e945b788 db27acf61b
commit dd2c0c3a92
1 changed files with 3 additions and 0 deletions
--- a/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/OWSConversationSettingsViewController.m
@ -282,6 +282,8 @@ const CGFloat kIconViewLength = 24;
                             }]];


+//#define SHOW_CONVERSATION_COLORS_UI
+#ifdef SHOW_CONVERSATION_COLORS_UI
    [mainSection addItem:[OWSTableItem
                             itemWithCustomCellBlock:^{
                                 NSString *colorName = self.thread.conversationColorName;
@ -293,6 +295,7 @@ const CGFloat kIconViewLength = 24;
                             actionBlock:^{
                                 [weakSelf showColorPicker];
                             }]];
+#endif

    if ([self.thread isKindOfClass:[TSContactThread class]] && self.contactsManager.supportsContactEditing
        && !self.hasExistingContact) {