Marino Faggiana 6 years ago
parent
commit
29f6d54536
49 changed files with 7 additions and 237 deletions
  1. 3 3
      iOSClient/Images.xcassets/add.imageset/Contents.json
  2. BIN
      iOSClient/Images.xcassets/add.imageset/add.png
  3. BIN
      iOSClient/Images.xcassets/add.imageset/add@2x.png
  4. BIN
      iOSClient/Images.xcassets/add.imageset/add@3x.png
  5. 0 23
      iOSClient/Images.xcassets/settingsAccountDelete.imageset/Contents.json
  6. BIN
      iOSClient/Images.xcassets/settingsAccountDelete.imageset/settingsAccountDelete.png
  7. BIN
      iOSClient/Images.xcassets/settingsAccountDelete.imageset/settingsAccountDelete@2x.png
  8. BIN
      iOSClient/Images.xcassets/settingsAccountDelete.imageset/settingsAccountDelete@3x.png
  9. 0 23
      iOSClient/Images.xcassets/settingsAccountModify.imageset/Contents.json
  10. BIN
      iOSClient/Images.xcassets/settingsAccountModify.imageset/settingsAccountModify.png
  11. BIN
      iOSClient/Images.xcassets/settingsAccountModify.imageset/settingsAccountModify@2x.png
  12. BIN
      iOSClient/Images.xcassets/settingsAccountModify.imageset/settingsAccountModify@3x.png
  13. 0 23
      iOSClient/Images.xcassets/settingsAccountNextcloud.imageset/Contents.json
  14. BIN
      iOSClient/Images.xcassets/settingsAccountNextcloud.imageset/settingsAccountNextcloud.png
  15. BIN
      iOSClient/Images.xcassets/settingsAccountNextcloud.imageset/settingsAccountNextcloud@2x.png
  16. BIN
      iOSClient/Images.xcassets/settingsAccountNextcloud.imageset/settingsAccountNextcloud@3x.png
  17. 0 23
      iOSClient/Images.xcassets/statusdownloadcrypto.imageset/Contents.json
  18. BIN
      iOSClient/Images.xcassets/statusdownloadcrypto.imageset/statusdownloadcrypto.png
  19. BIN
      iOSClient/Images.xcassets/statusdownloadcrypto.imageset/statusdownloadcrypto@2x.png
  20. BIN
      iOSClient/Images.xcassets/statusdownloadcrypto.imageset/statusdownloadcrypto@3x.png
  21. 0 23
      iOSClient/Images.xcassets/statusstopcrypto.imageset/Contents.json
  22. BIN
      iOSClient/Images.xcassets/statusstopcrypto.imageset/statusstopcrypto.png
  23. BIN
      iOSClient/Images.xcassets/statusstopcrypto.imageset/statusstopcrypto@2x.png
  24. BIN
      iOSClient/Images.xcassets/statusstopcrypto.imageset/statusstopcrypto@3x.png
  25. 0 23
      iOSClient/Images.xcassets/statusuploadcrypto.imageset/Contents.json
  26. BIN
      iOSClient/Images.xcassets/statusuploadcrypto.imageset/statusuploadcrypto.png
  27. BIN
      iOSClient/Images.xcassets/statusuploadcrypto.imageset/statusuploadcrypto@2x.png
  28. BIN
      iOSClient/Images.xcassets/statusuploadcrypto.imageset/statusuploadcrypto@3x.png
  29. 0 23
      iOSClient/Images.xcassets/tabBarOffline.imageset/Contents.json
  30. BIN
      iOSClient/Images.xcassets/tabBarOffline.imageset/tabBarOffline@1x.png
  31. BIN
      iOSClient/Images.xcassets/tabBarOffline.imageset/tabBarOffline@2x.png
  32. BIN
      iOSClient/Images.xcassets/tabBarOffline.imageset/tabBarOffline@3x.png
  33. BIN
      iOSClient/Images.xcassets/templateWebAccount.imageset/webaccount.png
  34. BIN
      iOSClient/Images.xcassets/templateWebAccount.imageset/webaccount@2x.png
  35. BIN
      iOSClient/Images.xcassets/templateWebAccount.imageset/webaccount@3x.png
  36. 0 23
      iOSClient/Images.xcassets/toolbarTaskCancel.imageset/Contents.json
  37. BIN
      iOSClient/Images.xcassets/toolbarTaskCancel.imageset/toolbarTaskCancel.png
  38. BIN
      iOSClient/Images.xcassets/toolbarTaskCancel.imageset/toolbarTaskCancel@2x.png
  39. BIN
      iOSClient/Images.xcassets/toolbarTaskCancel.imageset/toolbarTaskCancel@3x.png
  40. 0 23
      iOSClient/Images.xcassets/toolbarTaskReload.imageset/Contents.json
  41. BIN
      iOSClient/Images.xcassets/toolbarTaskReload.imageset/toolbarTaskReload.png
  42. BIN
      iOSClient/Images.xcassets/toolbarTaskReload.imageset/toolbarTaskReload@2x.png
  43. BIN
      iOSClient/Images.xcassets/toolbarTaskReload.imageset/toolbarTaskReload@3x.png
  44. 0 23
      iOSClient/Images.xcassets/toolbarTaskStop.imageset/Contents.json
  45. BIN
      iOSClient/Images.xcassets/toolbarTaskStop.imageset/toolbarTaskStop.png
  46. BIN
      iOSClient/Images.xcassets/toolbarTaskStop.imageset/toolbarTaskStop@2x.png
  47. BIN
      iOSClient/Images.xcassets/toolbarTaskStop.imageset/toolbarTaskStop@3x.png
  48. 1 1
      iOSClient/Main/CCMain.m
  49. 3 3
      iOSClient/Settings/CCManageAccount.m

