change iconset

iOSClient/AppDelegate.m

@@ -738,8 +738,8 @@
     // File
     item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexFile];
     [item setTitle:NSLocalizedString(@"_home_", nil)];
-    item.image = [UIImage imageNamed:image_tabBarFile];
-    item.selectedImage = [UIImage imageNamed:image_tabBarFile];
+    item.image = [UIImage imageNamed:image_tabBarFiles];
+    item.selectedImage = [UIImage imageNamed:image_tabBarFiles];
     
     // Favorite
     item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexOffline];

iOSClient/CCStandardImages.h

@@ -35,7 +35,6 @@
 #define image_activeCameraUpload                @"activeCameraUpload"
 #define image_attention                         @"attention"
 #define image_audio                             @"audio"
-#define image_audiocrypto                       @"audiocrypto"
 #define image_avatar                            @"avatar"
 
 #define image_bkfull                            @"bkfull"
@@ -46,10 +45,7 @@
 #define image_decryptedSelectedFiles            @"decryptedSelectedFiles"
 #define image_delete                            @"delete"
 #define image_deleteSelectedFiles               @"deleteSelectedFiles"
-#define image_directory                         @"directory"
-#define image_directorycriptata                 @"directorycriptata"
 #define image_document                          @"document"
-#define image_documentcrypto                    @"documentcrypto"
 #define image_downloadSelectedFiles             @"downloadSelectedFiles"
 #define image_drag                              @"drag"
 
@@ -61,7 +57,6 @@
 #define image_filePreviewDownloadCrypto         @"filePreviewDownloadCrypto"
 #define image_filePreviewError                  @"filePreviewError"
 #define image_filetype_htlm                     @"filetype_html"
-#define image_filetype_htlm_crypto              @"filetype_html_crypto"
 #define image_folderphotocamera                 @"folderphotocamera"
 #define image_folder                            @"folder"
 #define image_foldercrypto                      @"foldercrypto"
@@ -71,7 +66,6 @@
 
 #define image_lock                              @"lock"
 
-#define image_MenuCreateFolder                  @"menuCreateFolder"
 #define image_MenuDirectoryOnTop                @"menuDirectoryOnTop"
 #define image_MenuGroupByAlphabetic             @"MenuGroupByAlphabetic"
 #define image_MenuGroupByDate                   @"MenuGroupByDate"
@@ -84,11 +78,11 @@
 #define image_MenuUploadFile                    @"menuUploadFile"
 #define image_MenuUploadFileCrypto              @"menuUploadFileCrypto"
 #define image_MenuUploadPhoto                   @"menuUploadPhoto"
+#define image_MenuUploadPhotoCrypto             @"menuUploadPhotoCrypto"
 #define image_MenuUploadPlainMode               @"menuUploadPlainMode"
 #define image_moveSelectedFiles                 @"moveSelectedFiles"
 #define image_more                              @"more"
 #define image_movie                             @"movie"
-#define image_moviecrypto                       @"moviecrypto"
 
 #define image_navBarOffline                     @"navBarOffline"
 #define image_navBarLocal                       @"navBarLocal"
@@ -100,9 +94,7 @@
 
 #define image_passcode                          @"passcode"
 #define image_pdf                               @"pdf"
-#define image_pdfcrypto                         @"pdfcrypto"
 #define image_photo                             @"photo"
-#define image_photocrypto                       @"photocrypto"
 #define image_photosDownload                    @"photosDownload"
 #define image_plist                             @"plist"
 
@@ -122,8 +114,6 @@
 #define image_settingsSendActivity              @"settingsSendActivity"
 #define image_settingsClearActivity             @"settingsClearActivity"
 #define image_settingsMail                      @"settingsMail"
-#define image_settingsManagePhotos              @"settingsManagePhotos"
-#define image_settingsManagePhotosChange        @"settingsManagePhotosChange"
 #define image_settings                          @"settings"
 #define image_settingsAccountDelete             @"settingsAccountDelete"
 #define image_settingsAccountModify             @"settingsAccountModify"
