Skip to content

Commit 1576bee

Browse files
NMC 1988 - Scan customisation changes and added Unit test file
1 parent 59a3fc8 commit 1576bee

14 files changed

Lines changed: 133 additions & 30 deletions

Nextcloud.xcodeproj/project.pbxproj

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,28 @@
9292
AFCE353527E4ED5900FEA6C2 /* DateFormatter+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353427E4ED5900FEA6C2 /* DateFormatter+Extension.swift */; };
9393
AFCE353727E4ED7B00FEA6C2 /* NCShareCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */; };
9494
AFCE353927E5DE0500FEA6C2 /* Shareable.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353827E5DE0400FEA6C2 /* Shareable.swift */; };
95+
AFCE353927E5DE0500FEA6C2 /* NCShare+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353827E5DE0400FEA6C2 /* NCShare+Helper.swift */; };
96+
B52FAEAA2DA8EF0C001AB1BD /* ScanTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52FAEA92DA8EF0C001AB1BD /* ScanTests.swift */; };
97+
B52FAEAC2DA8EF2C001AB1BD /* NCCreateFormUploadScanDocument.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52FAEAB2DA8EF2C001AB1BD /* NCCreateFormUploadScanDocument.swift */; };
98+
B52FAEC02DA8EF84001AB1BD /* FileNameInputTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52FAEAD2DA8EF84001AB1BD /* FileNameInputTextField.swift */; };
99+
B52FAEC12DA8EF84001AB1BD /* ScanDocumentPathView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52FAEB92DA8EF84001AB1BD /* ScanDocumentPathView.swift */; };
100+
B52FAEC22DA8EF84001AB1BD /* PNGImageSaveSwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52FAEB72DA8EF84001AB1BD /* PNGImageSaveSwitchView.swift */; };
101+
B52FAEC32DA8EF84001AB1BD /* SetPDFPasswordSwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52FAEBB2DA8EF84001AB1BD /* SetPDFPasswordSwitchView.swift */; };
102+
B52FAEC42DA8EF84001AB1BD /* PdfWithOcrSwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52FAEB32DA8EF84001AB1BD /* PdfWithOcrSwitchView.swift */; };
103+
B52FAEC52DA8EF84001AB1BD /* PasswordInputField.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52FAEB12DA8EF84001AB1BD /* PasswordInputField.swift */; };
104+
B52FAEC62DA8EF84001AB1BD /* JPGImageSaveSwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52FAEAF2DA8EF84001AB1BD /* JPGImageSaveSwitchView.swift */; };
105+
B52FAEC72DA8EF84001AB1BD /* PdfWithoutOcrSwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52FAEB52DA8EF84001AB1BD /* PdfWithoutOcrSwitchView.swift */; };
106+
B52FAEC82DA8EF84001AB1BD /* TextFileWithOcrSwitchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52FAEBD2DA8EF84001AB1BD /* TextFileWithOcrSwitchView.swift */; };
107+
B52FAEC92DA8EF84001AB1BD /* PdfWithOcrSwitchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B52FAEB42DA8EF84001AB1BD /* PdfWithOcrSwitchView.xib */; };
108+
B52FAECA2DA8EF84001AB1BD /* PasswordInputField.xib in Resources */ = {isa = PBXBuildFile; fileRef = B52FAEB22DA8EF84001AB1BD /* PasswordInputField.xib */; };
109+
B52FAECB2DA8EF84001AB1BD /* ScanDocumentPathView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B52FAEBA2DA8EF84001AB1BD /* ScanDocumentPathView.xib */; };
110+
B52FAECC2DA8EF84001AB1BD /* SetPDFPasswordSwitchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B52FAEBC2DA8EF84001AB1BD /* SetPDFPasswordSwitchView.xib */; };
111+
B52FAECD2DA8EF84001AB1BD /* PNGImageSaveSwitchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B52FAEB82DA8EF84001AB1BD /* PNGImageSaveSwitchView.xib */; };
112+
B52FAECE2DA8EF84001AB1BD /* FileNameInputTextField.xib in Resources */ = {isa = PBXBuildFile; fileRef = B52FAEAE2DA8EF84001AB1BD /* FileNameInputTextField.xib */; };
113+
B52FAECF2DA8EF84001AB1BD /* TextFileWithOcrSwitchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B52FAEBE2DA8EF84001AB1BD /* TextFileWithOcrSwitchView.xib */; };
114+
B52FAED02DA8EF84001AB1BD /* JPGImageSaveSwitchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B52FAEB02DA8EF84001AB1BD /* JPGImageSaveSwitchView.xib */; };
115+
B52FAED12DA8EF84001AB1BD /* PdfWithoutOcrSwitchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B52FAEB62DA8EF84001AB1BD /* PdfWithoutOcrSwitchView.xib */; };
116+
C04E2F232A17BB4D001BAD85 /* FilesIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C04E2F222A17BB4D001BAD85 /* FilesIntegrationTests.swift */; };
95117
D575039F27146F93008DC9DC /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A0D1342591FBC5008F8A13 /* String+Extension.swift */; };
96118
D5B6AA7827200C7200D49C24 /* NCActivityTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */; };
97119
F310B1EF2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = F310B1EE2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift */; };
@@ -1335,6 +1357,27 @@
13351357
AFCE353427E4ED5900FEA6C2 /* DateFormatter+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DateFormatter+Extension.swift"; sourceTree = "<group>"; };
13361358
AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareCells.swift; sourceTree = "<group>"; };
13371359
AFCE353827E5DE0400FEA6C2 /* Shareable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shareable.swift; sourceTree = "<group>"; };
1360+
AFCE353827E5DE0400FEA6C2 /* NCShare+Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCShare+Helper.swift"; sourceTree = "<group>"; };
1361+
B52FAEA92DA8EF0C001AB1BD /* ScanTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanTests.swift; sourceTree = "<group>"; };
1362+
B52FAEAB2DA8EF2C001AB1BD /* NCCreateFormUploadScanDocument.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCCreateFormUploadScanDocument.swift; sourceTree = "<group>"; };
1363+
B52FAEAD2DA8EF84001AB1BD /* FileNameInputTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileNameInputTextField.swift; sourceTree = "<group>"; };
1364+
B52FAEAE2DA8EF84001AB1BD /* FileNameInputTextField.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FileNameInputTextField.xib; sourceTree = "<group>"; };
1365+
B52FAEAF2DA8EF84001AB1BD /* JPGImageSaveSwitchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JPGImageSaveSwitchView.swift; sourceTree = "<group>"; };
1366+
B52FAEB02DA8EF84001AB1BD /* JPGImageSaveSwitchView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = JPGImageSaveSwitchView.xib; sourceTree = "<group>"; };
1367+
B52FAEB12DA8EF84001AB1BD /* PasswordInputField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasswordInputField.swift; sourceTree = "<group>"; };
1368+
B52FAEB22DA8EF84001AB1BD /* PasswordInputField.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PasswordInputField.xib; sourceTree = "<group>"; };
1369+
B52FAEB32DA8EF84001AB1BD /* PdfWithOcrSwitchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PdfWithOcrSwitchView.swift; sourceTree = "<group>"; };
1370+
B52FAEB42DA8EF84001AB1BD /* PdfWithOcrSwitchView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PdfWithOcrSwitchView.xib; sourceTree = "<group>"; };
1371+
B52FAEB52DA8EF84001AB1BD /* PdfWithoutOcrSwitchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PdfWithoutOcrSwitchView.swift; sourceTree = "<group>"; };
1372+
B52FAEB62DA8EF84001AB1BD /* PdfWithoutOcrSwitchView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PdfWithoutOcrSwitchView.xib; sourceTree = "<group>"; };
1373+
B52FAEB72DA8EF84001AB1BD /* PNGImageSaveSwitchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PNGImageSaveSwitchView.swift; sourceTree = "<group>"; };
1374+
B52FAEB82DA8EF84001AB1BD /* PNGImageSaveSwitchView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PNGImageSaveSwitchView.xib; sourceTree = "<group>"; };
1375+
B52FAEB92DA8EF84001AB1BD /* ScanDocumentPathView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScanDocumentPathView.swift; sourceTree = "<group>"; };
1376+
B52FAEBA2DA8EF84001AB1BD /* ScanDocumentPathView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ScanDocumentPathView.xib; sourceTree = "<group>"; };
1377+
B52FAEBB2DA8EF84001AB1BD /* SetPDFPasswordSwitchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SetPDFPasswordSwitchView.swift; sourceTree = "<group>"; };
1378+
B52FAEBC2DA8EF84001AB1BD /* SetPDFPasswordSwitchView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SetPDFPasswordSwitchView.xib; sourceTree = "<group>"; };
1379+
B52FAEBD2DA8EF84001AB1BD /* TextFileWithOcrSwitchView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFileWithOcrSwitchView.swift; sourceTree = "<group>"; };
1380+
B52FAEBE2DA8EF84001AB1BD /* TextFileWithOcrSwitchView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TextFileWithOcrSwitchView.xib; sourceTree = "<group>"; };
13381381
C0046CDA2A17B98400D87C9D /* NextcloudUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NextcloudUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
13391382
C04E2F202A17BB4D001BAD85 /* NextcloudIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NextcloudIntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
13401383
D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCActivityTableViewCell.swift; sourceTree = "<group>"; };
@@ -2123,6 +2166,8 @@
21232166
isa = PBXGroup;
21242167
children = (
21252168
AA52EB452D42AC5A0089C348 /* Placeholder.swift */,
2169+
B52FAEA92DA8EF0C001AB1BD /* ScanTests.swift */,
2170+
AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */,
21262171
);
21272172
path = NextcloudUnitTests;
21282173
sourceTree = "<group>";
@@ -2161,6 +2206,31 @@
21612206
path = Advanced;
21622207
sourceTree = "<group>";
21632208
};
2209+
B52FAEBF2DA8EF84001AB1BD /* NMC Views */ = {
2210+
isa = PBXGroup;
2211+
children = (
2212+
B52FAEAD2DA8EF84001AB1BD /* FileNameInputTextField.swift */,
2213+
B52FAEAE2DA8EF84001AB1BD /* FileNameInputTextField.xib */,
2214+
B52FAEAF2DA8EF84001AB1BD /* JPGImageSaveSwitchView.swift */,
2215+
B52FAEB02DA8EF84001AB1BD /* JPGImageSaveSwitchView.xib */,
2216+
B52FAEB12DA8EF84001AB1BD /* PasswordInputField.swift */,
2217+
B52FAEB22DA8EF84001AB1BD /* PasswordInputField.xib */,
2218+
B52FAEB32DA8EF84001AB1BD /* PdfWithOcrSwitchView.swift */,
2219+
B52FAEB42DA8EF84001AB1BD /* PdfWithOcrSwitchView.xib */,
2220+
B52FAEB52DA8EF84001AB1BD /* PdfWithoutOcrSwitchView.swift */,
2221+
B52FAEB62DA8EF84001AB1BD /* PdfWithoutOcrSwitchView.xib */,
2222+
B52FAEB72DA8EF84001AB1BD /* PNGImageSaveSwitchView.swift */,
2223+
B52FAEB82DA8EF84001AB1BD /* PNGImageSaveSwitchView.xib */,
2224+
B52FAEB92DA8EF84001AB1BD /* ScanDocumentPathView.swift */,
2225+
B52FAEBA2DA8EF84001AB1BD /* ScanDocumentPathView.xib */,
2226+
B52FAEBB2DA8EF84001AB1BD /* SetPDFPasswordSwitchView.swift */,
2227+
B52FAEBC2DA8EF84001AB1BD /* SetPDFPasswordSwitchView.xib */,
2228+
B52FAEBD2DA8EF84001AB1BD /* TextFileWithOcrSwitchView.swift */,
2229+
B52FAEBE2DA8EF84001AB1BD /* TextFileWithOcrSwitchView.xib */,
2230+
);
2231+
path = "NMC Views";
2232+
sourceTree = "<group>";
2233+
};
21642234
C0046CDB2A17B98400D87C9D /* NextcloudUITests */ = {
21652235
isa = PBXGroup;
21662236
children = (
@@ -2507,6 +2577,8 @@
25072577
F758B41E212C516300515F55 /* Scan document */ = {
25082578
isa = PBXGroup;
25092579
children = (
2580+
B52FAEBF2DA8EF84001AB1BD /* NMC Views */,
2581+
B52FAEAB2DA8EF2C001AB1BD /* NCCreateFormUploadScanDocument.swift */,
25102582
F758B457212C564000515F55 /* NCScan.storyboard */,
25112583
F758B45D212C569C00515F55 /* NCScanCell.swift */,
25122584
F758B45F212C56A400515F55 /* NCScan.swift */,
@@ -4010,6 +4082,15 @@
40104082
F700510122DF63AC003A3356 /* NCShare.storyboard in Resources */,
40114083
F787704F22E7019900F287A9 /* NCShareLinkCell.xib in Resources */,
40124084
F70753F72542A9C000972D44 /* NCViewerMediaPage.storyboard in Resources */,
4085+
B52FAEC92DA8EF84001AB1BD /* PdfWithOcrSwitchView.xib in Resources */,
4086+
B52FAECA2DA8EF84001AB1BD /* PasswordInputField.xib in Resources */,
4087+
B52FAECB2DA8EF84001AB1BD /* ScanDocumentPathView.xib in Resources */,
4088+
B52FAECC2DA8EF84001AB1BD /* SetPDFPasswordSwitchView.xib in Resources */,
4089+
B52FAECD2DA8EF84001AB1BD /* PNGImageSaveSwitchView.xib in Resources */,
4090+
B52FAECE2DA8EF84001AB1BD /* FileNameInputTextField.xib in Resources */,
4091+
B52FAECF2DA8EF84001AB1BD /* TextFileWithOcrSwitchView.xib in Resources */,
4092+
B52FAED02DA8EF84001AB1BD /* JPGImageSaveSwitchView.xib in Resources */,
4093+
B52FAED12DA8EF84001AB1BD /* PdfWithoutOcrSwitchView.xib in Resources */,
40134094
F7F4F10627ECDBDB008676F9 /* Inconsolata-Medium.ttf in Resources */,
40144095
F7AC934A296193050002BC0F /* Reasons to use Nextcloud.pdf in Resources */,
40154096
F7A60F87292D215000FCE1F2 /* NCShareAccounts.storyboard in Resources */,
@@ -4565,6 +4646,15 @@
45654646
F7E7AEA72BA32D0000512E52 /* NCCollectionViewUnifiedSearch.swift in Sources */,
45664647
F73EF7A72B0223900087E6E9 /* NCManageDatabase+Comments.swift in Sources */,
45674648
F33918C42C7CD8F2002D9AA1 /* FileNameValidator+Extensions.swift in Sources */,
4649+
B52FAEC02DA8EF84001AB1BD /* FileNameInputTextField.swift in Sources */,
4650+
B52FAEC12DA8EF84001AB1BD /* ScanDocumentPathView.swift in Sources */,
4651+
B52FAEC22DA8EF84001AB1BD /* PNGImageSaveSwitchView.swift in Sources */,
4652+
B52FAEC32DA8EF84001AB1BD /* SetPDFPasswordSwitchView.swift in Sources */,
4653+
B52FAEC42DA8EF84001AB1BD /* PdfWithOcrSwitchView.swift in Sources */,
4654+
B52FAEC52DA8EF84001AB1BD /* PasswordInputField.swift in Sources */,
4655+
B52FAEC62DA8EF84001AB1BD /* JPGImageSaveSwitchView.swift in Sources */,
4656+
B52FAEC72DA8EF84001AB1BD /* PdfWithoutOcrSwitchView.swift in Sources */,
4657+
B52FAEC82DA8EF84001AB1BD /* TextFileWithOcrSwitchView.swift in Sources */,
45684658
F39170AD2CB82024006127BC /* FileAutoRenamer+Extensions.swift in Sources */,
45694659
F799DF882C4B83CC003410B5 /* NCCollectionViewCommon+EasyTipView.swift in Sources */,
45704660
F7AE00F8230E81CB007ACF8A /* NCBrowserWeb.swift in Sources */,
@@ -4862,6 +4952,7 @@
48624952
F7C7B489245EBA4100D93E60 /* NCViewerQuickLook.swift in Sources */,
48634953
F758B45E212C569D00515F55 /* NCScanCell.swift in Sources */,
48644954
F78B87E72B62527100C65ADC /* NCMediaDataSource.swift in Sources */,
4955+
B52FAEAC2DA8EF2C001AB1BD /* NCCreateFormUploadScanDocument.swift in Sources */,
48654956
F76882272C0DD1E7001CF441 /* NCManageE2EEView.swift in Sources */,
48664957
F7864ACC2A78FE73004870E0 /* NCManageDatabase+LocalFile.swift in Sources */,
48674958
F7327E302B73A86700A462C7 /* NCNetworking+WebDAV.swift in Sources */,

0 commit comments

Comments
 (0)