dev

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.storyboard

@@ -79,20 +79,26 @@
                                 <rect key="frame" x="10" y="802" width="394" height="50"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5Nf-YT-2uq">
-                                        <rect key="frame" x="10" y="10" width="100" height="30"/>
+                                        <rect key="frame" x="10" y="5" width="120" height="40"/>
+                                        <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
-                                            <constraint firstAttribute="width" constant="100" id="6Qu-df-wR9"/>
-                                            <constraint firstAttribute="height" constant="30" id="dYv-Ox-31e"/>
+                                            <constraint firstAttribute="width" constant="120" id="6Qu-df-wR9"/>
+                                            <constraint firstAttribute="height" constant="40" id="dYv-Ox-31e"/>
                                         </constraints>
-                                        <state key="normal" title="Cancel"/>
+                                        <state key="normal" title="Cancel">
+                                            <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        </state>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RU9-v6-zSl">
-                                        <rect key="frame" x="284" y="10" width="100" height="30"/>
+                                        <rect key="frame" x="264" y="5" width="120" height="40"/>
+                                        <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
-                                            <constraint firstAttribute="width" constant="100" id="WPF-n7-YZM"/>
-                                            <constraint firstAttribute="height" constant="30" id="tQn-bn-hx6"/>
+                                            <constraint firstAttribute="width" constant="120" id="WPF-n7-YZM"/>
+                                            <constraint firstAttribute="height" constant="40" id="tQn-bn-hx6"/>
                                         </constraints>
-                                        <state key="normal" title="Continue"/>
+                                        <state key="normal" title="Continue">
+                                            <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        </state>
                                     </button>
                                 </subviews>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -56,6 +56,20 @@ import Foundation
         tableView.delegate = self
         
         tableView.register(UINib.init(nibName: "NCCreateFormUploadConflictCell", bundle: nil), forCellReuseIdentifier: "Cell")
+        
+        labelTitle.text = String(metadatasConflict.count) + " " + NSLocalizedString("_file_conflict_num_", comment: "")
+        labelSubTitle.text = NSLocalizedString("_file_conflict_desc_", comment: "")
+        labelNewFiles.text = NSLocalizedString("_file_conflict_new_", comment: "")
+        labelAlreadyExistingFiles.text = NSLocalizedString("_file_conflict_exists_", comment: "")
+        
+        buttonCancel.layer.cornerRadius = 15
+        buttonCancel.layer.masksToBounds = true
+        buttonCancel.setTitle(NSLocalizedString("_cancel_", comment: ""), for: .normal)
+        
+        buttonContinue.layer.cornerRadius = 15
+        buttonContinue.layer.masksToBounds = true
+        buttonContinue.setTitle(NSLocalizedString("_continue_", comment: ""), for: .normal)
+        buttonContinue.isEnabled = false
     }
 }
 

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -125,6 +125,11 @@
 "_livephoto_save_"          = "Save Live Photo to photo album";
 "_livephoto_save_error_"    = "Error during save of Live Photo";
 
+"_file_conflict_num_"       = "file conflict";
+"_file_conflict_desc_"      = "Which files do you want to keep?\nIf you select both versions, the copied file will have a number added to its name.";
+"_file_conflict_new_"       = "New files";
+"_file_conflict_exists_"    = "Already existing files";
+
 // App
 
 "_network_available_"       = "Network available";