Start form upload conflict

Nextcloud.xcodeproj/project.pbxproj

@@ -79,6 +79,8 @@
 		F700510322DF6897003A3356 /* Parchment.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F700510222DF6897003A3356 /* Parchment.framework */; };
 		F700510522DF6A89003A3356 /* NCShare.swift in Sources */ = {isa = PBXBuildFile; fileRef = F700510422DF6A89003A3356 /* NCShare.swift */; };
 		F7020FCE2233D7F700B7297D /* NCCreateFormUploadVoiceNote.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7020FCD2233D7F700B7297D /* NCCreateFormUploadVoiceNote.swift */; };
+		F704B5E32430AA6F00632F5F /* NCCreateFormUploadConflict.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F704B5E22430AA6F00632F5F /* NCCreateFormUploadConflict.storyboard */; };
+		F704B5E52430AA8000632F5F /* NCCreateFormUploadConflict.swift in Sources */ = {isa = PBXBuildFile; fileRef = F704B5E42430AA8000632F5F /* NCCreateFormUploadConflict.swift */; };
 		F704FA5C232A343F00BBA952 /* IMImagemeterViewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F704FA5B232A343F00BBA952 /* IMImagemeterViewer.swift */; };
 		F7063DED2199E55F003F38DA /* SVGKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F7063DEC2199E55F003F38DA /* SVGKit.framework */; };
 		F7063DEF2199E568003F38DA /* CocoaLumberjack.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F7063DEE2199E568003F38DA /* CocoaLumberjack.framework */; };
@@ -689,6 +691,8 @@
 		F70211F91BAC56E9003FC03E /* CCCellMainTransfer.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CCCellMainTransfer.xib; sourceTree = "<group>"; };
 		F70211FA1BAC56E9003FC03E /* CCMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMain.h; sourceTree = "<group>"; };
 		F70211FB1BAC56E9003FC03E /* CCMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = CCMain.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
+		F704B5E22430AA6F00632F5F /* NCCreateFormUploadConflict.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCCreateFormUploadConflict.storyboard; sourceTree = "<group>"; };
+		F704B5E42430AA8000632F5F /* NCCreateFormUploadConflict.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCCreateFormUploadConflict.swift; sourceTree = "<group>"; };
 		F704FA5B232A343F00BBA952 /* IMImagemeterViewer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IMImagemeterViewer.swift; sourceTree = "<group>"; };
 		F7053E3C1C639DF500741EA5 /* CCUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCUtility.h; sourceTree = "<group>"; };
 		F7053E3D1C639DF500741EA5 /* CCUtility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCUtility.m; sourceTree = "<group>"; };
@@ -2445,6 +2449,8 @@
 			children = (
 				F7DFB7EF219C5B8000680748 /* NCCreateFormUploadAssets.swift */,
 				F7651A8823A2A3F2001403D2 /* NCCreateFormUploadDocuments.storyboard */,
+				F704B5E22430AA6F00632F5F /* NCCreateFormUploadConflict.storyboard */,
+				F704B5E42430AA8000632F5F /* NCCreateFormUploadConflict.swift */,
 				F7651A8923A2A3F2001403D2 /* NCCreateFormUploadDocuments.swift */,
 				F7DFB7F1219C5C0000680748 /* NCCreateFormUploadFileText.swift */,
 				F7DFB7F3219C5CA800680748 /* NCCreateFormUploadScanDocument.swift */,
@@ -2935,6 +2941,7 @@
 				F760F78F21F21F61006B1A73 /* PhotoCropEditorBorder@3x.png in Resources */,
 				F774DF0F1FCC26BE002AF9FC /* iTunesArtwork@1x.png in Resources */,
 				F78ACD54219047D40088454D /* NCSectionFooter.xib in Resources */,
+				F704B5E32430AA6F00632F5F /* NCCreateFormUploadConflict.storyboard in Resources */,
 				F77B0F611D118A16002130FE /* Acknowledgements.rtf in Resources */,
 				F7D1612023CF19E30039EBBF /* NCViewerRichWorkspace.storyboard in Resources */,
 				F77B0F631D118A16002130FE /* Localizable.strings in Resources */,
@@ -3447,6 +3454,7 @@
 				F70022B61EC4C9100080073F /* OCCapabilities.m in Sources */,
 				F762CB131EACB66200B38484 /* XLFormRightDetailCell.m in Sources */,
 				F7CA1ED820E7E3FE002CC65E /* PKBorderedButton.m in Sources */,
+				F704B5E52430AA8000632F5F /* NCCreateFormUploadConflict.swift in Sources */,
 				F73B4F0A1F470D9100BBEE4B /* nsEUCTWProber.cpp in Sources */,
 				F765608F23BF813600765969 /* NCContentPresenter.swift in Sources */,
 				F762CB091EACB66200B38484 /* XLFormViewController.m in Sources */,

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.storyboard

