Marino Faggiana 6 年之前
父节点
当前提交
1f1eb979a8
共有 24 个文件被更改,包括 6 次插入6 次删除
  1. 1 1
      Picker/DocumentPickerViewController.swift
  2. 1 1
      iOSClient/Favorites/CCFavorites.m
  3. 二进制
      iOSClient/Images.xcassets/folderEncrypted.imageset/folderEncrypted.png
  4. 二进制
      iOSClient/Images.xcassets/folderEncrypted.imageset/folderEncrypted@2x.png
  5. 二进制
      iOSClient/Images.xcassets/folderEncrypted.imageset/folderEncrypted@3x.png
  6. 0 0
      iOSClient/Images.xcassets/folderPhotos.imageset/Contents.json
  7. 二进制
      iOSClient/Images.xcassets/folderPhotos.imageset/folder.png
  8. 二进制
      iOSClient/Images.xcassets/folderPhotos.imageset/folder@2x.png
  9. 二进制
      iOSClient/Images.xcassets/folderPhotos.imageset/folder@3x.png
  10. 二进制
      iOSClient/Images.xcassets/folder_external.imageset/folder_external.png
  11. 二进制
      iOSClient/Images.xcassets/folder_external.imageset/folder_external@2x.png
  12. 二进制
      iOSClient/Images.xcassets/folder_external.imageset/folder_external@3x.png
  13. 二进制
      iOSClient/Images.xcassets/folder_public.imageset/folder_public.png
  14. 二进制
      iOSClient/Images.xcassets/folder_public.imageset/folder_public@2x.png
  15. 二进制
      iOSClient/Images.xcassets/folder_public.imageset/folder_public@3x.png
  16. 二进制
      iOSClient/Images.xcassets/folder_shared_with_me.imageset/folder_shared_with_me.png
  17. 二进制
      iOSClient/Images.xcassets/folder_shared_with_me.imageset/folder_shared_with_me@2x.png
  18. 二进制
      iOSClient/Images.xcassets/folder_shared_with_me.imageset/folder_shared_with_me@3x.png
  19. 二进制
      iOSClient/Images.xcassets/folderphotocamera.imageset/folder.png
  20. 二进制
      iOSClient/Images.xcassets/folderphotocamera.imageset/folder@2x.png
  21. 二进制
      iOSClient/Images.xcassets/folderphotocamera.imageset/folder@3x.png
  22. 2 2
      iOSClient/Main/CCMain.m
  23. 1 1
      iOSClient/Move/CCMove.m
  24. 1 1
      iOSClient/Photos/CCPhotos.m

+ 1 - 1
Picker/DocumentPickerViewController.swift

