Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Share screen redesign #2967

Merged
merged 29 commits into from
Jul 4, 2024
Merged

Share screen redesign #2967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
a7a2f31
Replace header
mpivchev May 24, 2024
22e8902
WIP
mpivchev May 27, 2024
e265763
WIP
mpivchev May 29, 2024
cfce389
WIP
mpivchev May 30, 2024
6066318
WIP
mpivchev May 31, 2024
0391b42
WIP
mpivchev Jun 3, 2024
b045cdf
WIP
mpivchev Jun 19, 2024
18fb79e
WIP
mpivchev Jun 24, 2024
5ed4d76
WIP
mpivchev Jun 24, 2024
01224d4
WIP
mpivchev Jun 25, 2024
b66fed5
WIP
mpivchev Jun 25, 2024
fb953f9
WIP
mpivchev Jun 26, 2024
bdd009c
WIP
mpivchev Jun 26, 2024
1d7de28
WIP
mpivchev Jun 27, 2024
fdb31bd
WIP
mpivchev Jun 28, 2024
ccd5199
WIP
mpivchev Jun 28, 2024
398e634
WIP
mpivchev Jun 28, 2024
4df6df7
WIP
mpivchev Jun 28, 2024
797fa0d
WIP
mpivchev Jun 28, 2024
4aef499
WIP
mpivchev Jul 1, 2024
9f3f345
manual align
marinofaggiana Jul 2, 2024
83b1a00
Fix compile error
mpivchev Jul 2, 2024
906993e
Revert "manual align"
mpivchev Jul 3, 2024
7a001df
WIP
mpivchev Jul 3, 2024
8c11d7a
Merge branch 'develop' of https://github.com/nextcloud/ios into desig…
mpivchev Jul 3, 2024
16d6abe
WIP
mpivchev Jul 3, 2024
87470aa
WIP
mpivchev Jul 3, 2024
38a4d6b
Merge branch 'develop' of https://github.com/nextcloud/ios into desig…
mpivchev Jul 3, 2024
fcf7e64
Fix tabs
mpivchev Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Nextcloud.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
AF8ED1FC2757821000B8DBC4 /* NextcloudUnitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */; };
AF93471227E2341B002537EE /* NCShare+Menu.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93471127E2341B002537EE /* NCShare+Menu.swift */; };
AF93471927E2361E002537EE /* NCShareAdvancePermissionFooter.xib in Resources */ = {isa = PBXBuildFile; fileRef = AF93471427E2361E002537EE /* NCShareAdvancePermissionFooter.xib */; };
AF93471A27E2361E002537EE /* NCShareAdvancePermissionHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93471527E2361E002537EE /* NCShareAdvancePermissionHeader.swift */; };
AF93471A27E2361E002537EE /* NCShareHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93471527E2361E002537EE /* NCShareHeader.swift */; };
AF93471B27E2361E002537EE /* NCShareAdvancePermission.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93471627E2361E002537EE /* NCShareAdvancePermission.swift */; };
AF93471C27E2361E002537EE /* NCShareAdvancePermissionHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = AF93471727E2361E002537EE /* NCShareAdvancePermissionHeader.xib */; };
AF93471C27E2361E002537EE /* NCShareHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = AF93471727E2361E002537EE /* NCShareHeader.xib */; };
AF93471D27E2361E002537EE /* NCShareAdvancePermissionFooter.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93471827E2361E002537EE /* NCShareAdvancePermissionFooter.swift */; };
AF93474C27E34120002537EE /* NCUtility+Image.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93474B27E34120002537EE /* NCUtility+Image.swift */; };
AF93474E27E3F212002537EE /* NCShareNewUserAddComment.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF93474D27E3F211002537EE /* NCShareNewUserAddComment.swift */; };
Expand Down Expand Up @@ -1099,9 +1099,9 @@
AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NextcloudUnitTests.swift; sourceTree = "<group>"; };
AF93471127E2341B002537EE /* NCShare+Menu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCShare+Menu.swift"; sourceTree = "<group>"; };
AF93471427E2361E002537EE /* NCShareAdvancePermissionFooter.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCShareAdvancePermissionFooter.xib; sourceTree = "<group>"; };
AF93471527E2361E002537EE /* NCShareAdvancePermissionHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareAdvancePermissionHeader.swift; sourceTree = "<group>"; };
AF93471527E2361E002537EE /* NCShareHeader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareHeader.swift; sourceTree = "<group>"; };
AF93471627E2361E002537EE /* NCShareAdvancePermission.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareAdvancePermission.swift; sourceTree = "<group>"; };
AF93471727E2361E002537EE /* NCShareAdvancePermissionHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCShareAdvancePermissionHeader.xib; sourceTree = "<group>"; };
AF93471727E2361E002537EE /* NCShareHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NCShareHeader.xib; sourceTree = "<group>"; };
AF93471827E2361E002537EE /* NCShareAdvancePermissionFooter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareAdvancePermissionFooter.swift; sourceTree = "<group>"; };
AF93474B27E34120002537EE /* NCUtility+Image.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCUtility+Image.swift"; sourceTree = "<group>"; };
AF93474D27E3F211002537EE /* NCShareNewUserAddComment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCShareNewUserAddComment.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1908,8 +1908,6 @@
AF93471627E2361E002537EE /* NCShareAdvancePermission.swift */,
AF93471827E2361E002537EE /* NCShareAdvancePermissionFooter.swift */,
AF93471427E2361E002537EE /* NCShareAdvancePermissionFooter.xib */,
AF93471527E2361E002537EE /* NCShareAdvancePermissionHeader.swift */,
AF93471727E2361E002537EE /* NCShareAdvancePermissionHeader.xib */,
AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */,
AF93474D27E3F211002537EE /* NCShareNewUserAddComment.swift */,
);
Expand Down Expand Up @@ -2135,6 +2133,8 @@
F774264822EB4D0000B23912 /* NCSearchUserDropDownCell.xib */,
F769453B22E9CFFF000A798A /* NCShareUserCell.xib */,
AF2D7C7D2742559100ADF566 /* NCShareUserCell.swift */,
AF93471727E2361E002537EE /* NCShareHeader.xib */,
AF93471527E2361E002537EE /* NCShareHeader.swift */,
);
path = Share;
sourceTree = "<group>";
Expand Down Expand Up @@ -2607,8 +2607,8 @@
isa = PBXGroup;
children = (
F7C9555221F0C4CA0024296E /* NCActivity.storyboard */,
AF56C1DB2784856200D8BAE2 /* NCActivityCommentView.xib */,
F7C9555421F0C5470024296E /* NCActivity.swift */,
AF56C1DB2784856200D8BAE2 /* NCActivityCommentView.xib */,
AFA2AC8427849604008E1EA7 /* NCActivityCommentView.swift */,
D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */,
);
Expand Down Expand Up @@ -3690,7 +3690,7 @@
F7F4F10B27ECDBDB008676F9 /* Inconsolata-Light.ttf in Resources */,
F7CEE6002BA9A5C9003EFD89 /* NCTrashGridCell.xib in Resources */,
3704EB2A23D5A58400455C5B /* NCMenu.storyboard in Resources */,
AF93471C27E2361E002537EE /* NCShareAdvancePermissionHeader.xib in Resources */,
AF93471C27E2361E002537EE /* NCShareHeader.xib in Resources */,
F76032A0252F0F8E0015A421 /* NCTransferCell.xib in Resources */,
F7F4F10527ECDBDB008676F9 /* Inconsolata-SemiBold.ttf in Resources */,
F7A48415297028FC00BD1B49 /* Nextcloud Hub.png in Resources */,
Expand Down Expand Up @@ -4312,7 +4312,7 @@
F7E98C1627E0D0FC001F9F19 /* NCManageDatabase+Video.swift in Sources */,
F7F4F11227ECDC52008676F9 /* UIFont+Extension.swift in Sources */,
F76882222C0DD1E7001CF441 /* NCCapabilitiesView.swift in Sources */,
AF93471A27E2361E002537EE /* NCShareAdvancePermissionHeader.swift in Sources */,
AF93471A27E2361E002537EE /* NCShareHeader.swift in Sources */,
F7F878AE1FB9E3B900599E4F /* NCEndToEndMetadata.swift in Sources */,
F7A7FDDD2C2DBD6200E9A93A /* NCDeepLinkHandler.swift in Sources */,
3781B9B023DB2B7E006B4B1D /* AppDelegate+Menu.swift in Sources */,
Expand Down Expand Up @@ -5778,8 +5778,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/1024jp/GzipSwift";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 6.0.0;
kind = exactVersion;
version = 6.0.0;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
Loading
Loading