Skip to content

Commit ebcf5e1

Browse files
author
Marino Faggiana
authored
Merge pull request #2317 from nextcloud/improvedGUI
Add Crop
2 parents b4abd7d + 5e6274a commit ebcf5e1

File tree

9 files changed

+421
-535
lines changed

9 files changed

+421
-535
lines changed

‎.swiftlint.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ excluded:
4444
- Pods
4545

4646
# iOS Files Quarantine
47+
4748
- File Provider Extension/FileProviderData.swift
4849
- File Provider Extension/FileProviderDomain.swift
4950
- File Provider Extension/FileProviderEnumerator.swift
@@ -60,6 +61,7 @@ excluded:
6061
- Widget/Lockscreen/LockscreenData.swift
6162
- Widget/Lockscreen/LockscreenWidgetView.swift
6263
- Widget/Lockscreen/LockscreenWidgetProvider.swift
64+
- iOSClient/GUI
6365
- iOSClient/ExternalResources
6466
- iOSClient/Activity/NCActivity.swift
6567
- iOSClient/Activity/NCActivityTableViewCell.swift

‎Nextcloud Hub.png‎

337 KB
Loading

‎Nextcloud.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
F70460522499061800BB98A7 /* NotificationCenter+MainThread.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70460512499061800BB98A7 /* NotificationCenter+MainThread.swift */; };
9797
F70460532499095400BB98A7 /* NotificationCenter+MainThread.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70460512499061800BB98A7 /* NotificationCenter+MainThread.swift */; };
9898
F70460542499095400BB98A7 /* NotificationCenter+MainThread.swift in Sources */ = {isa = PBXBuildFile; fileRef = F70460512499061800BB98A7 /* NotificationCenter+MainThread.swift */; };
99+
F704A950296EE1C200D0737A /* Mantis in Frameworks */ = {isa = PBXBuildFile; productRef = F704A94F296EE1C200D0737A /* Mantis */; };
99100
F704B5E32430AA6F00632F5F /* NCCreateFormUploadConflict.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F704B5E22430AA6F00632F5F /* NCCreateFormUploadConflict.storyboard */; };
100101
F704B5E52430AA8000632F5F /* NCCreateFormUploadConflict.swift in Sources */ = {isa = PBXBuildFile; fileRef = F704B5E42430AA8000632F5F /* NCCreateFormUploadConflict.swift */; };
101102
F704B5E72430C06700632F5F /* NCCreateFormUploadConflictCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F704B5E62430C06700632F5F /* NCCreateFormUploadConflictCell.xib */; };
@@ -412,6 +413,8 @@
412413
F7A0D1362591FBC5008F8A13 /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A0D1342591FBC5008F8A13 /* String+Extension.swift */; };
413414
F7A0D1372591FBC5008F8A13 /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A0D1342591FBC5008F8A13 /* String+Extension.swift */; };
414415
F7A321AD1E9E6AD50069AD1B /* CCAdvanced.m in Sources */ = {isa = PBXBuildFile; fileRef = F7A321AC1E9E6AD50069AD1B /* CCAdvanced.m */; };
416+
F7A48413297022E000BD1B49 /* ViewerQuickLook.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A48412297022E000BD1B49 /* ViewerQuickLook.swift */; };
417+
F7A48415297028FC00BD1B49 /* Nextcloud Hub.png in Resources */ = {isa = PBXBuildFile; fileRef = F7A48414297028FC00BD1B49 /* Nextcloud Hub.png */; };
415418
F7A60F86292D215000FCE1F2 /* NCTalkAccounts.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A60F84292D215000FCE1F2 /* NCTalkAccounts.swift */; };
416419
F7A60F87292D215000FCE1F2 /* NCTalkAccounts.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7A60F85292D215000FCE1F2 /* NCTalkAccounts.storyboard */; };
417420
F7A76DC8256A71CD00119AB3 /* UIImage+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7B7504A2397D38E004E13EC /* UIImage+Extension.swift */; };
@@ -498,7 +501,6 @@
498501
F7D68FCF28CB9051009139F3 /* NCManageDatabase+DashboardWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7D68FCB28CB9051009139F3 /* NCManageDatabase+DashboardWidget.swift */; };
499502
F7D68FD028CB9051009139F3 /* NCManageDatabase+DashboardWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7D68FCB28CB9051009139F3 /* NCManageDatabase+DashboardWidget.swift */; };
500503
F7D96FCC246ED7E200536D73 /* NCNetworkingCheckRemoteUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7D96FCB246ED7E100536D73 /* NCNetworkingCheckRemoteUser.swift */; };
501-
F7DFB7F0219C5B8000680748 /* NCCreateFormUploadAssets.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7DFB7EF219C5B8000680748 /* NCCreateFormUploadAssets.swift */; };
502504
F7E0710128B13BB00001B882 /* DashboardData.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7E0710028B13BB00001B882 /* DashboardData.swift */; };
503505
F7E0CDCF265CE8610044854E /* NCUserStatus.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F7E0CDCE265CE8610044854E /* NCUserStatus.storyboard */; };
504506
F7E41316294A19B300839300 /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7E41315294A19B300839300 /* UIView+Extension.swift */; };
@@ -986,6 +988,8 @@
986988
F7A0D1342591FBC5008F8A13 /* String+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extension.swift"; sourceTree = "<group>"; };
987989
F7A321AB1E9E6AD50069AD1B /* CCAdvanced.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAdvanced.h; sourceTree = "<group>"; };
988990
F7A321AC1E9E6AD50069AD1B /* CCAdvanced.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCAdvanced.m; sourceTree = "<group>"; };
991+
F7A48412297022E000BD1B49 /* ViewerQuickLook.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewerQuickLook.swift; sourceTree = "<group>"; };
992+
F7A48414297028FC00BD1B49 /* Nextcloud Hub.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Nextcloud Hub.png"; sourceTree = SOURCE_ROOT; };
989993
F7A60F84292D215000FCE1F2 /* NCTalkAccounts.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCTalkAccounts.swift; sourceTree = "<group>"; };
990994
F7A60F85292D215000FCE1F2 /* NCTalkAccounts.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = NCTalkAccounts.storyboard; sourceTree = "<group>"; };
991995
F7A7FA6229265CF4000603EF /* NCManageE2EE.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCManageE2EE.swift; sourceTree = "<group>"; };
@@ -1149,7 +1153,6 @@
11491153
F7D96FCB246ED7E100536D73 /* NCNetworkingCheckRemoteUser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCNetworkingCheckRemoteUser.swift; sourceTree = "<group>"; };
11501154
F7DBD82B23E46A4700ECB7C6 /* MarkdownKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MarkdownKit.framework; path = Carthage/Build/iOS/MarkdownKit.framework; sourceTree = "<group>"; };
11511155
F7DE9AB01F482FA5008DFE10 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
1152-
F7DFB7EF219C5B8000680748 /* NCCreateFormUploadAssets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCCreateFormUploadAssets.swift; sourceTree = "<group>"; };
11531156
F7E0710028B13BB00001B882 /* DashboardData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashboardData.swift; sourceTree = "<group>"; };
11541157
F7E0CDCE265CE8610044854E /* NCUserStatus.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = NCUserStatus.storyboard; sourceTree = "<group>"; };
11551158
F7E41315294A19B300839300 /* UIView+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = "<group>"; };
@@ -1256,6 +1259,7 @@
12561259
isa = PBXFrameworksBuildPhase;
12571260
buildActionMask = 2147483647;
12581261
files = (
1262+
F704A950296EE1C200D0737A /* Mantis in Frameworks */,
12591263
F76DA941277B75870082465B /* KTVHTTPCache.xcframework in Frameworks */,
12601264
F7ED547C25EEA65400956C55 /* QRCodeReader in Frameworks */,
12611265
F788ECC7263AAAFA00ADC67F /* MarkdownKit in Frameworks */,
@@ -1471,6 +1475,7 @@
14711475
isa = PBXGroup;
14721476
children = (
14731477
F7C7B488245EBA4100D93E60 /* NCViewerQuickLook.swift */,
1478+
F7A48412297022E000BD1B49 /* ViewerQuickLook.swift */,
14741479
);
14751480
path = NCViewerQuickLook;
14761481
sourceTree = "<group>";
@@ -2043,7 +2048,6 @@
20432048
isa = PBXGroup;
20442049
children = (
20452050
F769CA162965AB7C00039397 /* NCUploadAssets.swift */,
2046-
F7DFB7EF219C5B8000680748 /* NCCreateFormUploadAssets.swift */,
20472051
F704B5E22430AA6F00632F5F /* NCCreateFormUploadConflict.storyboard */,
20482052
F704B5E42430AA8000632F5F /* NCCreateFormUploadConflict.swift */,
20492053
F704B5E82430C0B800632F5F /* NCCreateFormUploadConflictCell.swift */,
@@ -2190,6 +2194,7 @@
21902194
isa = PBXGroup;
21912195
children = (
21922196
F7AC9349296193050002BC0F /* Reasons to use Nextcloud.pdf */,
2197+
F7A48414297028FC00BD1B49 /* Nextcloud Hub.png */,
21932198
F7F4F0FB27ECDBDA008676F9 /* Font */,
21942199
F72B60941A24F04E004EF66F /* Localizations */,
21952200
);
@@ -2493,6 +2498,7 @@
24932498
F734B06528E75C0100E180D5 /* TLPhotoPicker */,
24942499
F77333872927A72100466E35 /* OpenSSL */,
24952500
F77BC3EA293E5268005F2B08 /* Swifter */,
2501+
F704A94F296EE1C200D0737A /* Mantis */,
24962502
);
24972503
productName = "Crypto Cloud";
24982504
productReference = F7CE8AFA1DC1F8D8009CAE48 /* Nextcloud.app */;
@@ -2651,6 +2657,7 @@
26512657
F734B06428E75C0100E180D5 /* XCRemoteSwiftPackageReference "TLPhotoPicker" */,
26522658
F77333862927A72100466E35 /* XCRemoteSwiftPackageReference "OpenSSL" */,
26532659
F77BC3E9293E5268005F2B08 /* XCRemoteSwiftPackageReference "swifter" */,
2660+
F704A94E296EE1C200D0737A /* XCRemoteSwiftPackageReference "Mantis" */,
26542661
);
26552662
productRefGroup = F7F67B9F1A24D27800EE80DA;
26562663
projectDirPath = "";
@@ -2757,6 +2764,7 @@
27572764
F710E8111EF95C9C00DC2427 /* ImagesIntro.xcassets in Resources */,
27582765
F76032A0252F0F8E0015A421 /* NCTransferCell.xib in Resources */,
27592766
F7F4F10527ECDBDB008676F9 /* Inconsolata-SemiBold.ttf in Resources */,
2767+
F7A48415297028FC00BD1B49 /* Nextcloud Hub.png in Resources */,
27602768
F74C0437253F1CDC009762AB /* NCShares.storyboard in Resources */,
27612769
F7F4F10C27ECDBDB008676F9 /* Inconsolata-Regular.ttf in Resources */,
27622770
F7B8B83025681C3400967775 /* GoogleService-Info.plist in Resources */,
@@ -3067,7 +3075,6 @@
30673075
F702F2CF25EE5B5C008F8E80 /* NCGlobal.swift in Sources */,
30683076
F72CD63A25C19EBF00F46F9A /* NCAutoUpload.swift in Sources */,
30693077
AF93471D27E2361E002537EE /* NCShareAdvancePermissionFooter.swift in Sources */,
3070-
F7DFB7F0219C5B8000680748 /* NCCreateFormUploadAssets.swift in Sources */,
30713078
AF1A9B6427D0CA1E00F17A9E /* UIAlertController+Extension.swift in Sources */,
30723079
F73B422C2476764F00A30FD3 /* NCNotification.swift in Sources */,
30733080
371B5A2E23D0B04500FAFAE9 /* NCMenu.swift in Sources */,
@@ -3206,6 +3213,7 @@
32063213
F7D68FCC28CB9051009139F3 /* NCManageDatabase+DashboardWidget.swift in Sources */,
32073214
F70CEF5623E9C7E50007035B /* UIColor+Extension.swift in Sources */,
32083215
F75CA1472962F13700B01130 /* HUDView.swift in Sources */,
3216+
F7A48413297022E000BD1B49 /* ViewerQuickLook.swift in Sources */,
32093217
F77BB748289985270090FC19 /* UITabBarController+Extension.swift in Sources */,
32103218
F75AC2431F1F62450073EC19 /* NCManageAutoUploadFileName.swift in Sources */,
32113219
F7A7FA6329265CF4000603EF /* NCManageE2EE.swift in Sources */,
@@ -3930,6 +3938,14 @@
39303938
/* End XCConfigurationList section */
39313939

