new icon

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

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

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

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

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

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

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

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

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

@@ -2,17 +2,15 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "settingsClearActivity.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "settingsClearActivity@2x.png",
+      "filename" : "Air Raider_000000_50.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "settingsClearActivity@3x.png",
       "scale" : "3x"
     }
   ],

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

@@ -2,18 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "settingsClearCache.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "settingsClearCache@2x.png",
+      "filename" : "Broom_000000_50.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "settingsClearCache@3x.png"
+      "scale" : "3x"
     }
   ],
   "info" : {

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

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

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

@@ -2,18 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "settingsExit.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "settingsExit@2x.png",
+      "filename" : "Exit_ff0000_50.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "settingsExit@3x.png"
+      "scale" : "3x"
     }
   ],
   "info" : {

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

@@ -2,17 +2,15 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "settingsFavoriteFoldersOffline.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "settingsFavoriteFoldersOffline@2x.png",
+      "filename" : "settingsFavoriteOffline@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "settingsFavoriteFoldersOffline@3x.png",
       "scale" : "3x"
     }
   ],

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

@@ -2,18 +2,16 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "settingsMailNextcloud.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "settingsMailNextcloud@2x.png",
+      "filename" : "settingsMail@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "settingsMailNextcloud@3x.png"
+      "scale" : "3x"
     }
   ],
   "info" : {

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

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

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

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

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

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

iOSClient/Settings/CCAdvanced.m

@@ -53,7 +53,7 @@
     
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"sendMailActivity" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_help_activity_mail_", nil)];
     [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:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [row.cellConfig setObject:[UIImage imageNamed:image_settingsSendActivity] forKey:@"imageView.image"];
     row.action.formSelector = @selector(sendMail:);
@@ -61,7 +61,7 @@
 
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"clearActivityLog" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_help_activity_clear_", nil)];
     [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:[UIImage imageNamed:image_settingsClearActivity] forKey:@"imageView.image"];
     row.action.formSelector = @selector(clearActivity:);
@@ -97,7 +97,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:[UIColor blackColor] forKey:@"textLabel.textColor"];
     [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
     [row.cellConfig setObject:[UIImage imageNamed:image_settingsClearCache] forKey:@"imageView.image"];
     row.action.formSelector = @selector(clearCache:);
@@ -125,6 +125,7 @@
 {
     [super viewWillAppear:animated];
     
+    self.title = NSLocalizedString(@"_settings_", nil);
     self.tableView.backgroundColor = [UIColor whiteColor];
 
     // Color