fix

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -205,7 +205,7 @@ import Foundation
 extension NCCreateFormUploadConflict: UITableViewDelegate {
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 330
+        return 260
     }
 }
 
@@ -252,7 +252,7 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
                     cell.imageAlreadyExistingFile.image = UIImage.init(named: "file")
                 }
             }
-            cell.labelDetailAlreadyExistingFile.text = CCUtility.dateDiff(metadataAlreadyExists.date as Date) + "\n" + CCUtility.transformedSize(metadataAlreadyExists.size)
+            cell.labelDetailAlreadyExistingFile.text = CCUtility.dateDiff(metadataAlreadyExists.date as Date)
                 
             if metadatasConflictAlreadyExistingFiles.contains(metadataNewFile.ocId) {
                 cell.switchAlreadyExistingFile.isOn = true
@@ -271,16 +271,14 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
             if metadataNewFile.assetLocalIdentifier.count > 0 {
                 let result = PHAsset.fetchAssets(withLocalIdentifiers: [metadataNewFile.assetLocalIdentifier], options: nil)
                 if result.count == 1 {
-                    PHImageManager.default().requestImage(for: result.firstObject!, targetSize: CGSize(width: 200, height: 200), contentMode: PHImageContentMode.aspectFill, options: nil) { (image, info) in
+                    let date = result.firstObject!.modificationDate
+                    PHImageManager.default().requestImage(for: result.firstObject!, targetSize: CGSize(width: 400, height: 400), contentMode: .aspectFill, options: nil) { (image, info) in
                         cell.imageNewFile.image = image
+                        cell.labelDetailNewFile.text = CCUtility.dateDiff(date)
                     }
-                    
-                    let resource = PHAssetResource.assetResources(for: result.firstObject!)
-                    let size = resource.first?.value(forKey: "fileSize") as! Double
-                    let date = result.firstObject!.modificationDate
-                    
-                    cell.labelDetailNewFile.text = CCUtility.dateDiff(date) + "\n" + CCUtility.transformedSize(size)
-                }                
+                }
+            } else {
+                CCUtility.dateDiff(metadataNewFile.date as Date)
             }
             
             if metadatasConflictNewFiles.contains(metadataNewFile.ocId) {

iOSClient/Main/Create cloud/NCCreateFormUploadConflictCell.xib

@@ -17,10 +17,10 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="WSQ-HI-Wkg">
-                        <rect key="frame" x="5" y="34.5" width="200" height="200"/>
+                        <rect key="frame" x="5" y="34.5" width="150" height="150"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="200" id="cfG-23-jOI"/>
-                            <constraint firstAttribute="height" constant="200" id="hzO-CU-dTl"/>
+                            <constraint firstAttribute="width" constant="150" id="cfG-23-jOI"/>
+                            <constraint firstAttribute="height" constant="150" id="hzO-CU-dTl"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hv8-qJ-lkR">
@@ -29,10 +29,10 @@
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0hq-re-YVn">
-                        <rect key="frame" x="598.5" y="244.5" width="37.5" height="40"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0hq-re-YVn">
+                        <rect key="frame" x="598.5" y="194.5" width="37.5" height="20"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="40" id="5Ed-pm-3oc"/>
+                            <constraint firstAttribute="height" constant="20" id="5Ed-pm-3oc"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                         <nil key="textColor"/>
@@ -51,16 +51,16 @@
                         </connections>
                     </switch>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Tx2-JG-GGa">
-                        <rect key="frame" x="436" y="34.5" width="200" height="200"/>
+                        <rect key="frame" x="486" y="34.5" width="150" height="150"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="200" id="EvS-Tl-Lkx"/>
-                            <constraint firstAttribute="width" constant="200" id="brj-dv-3FM"/>
+                            <constraint firstAttribute="height" constant="150" id="EvS-Tl-Lkx"/>
+                            <constraint firstAttribute="width" constant="150" id="brj-dv-3FM"/>
                         </constraints>
                     </imageView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qye-6B-5aj">
-                        <rect key="frame" x="5" y="244.5" width="37.5" height="40"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Qye-6B-5aj">
+                        <rect key="frame" x="5" y="194.5" width="37.5" height="20"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="40" id="j5h-pt-EoN"/>
+                            <constraint firstAttribute="height" constant="20" id="j5h-pt-EoN"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                         <nil key="textColor"/>