Status colors can be disabled in branding plist

Author: chrisballinger

ChatSecure/Classes/Utilities/OTRColors.h

@@ -10,6 +10,7 @@
 
 #import "OTRThreadOwner.h"
 
+NS_ASSUME_NONNULL_BEGIN
 @interface OTRColors : NSObject
 
 +(UIColor *)colorWithStatus:(OTRThreadStatus)status;
@@ -24,5 +25,5 @@
 + (UIColor *)warnColor;
 
 + (UIColor *)defaultBlueColor;
-
 @end
+NS_ASSUME_NONNULL_END

ChatSecure/Classes/Utilities/OTRColors.m

@@ -7,18 +7,22 @@
 //
 
 #import "OTRColors.h"
+@import OTRAssets;
 
 @implementation OTRColors
 
 +(UIColor *)colorWithStatus:(OTRThreadStatus)status
 {
-    UIColor *color = nil;
+    if (!OTRBranding.showsColorForStatus) {
+        return [UIColor clearColor];
+    }
+    UIColor *color = [UIColor clearColor];
     switch(status)
     {
         case OTRThreadStatusUnknown:
         case OTRThreadStatusOffline:
             //color = [UIColor colorWithRed: 0.763 green: 0.763 blue: 0.763 alpha: 1];
-            return nil;
+            return [UIColor clearColor];
             break;
         case OTRThreadStatusAway:
             color = [UIColor colorWithRed: 0.901 green: 0.527 blue: 0.23 alpha: 1];

OTRAssets/OTRBranding.h

@@ -83,5 +83,8 @@ FOUNDATION_EXPORT NSString *const kOTRSettingKeyLanguage;
 /** If enabled, the server selection cell will be shown when creating new accounts. Otherwise it will be hidden in the 'advanced' section. */
 + (BOOL) shouldShowServerCell;
 
+/** If enabled, will show colors for status indicators. */
+@property (class, readonly) BOOL showsColorForStatus;
+
 @end
 NS_ASSUME_NONNULL_END

OTRAssets/OTRBranding.m

@@ -144,6 +144,11 @@ + (BOOL) shouldShowServerCell {
     return result;
 }
 
++ (BOOL) showsColorForStatus {
+    BOOL result = [[[self defaultPlist] objectForKey:@"ShowsColorForStatus"] boolValue];
+    return result;
+}
+
 + (NSDictionary*) defaultPlist {
     // Normally this won't be nil, but they WILL be nil during tests.
     NSBundle *bundle = [OTRAssets resourcesBundle];

OTRResources/Branding.plist

@@ -36,5 +36,7 @@
 	<true/>
 	<key>ShouldShowServerCell</key>
 	<true/>
+	<key>ShowsColorForStatus</key>
+	<true/>
 </dict>
 </plist>