+ 3 - 3
iOSClient/Images.xcassets/templateWebAccount.imageset/Contents.json → iOSClient/Images.xcassets/add.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/add.imageset/add.png


BIN
iOSClient/Images.xcassets/add.imageset/add@2x.png


BIN
iOSClient/Images.xcassets/add.imageset/add@3x.png


+ 0 - 23
iOSClient/Images.xcassets/settingsAccountDelete.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/settingsAccountDelete.imageset/settingsAccountDelete.png


BIN
iOSClient/Images.xcassets/settingsAccountDelete.imageset/settingsAccountDelete@2x.png


BIN
iOSClient/Images.xcassets/settingsAccountDelete.imageset/settingsAccountDelete@3x.png


+ 0 - 23
iOSClient/Images.xcassets/settingsAccountModify.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/settingsAccountModify.imageset/settingsAccountModify.png


BIN
iOSClient/Images.xcassets/settingsAccountModify.imageset/settingsAccountModify@2x.png


BIN
iOSClient/Images.xcassets/settingsAccountModify.imageset/settingsAccountModify@3x.png


+ 0 - 23
iOSClient/Images.xcassets/settingsAccountNextcloud.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/settingsAccountNextcloud.imageset/settingsAccountNextcloud.png


BIN
iOSClient/Images.xcassets/settingsAccountNextcloud.imageset/settingsAccountNextcloud@2x.png


BIN
iOSClient/Images.xcassets/settingsAccountNextcloud.imageset/settingsAccountNextcloud@3x.png


+ 0 - 23
iOSClient/Images.xcassets/statusdownloadcrypto.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/statusdownloadcrypto.imageset/statusdownloadcrypto.png


BIN
iOSClient/Images.xcassets/statusdownloadcrypto.imageset/statusdownloadcrypto@2x.png


BIN
iOSClient/Images.xcassets/statusdownloadcrypto.imageset/statusdownloadcrypto@3x.png


+ 0 - 23
iOSClient/Images.xcassets/statusstopcrypto.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/statusstopcrypto.imageset/statusstopcrypto.png


BIN
iOSClient/Images.xcassets/statusstopcrypto.imageset/statusstopcrypto@2x.png


BIN
iOSClient/Images.xcassets/statusstopcrypto.imageset/statusstopcrypto@3x.png


+ 0 - 23
iOSClient/Images.xcassets/statusuploadcrypto.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/statusuploadcrypto.imageset/statusuploadcrypto.png


BIN
iOSClient/Images.xcassets/statusuploadcrypto.imageset/statusuploadcrypto@2x.png


