new assets

iOSClient/CCStandardImages.h

@@ -125,7 +125,6 @@
 #define image_settingsAccountModify             @"settingsAccountModify"
 #define image_settingsAccountNextcloud          @"settingsAccountNextcloud"
 #define image_settingsAcknowledgements          @"settingsAcknowledgements"
-#define image_settingsAdmin                     @"settingsAdmin"
 #define image_settingsCameraUpload              @"settingsCameraUpload"
 #define image_settingsClearCache                @"settingsClearCache"
 #define image_settingsCredentials               @"settingsCredentials"

iOSClient/Images.xcassets/settingsAccountDelete.imageset/Contents.json

@@ -2,8 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "settingsAccountDelete.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
@@ -12,8 +11,7 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "settingsAccountDelete@3x.png"
+      "scale" : "3x"
     }
   ],
   "info" : {

iOSClient/Images.xcassets/settingsAccountModify.imageset/Contents.json

@@ -2,8 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "settingsAccountModify.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
@@ -12,8 +11,7 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "settingsAccountModify@3x.png"
+      "scale" : "3x"
     }
   ],
   "info" : {

iOSClient/Images.xcassets/settingsAccountNextcloud.imageset/Contents.json

@@ -2,8 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "settingsAccountNextcloud.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
@@ -12,8 +11,7 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "settingsAccountNextcloud@3x.png"
+      "scale" : "3x"
     }
   ],
   "info" : {

iOSClient/Images.xcassets/settingsAdmin.imageset/Contents.json

@@ -1,23 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "settingsAdmin.png"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "settingsAdmin@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "settingsAdmin@3x.png"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

iOSClient/Images.xcassets/settingsCryptoCloud.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "settingsCryptoCloud.png",
       "scale" : "1x"
     },
     {
@@ -12,7 +11,6 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "settingsCryptoCloud@3x.png",
       "scale" : "3x"
     }
   ],

iOSClient/Images.xcassets/settingsKeyMail.imageset/Contents.json

@@ -2,8 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "settingsKeyMail.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
@@ -12,8 +11,7 @@
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "settingsKeyMail@3x.png"
+      "scale" : "3x"
     }
   ],
   "info" : {

iOSClient/Images.xcassets/settingsRemoveCryptoCloud.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "settingsRemoveCryptoCloud.png",
       "scale" : "1x"
     },
     {
@@ -12,7 +11,6 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "settingsRemoveCryptoCloud@3x copia.png",
       "scale" : "3x"
     }
   ],

iOSClient/Settings/CCManageAccount.m

@@ -68,7 +68,7 @@
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [row.cellConfig setObject:[UIImage imageNamed:image_settingsAccountModify] forKey:@"imageView.image"];
     [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
-    [row.cellConfig setObject:COLOR_BRAND forKey:@"textLabel.textColor"];
+    [row.cellConfig setObject:[UIColor blackColor] forKey:@"textLabel.textColor"];
     row.action.formSelector = @selector(changePassword:);
     if (listAccount.count == 0) row.disabled = @YES;
     [section addFormRow:row];
@@ -79,7 +79,7 @@
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [row.cellConfig setObject:[UIImage imageNamed:image_settingsAccountNextcloud] forKey:@"imageView.image"];
     [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
-    [row.cellConfig setObject:COLOR_BRAND forKey:@"textLabel.textColor"];
+    [row.cellConfig setObject:[UIColor blackColor] forKey:@"textLabel.textColor"];
     row.action.formSelector = @selector(addAccount:);
     [section addFormRow:row];
 #endif

iOSClient/Settings/CCSettings.m

@@ -67,7 +67,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_BRAND forKey:@"textLabel.textColor"];
+    [row.cellConfig setObject:[UIColor blackColor] forKey:@"textLabel.textColor"];
     [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
     //[row.cellConfig setObject:@(UITableViewCellAccessoryDisclosureIndicator) forKey:@"accessoryType"];
     row.action.formSelector = @selector(bloccoPassword);
@@ -202,7 +202,7 @@
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"buttonLeftAligned" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_acknowledgements_", nil)];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
-    [row.cellConfig setObject:COLOR_BRAND forKey:@"textLabel.textColor"];
+    [row.cellConfig setObject:[UIColor blackColor] forKey:@"textLabel.textColor"];
     [row.cellConfig setObject:[UIImage imageNamed:image_settingsAcknowledgements] forKey:@"imageView.image"];
     row.action.formBlock = ^(XLFormRowDescriptor * sender){
         [self performSegueWithIdentifier:@"AcknowledgementsSegue" sender:sender];
@@ -212,7 +212,7 @@
     
     // Contact us mail
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"sendmail" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_contact_by_email_", nil)];
-    [row.cellConfig setObject:COLOR_BRAND forKey:@"textLabel.textColor"];
+    [row.cellConfig setObject:[UIColor blackColor] forKey:@"textLabel.textColor"];
     [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [row.cellConfig setObject:[UIImage imageNamed:image_settingsMail] forKey:@"imageView.image"];