@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--Create Form Upload Conflict-->
+        <scene sceneID="Kp8-hs-Fpq">
+            <objects>
+                <viewController id="30l-Wp-khL" customClass="NCCreateFormUploadConflict" customModule="Nextcloud" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="LTr-C1-xhS">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0 file conflict" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="amb-pM-6dC">
+                                <rect key="frame" x="10" y="54" width="394" height="27.5"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="23"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bXc-v3-Lun">
+                                <rect key="frame" x="10" y="91.5" width="394" height="71"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="71" id="k4n-DL-b4D"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qry-YF-g1N">
+                                <rect key="frame" x="10" y="172.5" width="394" height="65"/>
+                                <subviews>
+                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="08D-oc-nWS">
+                                        <rect key="frame" x="0.0" y="0.0" width="51" height="31"/>
+                                    </switch>
+                                    <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ge9-Fi-Rb1">
+                                        <rect key="frame" x="345" y="0.0" width="51" height="31"/>
+                                    </switch>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New files" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H7Y-Nu-nJ3">
+                                        <rect key="frame" x="0.0" y="36" width="70.5" height="24"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Already existing files" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Tf-oD-aTF">
+                                        <rect key="frame" x="237" y="36" width="157" height="24"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="3Tf-oD-aTF" secondAttribute="trailing" id="0gO-Y8-9Dl"/>
+                                    <constraint firstAttribute="trailing" secondItem="ge9-Fi-Rb1" secondAttribute="trailing" id="AkQ-ni-sBE"/>
+                                    <constraint firstItem="ge9-Fi-Rb1" firstAttribute="top" secondItem="qry-YF-g1N" secondAttribute="top" id="OXS-I0-XDN"/>
+                                    <constraint firstAttribute="height" constant="65" id="PKH-cZ-F2x"/>
+                                    <constraint firstItem="H7Y-Nu-nJ3" firstAttribute="top" secondItem="08D-oc-nWS" secondAttribute="bottom" constant="5" id="WLj-QZ-Ogj"/>
+                                    <constraint firstItem="08D-oc-nWS" firstAttribute="top" secondItem="qry-YF-g1N" secondAttribute="top" id="YF7-Vg-Ogx"/>
+                                    <constraint firstAttribute="bottom" secondItem="3Tf-oD-aTF" secondAttribute="bottom" constant="5" id="dVt-rh-Y7S"/>
+                                    <constraint firstItem="08D-oc-nWS" firstAttribute="leading" secondItem="qry-YF-g1N" secondAttribute="leading" id="ea9-4i-Sbs"/>
+                                    <constraint firstItem="3Tf-oD-aTF" firstAttribute="top" secondItem="ge9-Fi-Rb1" secondAttribute="bottom" constant="5" id="gYv-Nw-nUd"/>
+                                    <constraint firstAttribute="bottom" secondItem="H7Y-Nu-nJ3" secondAttribute="bottom" constant="5" id="sLf-EF-u1I"/>
+                                </constraints>
+                            </view>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="wkN-gS-XKZ">
+                                <rect key="frame" x="10" y="247.5" width="394" height="544.5"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            </tableView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Fow-JU-J8L">
+                                <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"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="100" id="6Qu-df-wR9"/>
+                                            <constraint firstAttribute="height" constant="30" id="dYv-Ox-31e"/>
+                                        </constraints>
+                                        <state key="normal" title="Cancel"/>
+                                    </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"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="100" id="WPF-n7-YZM"/>
+                                            <constraint firstAttribute="height" constant="30" id="tQn-bn-hx6"/>
+                                        </constraints>
+                                        <state key="normal" title="Continue"/>
+                                    </button>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstItem="5Nf-YT-2uq" firstAttribute="leading" secondItem="Fow-JU-J8L" secondAttribute="leading" constant="10" id="20E-20-aTP"/>
+                                    <constraint firstAttribute="trailing" secondItem="RU9-v6-zSl" secondAttribute="trailing" constant="10" id="VOl-Qh-Nkm"/>
+                                    <constraint firstItem="5Nf-YT-2uq" firstAttribute="centerY" secondItem="Fow-JU-J8L" secondAttribute="centerY" id="YUI-aa-kFM"/>
+                                    <constraint firstItem="RU9-v6-zSl" firstAttribute="centerY" secondItem="Fow-JU-J8L" secondAttribute="centerY" id="aNt-HZ-Qzb"/>
+                                    <constraint firstAttribute="height" constant="50" id="yv9-KE-JCX"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="amb-pM-6dC" firstAttribute="leading" secondItem="pSm-Za-OgF" secondAttribute="leading" constant="10" id="4WR-mh-3fp"/>
+                            <constraint firstItem="H7Y-Nu-nJ3" firstAttribute="leading" secondItem="pSm-Za-OgF" secondAttribute="leading" constant="10" id="809-bM-vkE"/>
+                            <constraint firstItem="pSm-Za-OgF" firstAttribute="bottom" secondItem="Fow-JU-J8L" secondAttribute="bottom" constant="10" id="9H9-d9-7ST"/>
+                            <constraint firstItem="pSm-Za-OgF" firstAttribute="trailing" secondItem="wkN-gS-XKZ" secondAttribute="trailing" constant="10" id="BDJ-k9-p0j"/>
+                            <constraint firstItem="pSm-Za-OgF" firstAttribute="trailing" secondItem="qry-YF-g1N" secondAttribute="trailing" constant="10" id="GFR-EG-gbz"/>
+                            <constraint firstItem="wkN-gS-XKZ" firstAttribute="top" secondItem="qry-YF-g1N" secondAttribute="bottom" constant="10" id="HDO-22-kC7"/>
+                            <constraint firstItem="pSm-Za-OgF" firstAttribute="trailing" secondItem="bXc-v3-Lun" secondAttribute="trailing" constant="10" id="J1O-5e-Kr9"/>
+                            <constraint firstItem="wkN-gS-XKZ" firstAttribute="leading" secondItem="pSm-Za-OgF" secondAttribute="leading" constant="10" id="JjQ-Dd-hXO"/>
+                            <constraint firstItem="qry-YF-g1N" firstAttribute="top" secondItem="bXc-v3-Lun" secondAttribute="bottom" constant="10" id="Lrv-4d-zee"/>
+                            <constraint firstItem="bXc-v3-Lun" firstAttribute="top" secondItem="amb-pM-6dC" secondAttribute="bottom" constant="10" id="cDb-AU-0EQ"/>
+                            <constraint firstItem="Fow-JU-J8L" firstAttribute="leading" secondItem="pSm-Za-OgF" secondAttribute="leading" constant="10" id="f9h-NY-NPa"/>
+                            <constraint firstItem="Fow-JU-J8L" firstAttribute="top" secondItem="wkN-gS-XKZ" secondAttribute="bottom" constant="10" id="gn6-0E-jnO"/>
+                            <constraint firstItem="amb-pM-6dC" firstAttribute="top" secondItem="pSm-Za-OgF" secondAttribute="top" constant="10" id="gqD-cO-p7k"/>
+                            <constraint firstItem="qry-YF-g1N" firstAttribute="leading" secondItem="pSm-Za-OgF" secondAttribute="leading" constant="10" id="iNM-Qc-hAG"/>
+                            <constraint firstItem="pSm-Za-OgF" firstAttribute="trailing" secondItem="Fow-JU-J8L" secondAttribute="trailing" constant="10" id="n15-1t-Jno"/>
+                            <constraint firstItem="bXc-v3-Lun" firstAttribute="leading" secondItem="pSm-Za-OgF" secondAttribute="leading" constant="10" id="nv3-xM-qib"/>
+                            <constraint firstItem="pSm-Za-OgF" firstAttribute="trailing" secondItem="amb-pM-6dC" secondAttribute="trailing" constant="10" id="x1J-AV-BoL"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="pSm-Za-OgF"/>
+                    </view>
+                    <connections>
+                        <outlet property="buttonCancel" destination="5Nf-YT-2uq" id="cvi-cr-h7O"/>
+                        <outlet property="buttonContinue" destination="RU9-v6-zSl" id="IXK-i8-oyK"/>
+                        <outlet property="labelAlreadyExistingFiles" destination="3Tf-oD-aTF" id="3j2-bX-Bgx"/>
+                        <outlet property="labelNewFiles" destination="H7Y-Nu-nJ3" id="NXn-Ip-DVP"/>
+                        <outlet property="labelSubTitle" destination="bXc-v3-Lun" id="oUd-Zb-Yxc"/>
+                        <outlet property="labelTitle" destination="amb-pM-6dC" id="gEU-4f-4Zu"/>
+                        <outlet property="switchAlreadyExistingFiles" destination="ge9-Fi-Rb1" id="QNa-gi-Q0V"/>
+                        <outlet property="switchNewFiles" destination="08D-oc-nWS" id="JLR-fr-6eI"/>
+                        <outlet property="tableView" destination="wkN-gS-XKZ" id="rME-eq-aos"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="9m8-uR-gEZ" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="113.04347826086958" y="99.776785714285708"/>
+        </scene>
+    </scenes>
+</document>

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -0,0 +1,41 @@
+//
+//  NCCreateFormUploadConflict.swift
+//  Nextcloud
+//
+//  Created by Marino Faggiana on 29/03/2020.
+//  Copyright © 2020 Marino Faggiana. All rights reserved.
+//
+//  Author Marino Faggiana <marino.faggiana@nextcloud.com>
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+import Foundation
+
+class NCCreateFormUploadConflict: UIViewController {
+
+    @IBOutlet weak var labelTitle: UILabel!
+    @IBOutlet weak var labelSubTitle: UILabel!
+
+    @IBOutlet weak var switchNewFiles: UISwitch!
+    @IBOutlet weak var switchAlreadyExistingFiles: UISwitch!
+
+    @IBOutlet weak var labelNewFiles: UILabel!
+    @IBOutlet weak var labelAlreadyExistingFiles: UILabel!
+
+    @IBOutlet weak var tableView: UITableView!
+
+    @IBOutlet weak var buttonCancel: UIButton!
+    @IBOutlet weak var buttonContinue: UIButton!
+}