BIN
iOSClient/Images.xcassets/statusuploadcrypto.imageset/statusuploadcrypto@3x.png


+ 0 - 23
iOSClient/Images.xcassets/tabBarOffline.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/tabBarOffline.imageset/tabBarOffline@1x.png


BIN
iOSClient/Images.xcassets/tabBarOffline.imageset/tabBarOffline@2x.png


BIN
iOSClient/Images.xcassets/tabBarOffline.imageset/tabBarOffline@3x.png


BIN
iOSClient/Images.xcassets/templateWebAccount.imageset/webaccount.png


BIN
iOSClient/Images.xcassets/templateWebAccount.imageset/webaccount@2x.png


BIN
iOSClient/Images.xcassets/templateWebAccount.imageset/webaccount@3x.png


+ 0 - 23
iOSClient/Images.xcassets/toolbarTaskCancel.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/toolbarTaskCancel.imageset/toolbarTaskCancel.png


BIN
iOSClient/Images.xcassets/toolbarTaskCancel.imageset/toolbarTaskCancel@2x.png


BIN
iOSClient/Images.xcassets/toolbarTaskCancel.imageset/toolbarTaskCancel@3x.png


+ 0 - 23
iOSClient/Images.xcassets/toolbarTaskReload.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/toolbarTaskReload.imageset/toolbarTaskReload.png


BIN
iOSClient/Images.xcassets/toolbarTaskReload.imageset/toolbarTaskReload@2x.png


BIN
iOSClient/Images.xcassets/toolbarTaskReload.imageset/toolbarTaskReload@3x.png


+ 0 - 23
iOSClient/Images.xcassets/toolbarTaskStop.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/toolbarTaskStop.imageset/toolbarTaskStop.png


BIN
iOSClient/Images.xcassets/toolbarTaskStop.imageset/toolbarTaskStop@2x.png


BIN
iOSClient/Images.xcassets/toolbarTaskStop.imageset/toolbarTaskStop@3x.png


+ 1 - 1
iOSClient/Main/CCMain.m

@@ -2822,7 +2822,7 @@
     
     item.title = NSLocalizedString(@"_add_account_", nil);
     item.argument = @"";
-    item.image = [UIImage imageNamed:@"settingsAccountNextcloud"];
+    item.image = [UIImage imageNamed:@"add"];
     item.target = self;
     item.action = @selector(addNewAccount:);
     

+ 3 - 3
iOSClient/Settings/CCManageAccount.m

@@ -118,7 +118,7 @@
         // Modify Account
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"changePassword" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_change_password_", nil)];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-        [row.cellConfig setObject:[UIImage imageNamed:@"settingsAccountModify"] forKey:@"imageView.image"];
+        [row.cellConfig setObject:[UIImage imageNamed:@"rename"] forKey:@"imageView.image"];
         [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
         [row.cellConfig setObject:[UIColor blackColor] forKey:@"textLabel.textColor"];
         row.action.formSelector = @selector(changePassword:);
@@ -131,7 +131,7 @@
             // New Account nextcloud
             row = [XLFormRowDescriptor formRowDescriptorWithTag:@"addAccount" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_add_account_", nil)];
             [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-            [row.cellConfig setObject:[UIImage imageNamed:@"settingsAccountNextcloud"] forKey:@"imageView.image"];
+            [row.cellConfig setObject:[UIImage imageNamed:@"add"] forKey:@"imageView.image"];
             [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
             [row.cellConfig setObject:[UIColor blackColor] forKey:@"textLabel.textColor"];
             row.action.formSelector = @selector(addAccount:);
@@ -142,7 +142,7 @@
         row = [XLFormRowDescriptor formRowDescriptorWithTag:@"delAccount" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_delete_account_", nil)];
         [row.cellConfig setObject:[UIColor redColor] forKey:@"textLabel.textColor"];
         [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-        [row.cellConfig setObject:[UIImage imageNamed:@"settingsAccountDelete"] forKey:@"imageView.image"];
+        [row.cellConfig setObject:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"delete"] color:[UIColor redColor]] forKey:@"imageView.image"];
         [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
         row.action.formSelector = @selector(answerDelAccount:);
         if (listAccount.count == 0) row.disabled = @YES;