Skip to content

NMC/2172 - dashboard theming #123

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
TSI-amrutwaghmare wants to merge 7 commits into
base: master
Choose a base branch
from
Open

NMC/2172 - dashboard theming #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b3fb06
NMC 2172 - dashboard theming customisation
TSI-amrutwaghmare Nov 30, 2023
7922e28
NMC 2172 - dashboard theming customisation
TSI-amrutwaghmare Nov 30, 2023
aaf2510
NMC 2172 - Dashboard theming customisation changes
harshada-15-tsys Apr 14, 2025
c861411
NMC 2172 - Dashboard theming customisation changes
harshada-15-tsys Oct 6, 2025
29b74a8
NMC 2172 - Dashboard theming customisation changes
harshada-15-tsys Dec 16, 2025
2580513
Merge branch 'master' into nmc/2172-dashboard_theming_customisation
harshada-15-tsys Jan 28, 2026
6d796f2
NMC 2172 - Dashboard theming customisation updated changes with 10.3.…
harshada-15-tsys Apr 9, 2026
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
12 changes: 12 additions & 0 deletions Nextcloud.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@
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 */; };
F317C82E2E844C5300761AEA /* ClientIntegrationUIViewer.swift in Sources */ = {isa = PBXBuildFile; fileRef = F317C82D2E844C5300761AEA /* ClientIntegrationUIViewer.swift */; };
Expand Down Expand Up @@ -1235,6 +1240,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 @@ -2004,6 +2012,7 @@
children = (
F376A3732E5CC5FF0067EE25 /* ContextMenuActions.swift */,
F78C6FDD296D677300C952C3 /* NCContextMenu.swift */,
B5C9801F2DAD201A0041B146 /* NCSortMenu.swift */,
3704EB2923D5A58400455C5B /* NCMenu.storyboard */,
371B5A2D23D0B04500FAFAE9 /* NCMenu.swift */,
AF935066276B84E700BD078F /* NCMenu+FloatingPanel.swift */,
Expand Down Expand Up @@ -2492,6 +2501,7 @@
F7603298252F0E550015A421 /* Collection Common */ = {
isa = PBXGroup;
children = (
B5C9801D2DACEB5A0041B146 /* NCCollectionViewCommon+SwipeCollectionViewCellDelegate.swift */,
F75FE06B2BB01D0D00A0EFEF /* Cell */,
F78ACD50219046AC0088454D /* Section Header Footer */,
F70D7C3525FFBF81002B9E34 /* NCCollectionViewCommon.swift */,
Expand Down Expand Up @@ -4512,6 +4522,7 @@
F72944F52A8424F800246839 /* NCEndToEndMetadataV1.swift in Sources */,
F710D2022405826100A6033D /* NCViewerContextMenu.swift in Sources */,
F765E9CD295C585800A09ED8 /* NCUploadScanDocument.swift in Sources */,
B5C980202DAD201A0041B146 /* NCSortMenu.swift in Sources */,
F741C2242B6B9FD600E849BB /* NCMediaSelectTabBar.swift in Sources */,
F7BF9D822934CA21009EE9A6 /* NCManageDatabase+LayoutForView.swift in Sources */,
AA8D31662D411FA100FE2775 /* NCShareDateCell.swift in Sources */,
Expand Down Expand Up @@ -4546,6 +4557,7 @@
F70898692EDDB51700EF85BD /* NCSelectOpen+SelectDelegate.swift in Sources */,
F7D4BF412CA2E8D800A5E746 /* TOPasscodeViewControllerAnimatedTransitioning.m in Sources */,
F7D4BF422CA2E8D800A5E746 /* TOPasscodeSettingsViewController.m in Sources */,
B5C9801E2DACEB5A0041B146 /* NCCollectionViewCommon+SwipeCollectionViewCellDelegate.swift in Sources */,
F7D4BF432CA2E8D800A5E746 /* TOPasscodeCircleImage.m in Sources */,
F78026102E9CFA3700B63436 /* NCTransfersView.swift in Sources */,
F7D4BF442CA2E8D800A5E746 /* TOPasscodeView.m in Sources */,
Expand Down
8 changes: 8 additions & 0 deletions iOSClient/Files/NCFiles.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import RealmSwift
import SwiftUI

class NCFiles: NCCollectionViewCommon {

internal var fileNameBlink: String?
internal var fileNameOpen: String?

Expand Down Expand Up @@ -106,6 +107,12 @@ class NCFiles: NCCollectionViewCommon {
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)

// Re-evaluate in-app messages after viewDidAppear
MoEngageAnalytics.shared.displayInAppNotificationSafely(reason: "viewDidAppear")

// Preload hidden NCMedia so it's ready without being shown
// NCMediaPreloader.shared.preloadIfNeeded()

if !self.dataSource.isEmpty() {
self.blinkCell(fileName: self.fileNameBlink)
self.openFile(fileName: self.fileNameOpen)
Expand Down Expand Up @@ -416,3 +423,4 @@ class NCFiles: NCCollectionViewCommon {
}
}
}

18 changes: 15 additions & 3 deletions iOSClient/Main/Collection Common/Cell/NCGridCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,18 +151,24 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
}

func selected(_ status: Bool, isEditMode: Bool) {
// E2EE - remove encrypt folder selection
if let metadata = NCManageDatabase.shared.getMetadataFromOcId(self.metadata?.ocId), metadata.e2eEncrypted {
imageSelect.isHidden = true
} else {
imageSelect.isHidden = isEditMode ? false : true
}
if isEditMode {
buttonMore.isHidden = true
accessibilityCustomActions = nil
} else {
buttonMore.isHidden = false
}
if status {
imageSelect.isHidden = false
imageSelect.image = NCImageCache.shared.getImageCheckedYes()
imageVisualEffect.isHidden = false
} else {
imageSelect.isHidden = true
imageSelect.image = NCImageCache.shared.getImageCheckedNo()
backgroundView = nil
imageVisualEffect.isHidden = true
}
}
Expand All @@ -182,7 +188,13 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
accessibilityValue = value
}

func setIconOutlines() {}
func setIconOutlines() {
if imageStatus.image != nil {
imageStatus.makeCircularBackground(withColor: .systemBackground)
} else {
imageStatus.backgroundColor = .clear
}
}
}