@@ -655,7 +655,7 @@ extension DocumentPickerViewController: UITableViewDataSource {
                 if (metadata.e2eEncrypted) {
                     cell.fileImageView.image = CCGraphics.changeThemingColorImage(UIImage(named: "folderEncrypted"), color: NCBrandColor.sharedInstance.brandElement)
                 } else if (metadata.fileName == autoUploadFileName && serverUrl == autoUploadDirectory) {
-                    cell.fileImageView.image = CCGraphics.changeThemingColorImage(UIImage(named: "folderphotocamera"), color: NCBrandColor.sharedInstance.brandElement)
+                    cell.fileImageView.image = CCGraphics.changeThemingColorImage(UIImage(named: "folderPhotos"), color: NCBrandColor.sharedInstance.brandElement)
                 } else {
                     cell.fileImageView.image = CCGraphics.changeThemingColorImage(UIImage(named: "folder"), color: NCBrandColor.sharedInstance.brandElement)
                 }

+ 1 - 1
iOSClient/Favorites/CCFavorites.m

@@ -587,7 +587,7 @@
         if (metadata.e2eEncrypted) {
             cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderEncrypted"] color:[NCBrandColor sharedInstance].brandElement];
         } else if ([metadata.fileName isEqualToString:_autoUploadFileName] && [self.serverUrl isEqualToString:_autoUploadDirectory]) {
-            cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderphotocamera"] color:[NCBrandColor sharedInstance].brandElement];
+            cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderPhotos"] color:[NCBrandColor sharedInstance].brandElement];
         } else if ([shareLink length] > 0) {
             cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folder_public"] color:[NCBrandColor sharedInstance].brandElement];
         } else if ([shareUserAndGroup length] > 0) {

二进制
iOSClient/Images.xcassets/folderEncrypted.imageset/folderEncrypted.png


二进制
iOSClient/Images.xcassets/folderEncrypted.imageset/folderEncrypted@2x.png


二进制
iOSClient/Images.xcassets/folderEncrypted.imageset/folderEncrypted@3x.png


+ 0 - 0
iOSClient/Images.xcassets/folderphotocamera.imageset/Contents.json → iOSClient/Images.xcassets/folderPhotos.imageset/Contents.json


二进制
iOSClient/Images.xcassets/folderPhotos.imageset/folder.png


二进制
iOSClient/Images.xcassets/folderPhotos.imageset/folder@2x.png


二进制
iOSClient/Images.xcassets/folderPhotos.imageset/folder@3x.png


二进制
iOSClient/Images.xcassets/folder_external.imageset/folder_external.png


二进制
iOSClient/Images.xcassets/folder_external.imageset/folder_external@2x.png


二进制
iOSClient/Images.xcassets/folder_external.imageset/folder_external@3x.png


二进制
iOSClient/Images.xcassets/folder_public.imageset/folder_public.png


二进制
iOSClient/Images.xcassets/folder_public.imageset/folder_public@2x.png


二进制
iOSClient/Images.xcassets/folder_public.imageset/folder_public@3x.png


二进制
iOSClient/Images.xcassets/folder_shared_with_me.imageset/folder_shared_with_me.png


二进制
iOSClient/Images.xcassets/folder_shared_with_me.imageset/folder_shared_with_me@2x.png


二进制
iOSClient/Images.xcassets/folder_shared_with_me.imageset/folder_shared_with_me@3x.png


二进制
iOSClient/Images.xcassets/folderphotocamera.imageset/folder.png


二进制
iOSClient/Images.xcassets/folderphotocamera.imageset/folder@2x.png


二进制
iOSClient/Images.xcassets/folderphotocamera.imageset/folder@3x.png


+ 2 - 2
iOSClient/Main/CCMain.m

@@ -3896,7 +3896,7 @@
         if (!([_metadata.fileName isEqualToString:_autoUploadFileName] == YES && [serverUrl isEqualToString:_autoUploadDirectory] == YES)) {
             
             [actionSheet addButtonWithTitle:NSLocalizedString(@"_folder_automatic_upload_", nil)
-                                      image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderphotocamera"] color:[NCBrandColor sharedInstance].brandElement]
+                                      image:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderPhotos"] color:[NCBrandColor sharedInstance].brandElement]
                             backgroundColor:[NCBrandColor sharedInstance].backgroundView
                                      height:50.0
                                        type:AHKActionSheetButtonTypeDefault
@@ -4600,7 +4600,7 @@
                 cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderEncrypted"] color:[NCBrandColor sharedInstance].brandElement];
                 cell.imageTitleSegue = [UIImage imageNamed:@"titleEncrypted"];
             } else if ([metadata.fileName isEqualToString:_autoUploadFileName] && [self.serverUrl isEqualToString:_autoUploadDirectory]) {
-                cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderphotocamera"] color:[NCBrandColor sharedInstance].brandElement];
+                cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderPhotos"] color:[NCBrandColor sharedInstance].brandElement];
                 cell.imageTitleSegue = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"photos"] color:[UIColor whiteColor]];
             } else
                 cell.file.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folder"] color:[NCBrandColor sharedInstance].brandElement];

+ 1 - 1
iOSClient/Move/CCMove.m

@@ -456,7 +456,7 @@
     if (metadata.e2eEncrypted)
         cell.imageView.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderEncrypted"] color:[NCBrandColor sharedInstance].brandElement];
     else if ([metadata.fileName isEqualToString:_autoUploadFileName] && [self.serverUrl isEqualToString:_autoUploadDirectory])
-        cell.imageView.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderphotocamera"] color:[NCBrandColor sharedInstance].brandElement];
+        cell.imageView.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folderPhotos"] color:[NCBrandColor sharedInstance].brandElement];
     else
         cell.imageView.image = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"folder"] color:[NCBrandColor sharedInstance].brandElement];
     

+ 1 - 1
iOSClient/Photos/CCPhotos.m

@@ -191,7 +191,7 @@
     UIImage *icon;
     icon = [UIImage imageNamed:@"select"];
     UIBarButtonItem *buttonSelect = [[UIBarButtonItem alloc] initWithImage:icon style:UIBarButtonItemStylePlain target:self action:@selector(editingModeYES)];
-    icon = [UIImage imageNamed:@"folder"];
+    icon = [UIImage imageNamed:@"folderPhotos"];
     UIBarButtonItem *buttonStartDirectoryPhotosTab = [[UIBarButtonItem alloc] initWithImage:icon style:UIBarButtonItemStylePlain target:self action:@selector(selectStartDirectoryPhotosTab)];
 
     if ([_sectionDataSource.allRecordsDataSource count] > 0) {