dev

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -185,7 +185,7 @@ import Foundation
 extension NCCreateFormUploadConflict: UITableViewDelegate {
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 135
+        return 175
     }
 }
 
@@ -206,13 +206,29 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
         if let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) as? NCCreateFormUploadConflictCell {
             
             let metadata = metadatasConflict[indexPath.row]
-            let metadataInConflict = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileName == %@", metadata.account, metadata.serverUrl, metadata.fileName))
+            guard let metadataInConflict = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND fileName == %@", metadata.account, metadata.serverUrl, metadata.fileName)) else { return UITableViewCell() }
             
             cell.ocId = metadata.ocId
             cell.delegate = self
             
-            if metadataInConflict != nil && FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadataInConflict!.ocId, fileNameView: metadataInConflict!.fileName)) {
-                NCUtility.sharedInstance.loadImage(ocId: metadataInConflict!.ocId, fileNameView: metadataInConflict!.fileNameView) { (image) in
+            cell.labelFileName.text = metadata.fileNameView
+
+            // Image
+            if FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadataInConflict.ocId, fileNameView: metadataInConflict.fileName)) {
+                NCUtility.sharedInstance.loadImage(ocId: metadataInConflict.ocId, fileNameView: metadataInConflict.fileNameView) { (image) in
+                    cell.imageFile.image = image
+                }
+            } else {
+                if metadataInConflict.iconName.count > 0 {
+                    cell.imageFile.image = UIImage.init(named: metadataInConflict.iconName)
+                } else {
+                    cell.imageFile.image = UIImage.init(named: "file")
+                }
+            }
+            
+            // Image New
+            if FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, fileNameView: metadata.fileName)) {
+                NCUtility.sharedInstance.loadImage(ocId: metadata.ocId, fileNameView: metadata.fileNameView) { (image) in
                     cell.imageFile.image = image
                 }
             } else {
@@ -223,7 +239,6 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
                 }
             }
             