// MARK: - Grid Layout
Expand Down
17 changes: 12 additions & 5 deletions iOSClient/Main/Collection Common/Cell/NCListCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,17 +177,24 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
}

func selected(_ status: Bool, isEditMode: Bool) {
// E2EE - remove encrypt folder selection
if let metadata = NCManageDatabase.shared.getMetadataFromOcId(self.metadata?.ocId), metadata.e2eEncrypted {
imageSelect.isHidden = true
} else {
imageSelect.isHidden = isEditMode ? false : true
}

if isEditMode {
imageItemLeftConstraint.constant = 45
imageSelect.isHidden = false
// imageSelect.isHidden = false
imageShared.isHidden = true
imageMore.isHidden = true
buttonShared.isHidden = true
buttonMore.isHidden = true
accessibilityCustomActions = nil
} else {
imageItemLeftConstraint.constant = 10
imageSelect.isHidden = true
// imageSelect.isHidden = true
imageShared.isHidden = false
imageMore.isHidden = false
buttonShared.isHidden = false
Expand Down Expand Up @@ -227,13 +234,13 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
tag1.isHidden = true
labelInfo.isHidden = false
labelSubinfo.isHidden = false
labelInfoSeparator.isHidden = false
// labelInfoSeparator.isHidden = false
} else {
tag0.isHidden = false
tag1.isHidden = true
labelInfo.isHidden = true
labelSubinfo.isHidden = true
labelInfoSeparator.isHidden = true
// labelInfoSeparator.isHidden = true

if let tag = tags.first {
tag0.text = tag
Expand All @@ -253,7 +260,7 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
if imageFavorite.image != nil {
let outlineView = UIImageView()
outlineView.translatesAutoresizingMaskIntoConstraints = false
outlineView.image = UIImage(systemName: "star")
outlineView.image = UIImage(systemName: "star.fill")
outlineView.preferredSymbolConfiguration = UIImage.SymbolConfiguration(pointSize: 16, weight: .thin)
outlineView.tintColor = .systemBackground

Expand Down
11 changes: 9 additions & 2 deletions iOSClient/Main/Collection Common/Cell/NCPhotoCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,20 @@ class NCPhotoCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProt
}

func selected(_ status: Bool, isEditMode: Bool) {
// E2EE - remove encrypt folder selection
if let metadata = NCManageDatabase.shared.getMetadataFromOcId(self.metadata?.ocId), metadata.e2eEncrypted {
imageSelect.isHidden = true
} else {
imageSelect.isHidden = isEditMode ? false : true
}
if status {
imageSelect.isHidden = false
// imageSelect.isHidden = false
imageVisualEffect.isHidden = false
imageSelect.image = NCImageCache.shared.getImageCheckedYes()
} else {
imageSelect.isHidden = true
// imageSelect.isHidden = true
imageVisualEffect.isHidden = true
imageSelect.image = NCImageCache.shared.getImageCheckedNo()
}
}

Expand Down
Loading