Skip to content

[stable-6.6.0] NMC/2172 - dashboard theming #325

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

Open
github-actions wants to merge 3 commits into
base: stable-6.6.0
Choose a base branch
from
Open

[stable-6.6.0] NMC/2172 - dashboard theming #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88e2b40
NMC 2172 - dashboard theming customisation
TSI-amrutwaghmare Nov 30, 2023
23af78f
NMC 2172 - dashboard theming customisation
TSI-amrutwaghmare Nov 30, 2023
8d16665
NMC 2172 - Dashboard theming customisation changes
harshada-15-tsys Apr 14, 2025
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
11 changes: 11 additions & 0 deletions Nextcloud.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@
AFCE353527E4ED5900FEA6C2 /* DateFormatter+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353427E4ED5900FEA6C2 /* DateFormatter+Extension.swift */; };
AFCE353727E4ED7B00FEA6C2 /* NCShareCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */; };
AFCE353927E5DE0500FEA6C2 /* Shareable.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353827E5DE0400FEA6C2 /* Shareable.swift */; };
AFCE353927E5DE0500FEA6C2 /* NCShare+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353827E5DE0400FEA6C2 /* NCShare+Helper.swift */; };
B5C9801E2DACEB5A0041B146 /* NCCollectionViewCommon+SwipeCollectionViewCellDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C9801D2DACEB5A0041B146 /* NCCollectionViewCommon+SwipeCollectionViewCellDelegate.swift */; };
B5C980202DAD201A0041B146 /* NCSortMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5C9801F2DAD201A0041B146 /* NCSortMenu.swift */; };
C04E2F232A17BB4D001BAD85 /* FilesIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C04E2F222A17BB4D001BAD85 /* FilesIntegrationTests.swift */; };
D575039F27146F93008DC9DC /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A0D1342591FBC5008F8A13 /* String+Extension.swift */; };
D5B6AA7827200C7200D49C24 /* NCActivityTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */; };
F310B1EF2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = F310B1EE2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift */; };
Expand Down Expand Up @@ -1330,6 +1334,9 @@
AFCE353427E4ED5900FEA6C2 /* DateFormatter+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DateFormatter+Extension.swift"; sourceTree = "<group>"; };
AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareCells.swift; sourceTree = "<group>"; };
AFCE353827E5DE0400FEA6C2 /* Shareable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shareable.swift; sourceTree = "<group>"; };
AFCE353827E5DE0400FEA6C2 /* NCShare+Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCShare+Helper.swift"; sourceTree = "<group>"; };
B5C9801D2DACEB5A0041B146 /* NCCollectionViewCommon+SwipeCollectionViewCellDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCCollectionViewCommon+SwipeCollectionViewCellDelegate.swift"; sourceTree = "<group>"; };
B5C9801F2DAD201A0041B146 /* NCSortMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCSortMenu.swift; sourceTree = "<group>"; };
C0046CDA2A17B98400D87C9D /* NextcloudUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NextcloudUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
C04E2F202A17BB4D001BAD85 /* NextcloudIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NextcloudIntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCActivityTableViewCell.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2076,6 +2083,7 @@
371B5A2F23D0B04B00FAFAE9 /* Menu */ = {
isa = PBXGroup;
children = (
B5C9801F2DAD201A0041B146 /* NCSortMenu.swift */,
3704EB2923D5A58400455C5B /* NCMenu.storyboard */,
371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */,
AF68326927BE65A90010BF0B /* NCMenuAction.swift */,
Expand Down Expand Up @@ -2539,6 +2547,7 @@
F7603298252F0E550015A421 /* Collection Common */ = {
isa = PBXGroup;
children = (
B5C9801D2DACEB5A0041B146 /* NCCollectionViewCommon+SwipeCollectionViewCellDelegate.swift */,
F75FE06B2BB01D0D00A0EFEF /* Cell */,
F78ACD50219046AC0088454D /* Section Header Footer */,
F70D7C3525FFBF81002B9E34 /* NCCollectionViewCommon.swift */,
Expand Down Expand Up @@ -4635,6 +4644,7 @@
F72944F52A8424F800246839 /* NCEndToEndMetadataV1.swift in Sources */,
F710D2022405826100A6033D /* NCViewer+Menu.swift in Sources */,
F765E9CD295C585800A09ED8 /* NCUploadScanDocument.swift in Sources */,
B5C980202DAD201A0041B146 /* NCSortMenu.swift in Sources */,
F741C2242B6B9FD600E849BB /* NCMediaSelectTabBar.swift in Sources */,
F77A697D250A0FBC00FF1708 /* NCCollectionViewCommon+Menu.swift in Sources */,
F7BF9D822934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift in Sources */,
Expand Down Expand Up @@ -4667,6 +4677,7 @@
F7D4BF402CA2E8D800A5E746 /* TOPasscodeButtonLabel.m in Sources */,
F7D4BF412CA2E8D800A5E746 /* TOPasscodeViewControllerAnimatedTransitioning.m in Sources */,
F7D4BF422CA2E8D800A5E746 /* TOPasscodeSettingsViewController.m in Sources */,
B5C9801E2DACEB5A0041B146 /* NCCollectionViewCommon+SwipeCollectionViewCellDelegate.swift in Sources */,
F7D4BF432CA2E8D800A5E746 /* TOPasscodeCircleImage.m in Sources */,
F7D4BF442CA2E8D800A5E746 /* TOPasscodeView.m in Sources */,
F7D4BF452CA2E8D800A5E746 /* TOPasscodeCircleButton.m in Sources */,
Expand Down
1 change: 1 addition & 0 deletions iOSClient/Favorites/NCFavorite.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class NCFavorite: NCCollectionViewCommon {
titleCurrentFolder = NSLocalizedString("_favorites_", comment: "")
layoutKey = NCGlobal.shared.layoutViewFavorite
enableSearchBar = false
headerMenuButtonsView = true
headerRichWorkspaceDisable = true
emptyImageName = "star.fill"
emptyImageColors = [NCBrandColor.shared.yellowFavorite]
Expand Down
4 changes: 2 additions & 2 deletions iOSClient/Files/NCFiles.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ class NCFiles: NCCollectionViewCommon {
}

self.titleCurrentFolder = self.getNavigationTitle()
self.navigationItem.title = self.titleCurrentFolder
(self.navigationController as? NCMainNavigationController)?.setNavigationLeftItems()
///Magentacloud branding changes hide user account button on left navigation bar
// self.setNavigationLeftItems()

self.dataSource.removeAll()
self.reloadDataSource()
Expand Down
24 changes: 21 additions & 3 deletions iOSClient/Main/Collection Common/Cell/NCCellProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,13 @@ protocol NCCellProtocol {
var fileSharedImage: UIImageView? { get set }
var fileMoreImage: UIImageView? { get set }
var cellSeparatorView: UIView? { get set }
var fileSharedLabel: UILabel? { get set }
var fileProgressView: UIProgressView? { get set }

func titleInfoTrailingDefault()
func titleInfoTrailingFull()
func writeInfoDateSize(date: NSDate, size: Int64)
func setButtonMore(image: UIImage)
func setButtonMore(named: String, image: UIImage)
func hideImageItem(_ status: Bool)
func hideImageFavorite(_ status: Bool)
func hideImageStatus(_ status: Bool)
Expand All @@ -53,6 +55,8 @@ protocol NCCellProtocol {
func hideLabelSubinfo(_ status: Bool)
func hideButtonShare(_ status: Bool)
func hideButtonMore(_ status: Bool)
func selectMode(_ status: Bool)
func selected(_ status: Bool)
func selected(_ status: Bool, isEditMode: Bool)
func setAccessibility(label: String, value: String)
func setTags(tags: [String])
Expand Down Expand Up @@ -115,11 +119,23 @@ extension NCCellProtocol {
get { return nil }
set {}
}

var fileSharedLabel: UILabel? {
get { return nil }
set { }
}
var fileProgressView: UIProgressView? {
get { return nil }
set {}
}
var fileSelectImage: UIImageView? {
get { return nil }
set {}
}

func titleInfoTrailingDefault() {}
func titleInfoTrailingFull() {}
func writeInfoDateSize(date: NSDate, size: Int64) {}
func setButtonMore(image: UIImage) {}
func setButtonMore(named: String, image: UIImage) {}
func hideImageItem(_ status: Bool) {}
func hideImageFavorite(_ status: Bool) {}
func hideImageStatus(_ status: Bool) {}
Expand All @@ -129,6 +145,8 @@ extension NCCellProtocol {
func hideLabelSubinfo(_ status: Bool) {}
func hideButtonShare(_ status: Bool) {}
func hideButtonMore(_ status: Bool) {}
func selectMode(_ status: Bool) {}
func selected(_ status: Bool) {}
func selected(_ status: Bool, isEditMode: Bool) {}
func setAccessibility(label: String, value: String) {}
func setTags(tags: [String]) {}
Expand Down
Loading