color

iOSClient/CCGlobal.h

@@ -283,7 +283,7 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define COLOR_BACKGROUND_MENU           [UIColor colorWithRed:(247.0f/255.0f) green:(247.0f/255.0f) blue:(247.0f/255.0f) alpha:1.0]
 
 #define COLOR_BACKGROUND_PAGECONTROL    [UIColor colorWithRed:(247.0f/255.0f) green:(247.0f/255.0f) blue:(247.0f/255.0f) alpha:1.0]
-#define COLOR_PAGECONTROL_INDICATOR     [UIColor colorWithRed:(247.0f/255.0f) green:(247.0f/255.0f) blue:(247.0f/255.0f) alpha:1.0]
+#define COLOR_PAGECONTROL_INDICATOR     [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:1.0]
 
 #define COLOR_CRYPTOCLOUD               [UIColor colorWithRed:241.0/255.0 green:90.0/255.0 blue:34.0/255.0 alpha:1.0]
 

iOSClient/QuickActions/CCQuickActions.m

@@ -22,7 +22,7 @@
 //
 
 #import "CCQuickActions.h"
-
+#import "CTAssetCheckmark.h"
 #import "CCHud.h"
 #import "AppDelegate.h"
 #import "CCMain.h"
@@ -95,11 +95,12 @@
 
 - (void)openAssetsPickerController
 {
-    CTAssetSelectionLabel *assetSelectionLabel = [CTAssetSelectionLabel appearance];
-    assetSelectionLabel.borderWidth = 1.0;
-    assetSelectionLabel.borderColor = COLOR_BRAND;
-    [assetSelectionLabel setMargin:2.0];
-    [assetSelectionLabel setTextAttributes:@{NSFontAttributeName : [UIFont systemFontOfSize:12.0], NSForegroundColorAttributeName : [UIColor whiteColor], NSBackgroundColorAttributeName : COLOR_BRAND}];
+    CTAssetCheckmark *checkmark = [CTAssetCheckmark appearance];
+    checkmark.tintColor = COLOR_BRAND;
+    [checkmark setMargin:0.0 forVerticalEdge:NSLayoutAttributeRight horizontalEdge:NSLayoutAttributeTop];
+    
+    UINavigationBar *navBar = [UINavigationBar appearanceWhenContainedIn:[CTAssetsPickerController class], nil];
+    [CCAspect aspectNavigationControllerBar:navBar encrypted:NO online:YES hidden:NO];
     
     [PHPhotoLibrary requestAuthorization:^(PHAuthorizationStatus status) {
         dispatch_async(dispatch_get_main_queue(), ^{

iOSClient/Settings/CCSettings.m

@@ -64,6 +64,7 @@
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"bloccopasscode" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_lock_not_active_", nil)];
     [row.cellConfig setObject:[UIImage imageNamed:image_settingsPasscodeNO] forKey:@"imageView.image"];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    [row.cellConfig setObject:COLOR_CRYPTOCLOUD forKey:@"textLabel.textColor"];
     [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
     [row.cellConfig setObject:@(UITableViewCellAccessoryDisclosureIndicator) forKey:@"accessoryType"];
     row.action.formSelector = @selector(bloccoPassword);
@@ -172,6 +173,7 @@
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"buttonLeftAligned" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_acknowledgements_", nil)];
     [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    [row.cellConfig setObject:COLOR_BRAND forKey:@"textLabel.textColor"];
     [row.cellConfig setObject:[UIImage imageNamed:image_settingsAcknowledgements] forKey:@"imageView.image"];
     [row.cellConfig setObject:@(UITableViewCellAccessoryDisclosureIndicator) forKey:@"accessoryType"];
     row.action.formBlock = ^(XLFormRowDescriptor * sender){
@@ -211,6 +213,7 @@
     // Clear cache
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"azzeracache" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_clear_cache_no_size_", nil)];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    [row.cellConfig setObject:COLOR_BRAND forKey:@"textLabel.textColor"];
     [row.cellConfig setObject:[UIImage imageNamed:image_settingsClearCache] forKey:@"imageView.image"];
     row.action.formSelector = @selector(azzeraCache:);
     [section addFormRow:row];

iOSClient/Share/CCShareInfoCMOC.m

@@ -45,6 +45,16 @@
 
 @implementation CCShareInfoCMOC
 
+- (instancetype)initWithCoder:(NSCoder *)coder
+{
+    self = [super initWithCoder:coder];
+    if (self) {
+                
+        [self initializeForm];
+    }
+    return self;
+}
+
 - (void)initializeForm
 {
     XLFormDescriptor *form ;
@@ -136,18 +146,11 @@
 {
     [super viewDidLoad];
     
-    // Color
-    [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar encrypted:NO online:[app.reachability isReachable] hidden:NO];
-    [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
-    
-    // Done
-    [self.endButton setTitle:NSLocalizedString(@"_done_", nil) forState:UIControlStateNormal];
-    self.endButton.tintColor = [COLOR_BRAND colorWithAlphaComponent:0.8];
-    
-    // view tint color
     [self.view setTintColor:COLOR_BRAND];
+    self.view.backgroundColor = COLOR_NAVIGATIONBAR;
     
-    [self initializeForm];
+    [self.endButton setTitle:NSLocalizedString(@"_done_", nil) forState:UIControlStateNormal];
+    self.endButton.tintColor = COLOR_NAVIGATIONBAR_TEXT;    
 }
 
 #pragma --------------------------------------------------------------------------------------------