color

iOSClient/AppDelegate.m

@@ -657,7 +657,7 @@
             backgroundColor = [UIColor colorWithRed:0.588 green:0.797 blue:0.000 alpha:0.90];
             break;
         case TWMessageBarMessageTypeInfo:
-            backgroundColor = COLOR_BRAND;
+            backgroundColor = COLOR_BACKGROUND_MESSAGE_INFO;
             break;
         default:
             break;

iOSClient/CCGlobal.h

@@ -293,6 +293,10 @@ extern NSString *const BKPasscodeKeychainServiceName;
 
 #define COLOR_SEPARATOR_TABLE           [UIColor colorWithRed:247.0/255.0 green:247.0/255.0 blue:247.0/255.0 alpha:1]                   // iOS 7
 
+#define COLOR_BACKGROUND_MESSAGE_INFO   [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:1.0]
+#define COLOR_CONTROL_CENTER            [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:1.0]
+#define COLOR_REFRESH_CONTROL           [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:1.0]
+
 #endif
 
 

iOSClient/Main/CCMain.m

@@ -29,6 +29,7 @@
 #import <OCCommunicationLib/OCNotifications.h>
 #import <OCCommunicationLib/OCNotificationsAction.h>
 #import <OCCommunicationLib/OCFrameworkConstants.h>
+#import "CTAssetCheckmark.h"
 
 #import "Nextcloud-Swift.h"
 
@@ -439,7 +440,7 @@
 - (void)createRefreshControl
 {
     _refreshControl = [UIRefreshControl new];
-    _refreshControl.tintColor = COLOR_BRAND;
+    _refreshControl.tintColor = COLOR_REFRESH_CONTROL;
     [_refreshControl addTarget:self action:@selector(refreshControlTarget) forControlEvents:UIControlEventValueChanged];
     [self setRefreshControl:_refreshControl];
 }
@@ -688,11 +689,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/MenuAccount+ControlCenter/CCControlCenter.m

@@ -99,7 +99,7 @@
     
     _noRecord =[[UILabel alloc]init];
     _noRecord.backgroundColor=[UIColor clearColor];
-    _noRecord.textColor = COLOR_BRAND;
+    _noRecord.textColor = COLOR_CONTROL_CENTER;
     _noRecord.font = [UIFont systemFontOfSize:SIZE_FONT_NORECORD];
     _noRecord.textAlignment = NSTextAlignmentCenter;
     _noRecord.text = NSLocalizedString(@"_no_transfer_",nil);
@@ -130,7 +130,7 @@
     
     _endLine = [[UIView alloc] init];
     [_endLine setFrame:CGRectMake(0, 0, self.navigationBar.frame.size.width, 0)];
-    _endLine.backgroundColor = COLOR_BRAND;
+    _endLine.backgroundColor = COLOR_CONTROL_CENTER;
 
     [_mainView addSubview:_endLine];
     

iOSClient/Templates/CCTemplates.m

@@ -34,8 +34,8 @@
     UILabel* label=[[UILabel alloc] initWithFrame:CGRectMake(0,0, navItem.titleView.frame.size.width, 40)];
     label.text=titolo;
     if (!reachability) label.textColor = COLOR_TEXT_NO_CONNECTION;
-    else label.textColor = [UIColor blackColor];
-    label.backgroundColor =[UIColor clearColor];
+    else label.textColor = COLOR_NAVIGATIONBAR_TEXT;
+    label.backgroundColor = COLOR_NAVIGATIONBAR;
     label.textAlignment = NSTextAlignmentCenter;
     navItem.titleView=label;
 }