New graphics for preview filename

iOSClient/CCGlobal.h

@@ -224,7 +224,8 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define selectorLoadModelView           @"loadModelView"
 #define selectorLoadPlist               @"loadPlist"
 #define selectorLoadViewImage           @"loadViewImage"
-#define selectorLoadCopy                @"loadCopy"
+#define selectorLoadCopyFile            @"loadCopyFile"
+#define selectorLoadCopyFiles            @"loadCopyFiles"
 #define selectorMove                    @"move"
 #define selectorMoveCrypto              @"moveCrypto"
 #define selectorMovePlist               @"movePlist"

iOSClient/Create/CCCreateCloud.swift

@@ -235,6 +235,8 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         var section : XLFormSectionDescriptor
         var row : XLFormRowDescriptor
 
+        let sectionColor: UIColor = UIColor(colorLiteralRed: 239.0/255.0, green: 239.0/255.0, blue: 244.0/255.0, alpha: 1)
+        
         // Section: Destination Folder
         
         section = XLFormSectionDescriptor.formSection()
@@ -279,11 +281,13 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         
         // Section: Preview File Name
         
-        section = XLFormSectionDescriptor.formSection()
-        form.addFormSection(section)
-
+        //section = XLFormSectionDescriptor.formSection()
+        //form.addFormSection(section)
+        
         row = XLFormRowDescriptor(tag: "previewFileName", rowType: XLFormRowDescriptorTypeTextView, title: "")
-        //row.cellConfig.setObject(UIColor.lightGray, forKey: "backgroundColor" as NSCopying)
+        row.height = 180
+        row.cellConfig.setObject(sectionColor, forKey: "backgroundColor" as NSCopying)
+        row.cellConfig.setObject(sectionColor, forKey: "textView.backgroundColor" as NSCopying)
         row.disabled = true
         section.addFormRow(row)
         
@@ -360,6 +364,8 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         
         //self.tableView.separatorStyle = UITableViewCellSeparatorStyle.none
         
+        self.tableView.separatorInset = UIEdgeInsetsMake(0, 0, 0, 0);
+        
         self.reloadForm()
     }
 
@@ -390,12 +396,12 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
             if buttonDestinationFolder.isHidden() {
                 return ""
             } else {
-                return NSLocalizedString("_destination_folder_", comment: "")
+                return "    " + NSLocalizedString("_destination_folder_", comment: "")
             }
         case 1:
-            return NSLocalizedString("_use_folder_photos_", comment: "")
+            return "    " + NSLocalizedString("_use_folder_photos_", comment: "")
         case 2:
-            return NSLocalizedString("_rename_filename_", comment: "")
+            return "    " + NSLocalizedString("_rename_filename_", comment: "")
         case 3:
             return NSLocalizedString("_preview_filename_", comment: "")
         default:
@@ -489,7 +495,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
             returnString = CCUtility.createFileName(from: assets[0] as! PHAsset, key: nil)
         }
         
-        return returnString
+        return NSLocalizedString("_preview_filename_", comment: "") + ":" + "\n\n" + returnString
     }
     
     func changeDestinationFolder(_ sender: XLFormRowDescriptor) {

iOSClient/Main/CCMain.m

@@ -1264,12 +1264,20 @@
         [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
     }
     
-    // Copy
-    if ([selector isEqualToString:selectorLoadCopy]) {
+    // Copy File
+    if ([selector isEqualToString:selectorLoadCopyFile]) {
         
         [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
         
-        [self copyFileFiles];
+        [self copyFileFiles:false];
+    }
+    
+    // Copy Files
+    if ([selector isEqualToString:selectorLoadCopyFile]) {
+        
+        [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
+        
+        [self copyFileFiles:true];
     }
     
     // download and view a template
@@ -3684,13 +3692,15 @@
         UIMenuItem *copyFileItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"_copy_file_", nil) action:@selector(copyFile:)];
         UIMenuItem *copyFilesItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"_copy_files_", nil) action:@selector(copyFiles:)];
 
+        UIMenuItem *openinFileItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"_open_in_", nil) action:@selector(openinFile:)];
+        
         UIMenuItem *pasteFileItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"_paste_file_", nil) action:@selector(pasteFile:)];
         UIMenuItem *pasteFileEncryptedItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"_paste_file_encrypted_", nil) action:@selector(pasteFileEncrypted:)];
         
         UIMenuItem *pasteFilesItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"_paste_files_", nil) action:@selector(pasteFiles:)];
         UIMenuItem *pasteFilesEncryptedItem = [[UIMenuItem alloc] initWithTitle:NSLocalizedString(@"_paste_files_encrypted_", nil) action:@selector(pasteFilesEncrypted:)];
         
-        [menuController setMenuItems:[NSArray arrayWithObjects:copyFileItem, copyFilesItem, pasteFileItem, pasteFilesItem, pasteFileEncryptedItem, pasteFilesEncryptedItem, nil]];
+        [menuController setMenuItems:[NSArray arrayWithObjects:copyFileItem, copyFilesItem, openinFileItem, pasteFileItem, pasteFilesItem, pasteFileEncryptedItem, pasteFilesEncryptedItem, nil]];
         [menuController setTargetRect:CGRectMake(touchPoint.x, touchPoint.y, 0.0f, 0.0f) inView:tableView];
         [menuController setMenuVisible:YES animated:YES];
     }
@@ -3703,7 +3713,7 @@
 
 - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
 {
-    if (@selector(copyFile:) == action) {
+    if (@selector(copyFile:) == action || @selector(openinFile:) == action) {
         
         // NO Directory
         // NO Error Passcode
@@ -3800,15 +3810,15 @@
 
 - (void)copyFile:(id)sender
 {
-    [self copyFileFiles];
+    [self copyFileFiles:false];
 }
 
 - (void)copyFiles:(id)sender
 {
-    [self copyFileFiles];
+    [self copyFileFiles:false];
 }
 
-- (void)copyFileFiles
+- (void)copyFileFiles:(BOOL)addItem
 {
     UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
     NSMutableArray *items = [[NSMutableArray alloc] init];
@@ -3839,13 +3849,20 @@
             
         } else {
             
-            [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:_localServerUrl downloadData:YES downloadPlist:NO selector:selectorLoadCopy selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
+            [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:_localServerUrl downloadData:YES downloadPlist:NO selector:selectorLoadCopyFile selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
         }
     }
     
     pasteboard.items = items;
 }
 
+/************************************ OPEN IN ... ************************************/
+
+- (void)openinFile:(id)sender
+{
+    [self openIn:_metadata];
+}
+
 /************************************ PASTE ************************************/
 
 - (void)pasteFile:(id)sender