-            cell.labelFileName.text = metadata.fileNameView
             cell.labelDetail.text = CCUtility.dateDiff(metadata.date as Date) + ", " + CCUtility.transformedSize(metadata.size)
                         
             if metadatasConflictNewFiles.contains(metadata.ocId) {

iOSClient/Main/Create cloud/NCCreateFormUploadConflictCell.swift

@@ -25,10 +25,13 @@ import Foundation
 
 class NCCreateFormUploadConflictCell: UITableViewCell {
     
+    @IBOutlet weak var labelFileName: UILabel!
+
     @IBOutlet weak var imageFile: UIImageView!
+    @IBOutlet weak var imageFileNew: UIImageView!
 
-    @IBOutlet weak var labelFileName: UILabel!
     @IBOutlet weak var labelDetail: UILabel!
+    @IBOutlet weak var labelDetailNew: UILabel!
 
     @IBOutlet weak var switchNewFile: UISwitch!
     @IBOutlet weak var switchAlreadyExistingFile: UISwitch!

iOSClient/Main/Create cloud/NCCreateFormUploadConflictCell.xib

@@ -9,11 +9,11 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" id="eGO-5i-ez1" customClass="NCCreateFormUploadConflictCell" customModule="Nextcloud" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="641" height="137"/>
+        <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="175" id="eGO-5i-ez1" customClass="NCCreateFormUploadConflictCell" customModule="Nextcloud" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="641" height="175"/>
             <autoresizingMask key="autoresizingMask"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="eGO-5i-ez1" id="y6Q-vz-Xda">
-                <rect key="frame" x="0.0" y="0.0" width="641" height="137"/>
+                <rect key="frame" x="0.0" y="0.0" width="641" height="175"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="WSQ-HI-Wkg">
@@ -25,52 +25,62 @@
                     </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">
                         <rect key="frame" x="10" y="5" width="621" height="19.5"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <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="5" y="94.5" width="631" height="18"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FUL-4V-OgL">
-                        <rect key="frame" x="5" y="96" width="51" height="31"/>
+                        <rect key="frame" x="5" y="134" width="51" height="31"/>
                         <connections>
                             <action selector="valueChangedSwitchNewFile:" destination="eGO-5i-ez1" eventType="valueChanged" id="s5p-Ao-3Ty"/>
                         </connections>
                     </switch>
                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jBi-8r-tc5">
-                        <rect key="frame" x="587" y="96" width="51" height="31"/>
+                        <rect key="frame" x="587" y="134" width="51" height="31"/>
                         <connections>
                             <action selector="valueChangedSwitchAlreadyExistingFile:" destination="eGO-5i-ez1" eventType="valueChanged" id="MVS-Uv-X6e"/>
                         </connections>
                     </switch>
-                    <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="65" y="34.5" width="571" height="18"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                        <nil key="textColor"/>
-                        <nil key="highlightedColor"/>
-                    </label>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Tx2-JG-GGa">
+                        <rect key="frame" x="586" y="34.5" width="50" height="50"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="50" id="EvS-Tl-Lkx"/>
+                            <constraint firstAttribute="width" constant="50" id="brj-dv-3FM"/>
+                        </constraints>
+                    </imageView>
                 </subviews>
                 <constraints>
-                    <constraint firstItem="0hq-re-YVn" firstAttribute="top" secondItem="WSQ-HI-Wkg" secondAttribute="top" id="1pe-uw-16c"/>
                     <constraint firstItem="Hv8-qJ-lkR" firstAttribute="top" secondItem="y6Q-vz-Xda" secondAttribute="top" constant="5" id="2QQ-S7-55R"/>
                     <constraint firstItem="WSQ-HI-Wkg" firstAttribute="leading" secondItem="y6Q-vz-Xda" secondAttribute="leading" constant="5" id="2lG-h5-UAz"/>
+                    <constraint firstItem="0hq-re-YVn" firstAttribute="top" secondItem="WSQ-HI-Wkg" secondAttribute="bottom" constant="10" id="2wz-0l-S3Y"/>
                     <constraint firstAttribute="bottom" secondItem="FUL-4V-OgL" secondAttribute="bottom" constant="10" id="3dN-IN-W31"/>
                     <constraint firstItem="FUL-4V-OgL" firstAttribute="leading" secondItem="y6Q-vz-Xda" secondAttribute="leading" constant="5" id="7rL-L6-lPT"/>
-                    <constraint firstAttribute="trailing" secondItem="0hq-re-YVn" secondAttribute="trailing" constant="5" id="7zg-tI-gc0"/>
                     <constraint firstItem="WSQ-HI-Wkg" firstAttribute="top" secondItem="Hv8-qJ-lkR" secondAttribute="bottom" constant="10" id="Eo7-0B-Hjr"/>
                     <constraint firstItem="Hv8-qJ-lkR" firstAttribute="leading" secondItem="y6Q-vz-Xda" secondAttribute="leading" constant="10" id="JVe-dZ-Lqh"/>
+                    <constraint firstItem="Tx2-JG-GGa" firstAttribute="top" secondItem="Hv8-qJ-lkR" secondAttribute="bottom" constant="10" id="KkM-mL-eYz"/>
+                    <constraint firstAttribute="trailing" secondItem="Tx2-JG-GGa" secondAttribute="trailing" constant="5" id="NJl-pK-vY4"/>
                     <constraint firstAttribute="trailing" secondItem="jBi-8r-tc5" secondAttribute="trailing" constant="5" id="Vv4-gx-2nv"/>
-                    <constraint firstItem="0hq-re-YVn" firstAttribute="leading" secondItem="WSQ-HI-Wkg" secondAttribute="trailing" constant="10" id="fuT-Bu-IRa"/>
+                    <constraint firstAttribute="trailing" secondItem="0hq-re-YVn" secondAttribute="trailing" constant="5" id="bZH-Wd-tFZ"/>
                     <constraint firstAttribute="trailing" secondItem="Hv8-qJ-lkR" secondAttribute="trailing" constant="10" id="jEF-pw-ZsK"/>
                     <constraint firstItem="jBi-8r-tc5" firstAttribute="centerY" secondItem="FUL-4V-OgL" secondAttribute="centerY" id="oZZ-e1-nuY"/>
+                    <constraint firstItem="0hq-re-YVn" firstAttribute="leading" secondItem="y6Q-vz-Xda" secondAttribute="leading" constant="5" id="taV-L4-OCg"/>
                 </constraints>
             </tableViewCellContentView>
             <connections>
                 <outlet property="imageFile" destination="WSQ-HI-Wkg" id="dPr-RT-mou"/>
+                <outlet property="imageFileNew" destination="Tx2-JG-GGa" id="EVG-EZ-23z"/>
                 <outlet property="labelDetail" destination="0hq-re-YVn" id="MjI-Yb-xMj"/>
                 <outlet property="labelFileName" destination="Hv8-qJ-lkR" id="g4W-UF-h47"/>
                 <outlet property="switchAlreadyExistingFile" destination="jBi-8r-tc5" id="L0M-zb-k6v"/>
                 <outlet property="switchNewFile" destination="FUL-4V-OgL" id="jhA-7N-hqA"/>
             </connections>
-            <point key="canvasLocation" x="173.18840579710147" y="27.790178571428569"/>
+            <point key="canvasLocation" x="173.18840579710147" y="40.513392857142854"/>
         </tableViewCell>
     </objects>
 </document>