@@ -158,7 +148,7 @@
 #define image_stoptask                          @"stoptask"
 #define image_stoptaskcrypto                    @"stoptaskcrypto"
 
-#define image_tabBarFile                        @"tabBarFile"
+#define image_tabBarFiles                       @"tabBarFiles"
 #define image_tabBarActivity                    @"activity"
 #define image_tabBarTransfer                    @"transfer"
 #define image_tabBarFavorite                    @"tabBarFavorite"
@@ -168,7 +158,6 @@
 #define image_tabBarSettings                    @"tabBarSettings"
 #define image_typeFileCompress                  @"typeFileCompress"
 #define image_txt                               @"txt"
-#define image_txtcrypto                         @"txtcrypto"
 #define image_thumbs                            @"thumbs"
 
 #define image_user                              @"loginUser"
@@ -181,4 +170,3 @@
 #define image_WiFiSmall                         @"WiFiSmall"
 
 #define image_xls                               @"xls"
-#define image_xlscrypto                         @"xlscrypto"

iOSClient/Create/CCCreateCloud.swift

@@ -58,7 +58,7 @@ class CreateMenuAdd: NSObject {
         
         actionSheet.cancelButtonTitle = NSLocalizedString("_cancel_", comment: "")
 
-        actionSheet.addButton(withTitle: NSLocalizedString("_create_folder_", comment: ""), image: UIImage(named: image_MenuCreateFolder), backgroundColor: UIColor.white, height: 50.0 ,type: AHKActionSheetButtonType.default, handler: {(AHKActionSheet) -> Void in
+        actionSheet.addButton(withTitle: NSLocalizedString("_create_folder_", comment: ""), image: UIImage(named: image_folder), backgroundColor: UIColor.white, height: 50.0 ,type: AHKActionSheetButtonType.default, handler: {(AHKActionSheet) -> Void in
             appDelegate.activeMain.returnCreate(Int(k_returnCreateFolderPlain))
         })
         
@@ -108,7 +108,7 @@ class CreateMenuAdd: NSObject {
             appDelegate.activeMain.returnCreate(Int(k_returnCreateFolderEncrypted))
         })
         
-        actionSheet.addButton(withTitle: NSLocalizedString("_upload_photos_videos_", comment: ""), image: UIImage(named: image_photocrypto), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.encrypted, handler: {(AHKActionSheet) -> Void in
+        actionSheet.addButton(withTitle: NSLocalizedString("_upload_photos_videos_", comment: ""), image: UIImage(named: image_MenuUploadPhotoCrypto), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.encrypted, handler: {(AHKActionSheet) -> Void in
             appDelegate.activeMain.returnCreate(Int(k_returnCreateFotoVideoEncrypted))
         })
         
@@ -244,7 +244,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         form.addFormSection(section)
         
         row = XLFormRowDescriptor(tag: "ButtonDestinationFolder", rowType: XLFormRowDescriptorTypeButton, title: self.titleServerUrl)
-        row.cellConfig.setObject(UIImage(named: image_settingsManagePhotos)!, forKey: "imageView.image" as NSCopying)
+        row.cellConfig.setObject(UIImage(named: image_folderphotocamera)!, forKey: "imageView.image" as NSCopying)
         row.action.formSelector = #selector(changeDestinationFolder(_:))
         section.addFormRow(row)
         

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

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

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

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

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

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

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

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

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

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

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

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

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

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

iOSClient/Images.xcassets/menuCreateFolder.imageset/Contents.json → iOSClient/Images.xcassets/file_application.imageset/Contents.json

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

iOSClient/Images.xcassets/filetype_html_crypto.imageset/Contents.json → iOSClient/Images.xcassets/file_ppt.imageset/Contents.json

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "menuUploadPhoto.png",
+      "filename" : "menuUploadPhotos.png",
       "scale" : "1x"
     },
     {

iOSClient/Images.xcassets/tabBarFile.imageset/Contents.json → iOSClient/Images.xcassets/menuUploadPhotoCrypto.imageset/Contents.json

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

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

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

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

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

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

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

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

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