modify images

iOSClient/Brand/CCNextcloudImages.h

@@ -21,12 +21,15 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#define image_brandLogin                        @"ImageLoginNextcloud"
-#define image_brandCameraUpload                 @"nextcloudCameraUpload"
-#define image_brandOffline                      @"nextcloudOffline"
-#define image_brandLocal                        @"nextcloudLocal"
+#define image_brandLogin                        @"nextcloudLogin"
 #define image_brandNavigationController         @"nextcloud_navigationcontroller"
 #define image_brandNavigationControllerOffline  @"nextcloud_navigationcontroller_offline"
 #define image_brandBackgroundLite               @"nextcloud_lite"
 
 #define image_launchscreen                      @"nextcloudlaunchscreen"
+
+#define image_quickActionPhotos                 @"quickActionPhotosNextcloud"
+#define image_quickActionUpload                 @"quickActionUploadNextcloud"
+#define image_quickActionUploadEncrypted        @"quickActionUploadEncryptedNextcloud"
+
+#define image_Nextcloud                         @"typeCloudNextcloud"

iOSClient/CCStandardImages.h

@@ -21,18 +21,18 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#define image_actionSheetRename                 @"renameNextcloud"
-#define image_actionSheetMove                   @"moveNextcloud"
+#define image_actionSheetRename                 @"actionSheetRename"
+#define image_actionSheetMove                   @"actionSheetMove"
 #define image_actionSheetCrypto                 @"actionSheetCrypto"
 #define image_actionSheetLock                   @"actionSheetLock"
-#define image_actionSheetShare                  @"shareNextcloud"
-#define image_actionSheetReload                 @"reloadNextcloud"
-#define image_actionSheetOpenIn                 @"openInNextcloud"
+#define image_actionSheetShare                  @"actionSheetShare"
+#define image_actionSheetReload                 @"actionSheetReload"
+#define image_actionSheetOpenIn                 @"actionSheetOpenIn"
 #define image_actionSheetOffline                @"actionSheetOffline"
 #define image_actionSheetFavorite               @"actionSheetFavorite"
-#define image_actionSheetLocal                  @"localStorageNextcloud"
-#define image_activeCameraUpload_en             @"activeCameraUploadNextcloud_en"
-#define image_activeCameraUpload_it             @"activeCameraUploadNextcloud_it"
+#define image_actionSheetLocal                  @"localStorage"
+#define image_activeCameraUpload_en             @"activeCameraUpload_en"
+#define image_activeCameraUpload_it             @"activeCameraUpload_it"
 #define image_attention                         @"attention"
 #define image_audio                             @"audio"
 #define image_audiocrypto                       @"audiocrypto"
@@ -41,18 +41,18 @@
 #define image_bkfull                            @"bkfull"
 #define image_bkempty                           @"bkempty"
 
-#define image_checked                           @"checkedNextcloud"
+#define image_checked                           @"checked"
 
-#define image_decryptedSelectedFiles            @"decryptedSelectedFilesNextcloud"
-#define image_deleteSelectedFiles               @"deleteSelectedFilesNextcloud"
+#define image_decryptedSelectedFiles            @"decryptedSelectedFiles"
+#define image_deleteSelectedFiles               @"deleteSelectedFiles"
 #define image_directory                         @"directory"
 #define image_directorycriptata                 @"directorycriptata"
 #define image_document                          @"document"
 #define image_documentcrypto                    @"documentcrypto"
-#define image_downloadSelectedFiles             @"downloadSelectedFilesNextcloud"
-#define image_drag                              @"dragNextcloud"
+#define image_downloadSelectedFiles             @"downloadSelectedFiles"
+#define image_drag                              @"drag"
 
-#define image_encryptedSelectedFiles            @"encryptedSelectedFilesNextcloud"
+#define image_encryptedSelectedFiles            @"encryptedSelectedFiles"
 
 #define image_favorite                          @"favorite"
 #define image_file                              @"file"
@@ -61,7 +61,7 @@
 #define image_filePreviewError                  @"filePreviewError"
 #define image_filetype_htlm                     @"filetype_html"
 #define image_filetype_htlm_crypto              @"filetype_html_crypto"
-#define image_folderphotocamera                 @"folderphotocameraNextcloud"
+#define image_folderphotocamera                 @"folderphotocamera"
 #define image_folder                            @"folder"
 #define image_foldercrypto                      @"foldercrypto"
 
@@ -70,22 +70,21 @@
 
 #define image_lock                              @"lock"
 