39323940
/* Begin XCRemoteSwiftPackageReference section */
3941+
F704A94E296EE1C200D0737A /* XCRemoteSwiftPackageReference "Mantis" */ = {
3942+
isa = XCRemoteSwiftPackageReference;
3943+
repositoryURL = "https://github.com/guoyingtao/Mantis.git";
3944+
requirement = {
3945+
branch = master;
3946+
kind = branch;
3947+
};
3948+
};
39333949
F70B86732642CE3B00ED5349 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
39343950
isa = XCRemoteSwiftPackageReference;
39353951
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
@@ -4093,6 +4109,11 @@
40934109
/* End XCRemoteSwiftPackageReference section */
40944110

40954111
/* Begin XCSwiftPackageProductDependency section */
4112+
F704A94F296EE1C200D0737A /* Mantis */ = {
4113+
isa = XCSwiftPackageProductDependency;
4114+
package = F704A94E296EE1C200D0737A /* XCRemoteSwiftPackageReference "Mantis" */;
4115+
productName = Mantis;
4116+
};
40964117
F70B86742642CE3B00ED5349 /* FirebaseCrashlytics */ = {
40974118
isa = XCSwiftPackageProductDependency;
40984119
package = F70B86732642CE3B00ED5349 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;

0 commit comments

Comments
 (0)