-#define image_MenuDirectoryOnTop                @"menuDirectoryOnTopNextcloud"
-#define image_MenuGroupByAlphabetic             @"MenuGroupByAlphabeticNextcloud"
-#define image_MenuGroupByDate                   @"MenuGroupByDateNextcloud"
-#define image_MenuGroupByTypeFile               @"MenuGroupByTypeFileNextcloud"
-#define image_MenuOrdeyByDate                   @"MenuOrdeyByDateNextcloud"
-#define image_MenuOrderByFileName               @"MenuOrderByFileNameNextcloud"
-#define image_MenuOrdinamentoDiscendente        @"MenuOrdinamentoDiscendenteNextcloud"
-#define image_MenuOrdinamentoAscendente         @"MenuOrdinamentoAscendenteNextcloud"
-#define image_moveSelectedFiles                 @"moveSelectedFilesNextcloud"
+#define image_MenuDirectoryOnTop                @"menuDirectoryOnTop"
+#define image_MenuGroupByAlphabetic             @"MenuGroupByAlphabetic"
+#define image_MenuGroupByDate                   @"MenuGroupByDate"
+#define image_MenuGroupByTypeFile               @"MenuGroupByTypeFile"
+#define image_MenuOrdeyByDate                   @"MenuOrdeyByDate"
+#define image_MenuOrderByFileName               @"MenuOrderByFileName"
+#define image_MenuOrdinamentoDiscendente        @"MenuOrdinamentoDiscendente"
+#define image_MenuOrdinamentoAscendente         @"MenuOrdinamentoAscendente"
+#define image_moveSelectedFiles                 @"moveSelectedFiles"
 #define image_more                              @"more"
 #define image_movie                             @"movie"
 #define image_moviecrypto                       @"moviecrypto"
 
 #define image_navBarOffline                     @"navBarOffline"
 #define image_navBarLocal                       @"navBarLocal"
-#define image_Nextcloud                         @"typeCloudNextcloud"
 #define image_notification                      @"notification"
 
 #define image_offline                           @"offline"
@@ -100,21 +99,16 @@
 #define image_photosDownload                    @"photosDownload"
 #define image_plist                             @"plist"
 
-#define image_quickActionPhotos                 @"quickActionPhotosNextcloud"
-#define image_quickActionUpload                 @"quickActionUploadNextcloud"
-#define image_quickActionUploadEncrypted        @"quickActionUploadEncryptedNextcloud"
-#define image_quickActionUploadOffline          @"quickActionUploadOfflineNextcloud"
-
 #define image_reloadtask                        @"reloadtask"
 #define image_reloadtaskcrypto                  @"reloadtaskcrypto"
 #define image_removetask                        @"removetask"
 #define image_removetaskcrypto                  @"removetaskcrypto"
 
-#define image_seleziona                         @"selezionaNextcloud"
-#define image_saveSelectedFiles                 @"saveSelectedFilesNextcloud"
-#define image_settingsMail                      @"settingsMailNextcloud"
-#define image_settingsManagePhotos              @"settingsManagePhotosNextcloud"
-#define image_settingsManagePhotosChange        @"settingsManagePhotosChangeNextcloud"
+#define image_seleziona                         @"seleziona"
+#define image_saveSelectedFiles                 @"saveSelectedFiles"
+#define image_settingsMail                      @"settingsMail"
+#define image_settingsManagePhotos              @"settingsManagePhotos"
+#define image_settingsManagePhotosChange        @"settingsManagePhotosChange"
 #define image_settings                          @"settings"
 #define image_settingsAccountDelete             @"settingsAccountDelete"
 #define image_settingsAccountModify             @"settingsAccountModify"
@@ -148,7 +142,7 @@
 #define image_stoptask                          @"stoptask"
 #define image_stoptaskcrypto                    @"stoptaskcrypto"
 
-#define image_tabBarFile                        @"fileNextcloud"
+#define image_tabBarFile                        @"tabBarFile"
 #define image_tabBarActivity                    @"activity"
 #define image_tabBarTransfer                    @"transfer"
 #define image_tabBarFavorite                    @"tabBarFavorite"
@@ -159,9 +153,9 @@
 #define image_typeFileCompress                  @"typeFileCompress"
 #define image_txt                               @"txt"
 #define image_txtcrypto                         @"txtcrypto"
-#define image_thumbs                            @"thumbsNextcloud"
+#define image_thumbs                            @"thumbs"
 
-#define image_user                              @"userNextcloud"
+#define image_user                              @"loginUser"
 #define image_uploadchiaro                      @"uploadchiaro"
 #define image_uploadcryptato                    @"uploadcryptato"
 #define image_uploaddisable                     @"uploaddisable"

iOSClient/Images.xcassets/LaunchImageNextcloud.launchimage/Contents.json

@@ -1,144 +0,0 @@
-{
-  "images" : [
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "minimum-system-version" : "8.0",
-      "subtype" : "736h",
-      "scale" : "3x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "minimum-system-version" : "8.0",
-      "subtype" : "736h",
-      "scale" : "3x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "minimum-system-version" : "8.0",
-      "subtype" : "667h",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "filename" : "nextcloudlaunch960@2x.png",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "extent" : "full-screen",
-      "idiom" : "iphone",
-      "subtype" : "retina4",
-      "filename" : "nextcloudlaunch1136@2x.png",
-      "minimum-system-version" : "7.0",
-      "orientation" : "portrait",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "minimum-system-version" : "7.0",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "iphone",
-      "extent" : "full-screen",
-      "subtype" : "retina4",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "to-status-bar",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "to-status-bar",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "scale" : "1x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "to-status-bar",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "portrait",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "to-status-bar",
-      "scale" : "2x"
-    },
-    {
-      "orientation" : "landscape",
-      "idiom" : "ipad",
-      "extent" : "full-screen",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}

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

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

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

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

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

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

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

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

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

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

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

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