improved dark mode

Share/NCShareExtension.swift

@@ -93,16 +93,6 @@ class NCShareExtension: UIViewController, NCListCellDelegate, NCEmptyDataSetDele
         }
     }
    
-    var backgroundCellColor: UIColor {
-        get {
-            if #available(iOS 13, *) {
-                return .systemBackground
-            } else {
-                return .white
-            }
-        }
-    }
-    
     var commandViewColor: UIColor {
         get {
             if #available(iOS 13, *) {
@@ -127,7 +117,7 @@ class NCShareExtension: UIViewController, NCListCellDelegate, NCEmptyDataSetDele
         // Add Refresh Control
         collectionView.addSubview(refreshControl)
         refreshControl.tintColor = NCBrandColor.shared.brandText
-        refreshControl.backgroundColor = NCBrandColor.shared.backgroundView
+        refreshControl.backgroundColor = NCBrandColor.shared.systemBackground
         refreshControl.addTarget(self, action: #selector(reloadDatasource), for: .valueChanged)
         
         // Empty
@@ -657,7 +647,7 @@ extension NCShareExtension: UITableViewDataSource {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
                
         let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath)
-        cell.backgroundColor = backgroundCellColor
+        cell.backgroundColor = NCBrandColor.shared.systemBackground
         
         let imageCell = cell.viewWithTag(10) as? UIImageView
         let fileNameCell = cell.viewWithTag(20) as? UILabel

iOSClient/Activity/NCActivity.swift

@@ -49,7 +49,7 @@ class NCActivity: UIViewController, NCEmptyDataSetDelegate {
         super.viewDidLoad()
     
         self.navigationController?.navigationBar.prefersLargeTitles = true
-        
+        view.backgroundColor = NCBrandColor.shared.systemBackground
         self.title = NSLocalizedString("_activity_", comment: "")
 
         // Empty
@@ -59,6 +59,7 @@ class NCActivity: UIViewController, NCEmptyDataSetDelegate {
         tableView.separatorColor = UIColor.clear
         tableView.tableFooterView = UIView()
         tableView.contentInset = insets
+        tableView.backgroundColor = NCBrandColor.shared.systemBackground
         
         NotificationCenter.default.addObserver(self, selector: #selector(self.changeTheming), name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterChangeTheming), object: nil)
         
@@ -79,9 +80,6 @@ class NCActivity: UIViewController, NCEmptyDataSetDelegate {
     }
     
     @objc func changeTheming() {
-        
-        view.backgroundColor = NCBrandColor.shared.backgroundView
-        tableView.backgroundColor = NCBrandColor.shared.backgroundView
         tableView.reloadData()
     }
     

iOSClient/Brand/NCBrand.swift

@@ -144,7 +144,17 @@ class NCBrandColor: NSObject {
 
     @objc public var connectionNo:          UIColor = UIColor(red: 204.0/255.0, green: 204.0/255.0, blue: 204.0/255.0, alpha: 1.0)
     @objc public var encrypted:             UIColor = .red
-    @objc public var backgroundView:        UIColor = .white
+    
+    @objc public var systemBackground:        UIColor {
+        get {
+            if #available(iOS 13, *) {
+                return .systemBackground
+            } else {
+                return .white
+            }
+        }
+    }
+    
     @objc public var backgroundViewForm:    UIColor = .white
     @objc public var backgroundSettings:    UIColor = UIColor(red: 242.0/255.0, green: 242.0/255.0, blue: 247.0/255.0, alpha: 1.0)  // Gray (6) Light
     @objc public var cellSettings:          UIColor = .white
@@ -205,7 +215,6 @@ class NCBrandColor: NSObject {
             tabBar = UIColor(red: 28.0/255.0, green: 28.0/255.0, blue: 30.0/255.0, alpha: 1.0)                          // Gray (6) Dark
             navigationBar = .black
             
-            backgroundView = .black
             backgroundViewForm = UIColor(red: 28.0/255.0, green: 28.0/255.0, blue: 30.0/255.0, alpha: 1.0)              // Gray (6) Dark
             textView = .white
 
@@ -221,7 +230,6 @@ class NCBrandColor: NSObject {
             tabBar = .white
             navigationBar = .white
             
-            backgroundView = .white
             backgroundViewForm = .white
             textView = .black
 

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -87,7 +87,11 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         super.viewDidLoad()
         
         self.navigationController?.presentationController?.delegate = self
+        view.backgroundColor = NCBrandColor.shared.systemBackground
         
+        collectionView.backgroundColor = NCBrandColor.shared.systemBackground
+        collectionView.alwaysBounceVertical = true
+
         if enableSearchBar {
             searchController = UISearchController(searchResultsController: nil)
             searchController?.searchResultsUpdater = self
@@ -109,7 +113,6 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         // Footer
         collectionView.register(UINib.init(nibName: "NCSectionFooter", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: "sectionFooter")
         
-        collectionView.alwaysBounceVertical = true
 
         listLayout = NCListLayout()
         gridLayout = NCGridLayout()
@@ -307,8 +310,6 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
     }
     
     @objc func changeTheming() {
-        view.backgroundColor = NCBrandColor.shared.backgroundView
-        collectionView.backgroundColor = NCBrandColor.shared.backgroundView
         collectionView.reloadData()
     }
     

iOSClient/Main/NCMainNavigationController.swift

@@ -49,7 +49,7 @@ class NCMainNavigationController: UINavigationController {
             
             appearance.configureWithOpaqueBackground()
             appearance.largeTitleTextAttributes = [NSAttributedString.Key.foregroundColor : NCBrandColor.shared.textView]
-            appearance.backgroundColor = NCBrandColor.shared.backgroundView
+            appearance.backgroundColor = NCBrandColor.shared.systemBackground
             appearance.configureWithOpaqueBackground()
             appearance.titleTextAttributes = [NSAttributedString.Key.foregroundColor : NCBrandColor.shared.textView]
             appearance.backgroundColor = NCBrandColor.shared.navigationBar
@@ -60,7 +60,7 @@ class NCMainNavigationController: UINavigationController {
         } else {
             
             navigationBar.barStyle = .default
-            navigationBar.barTintColor = NCBrandColor.shared.backgroundView
+            navigationBar.barTintColor = NCBrandColor.shared.systemBackground
             navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor:NCBrandColor.shared.textView]
             navigationBar.largeTitleTextAttributes = [NSAttributedString.Key.foregroundColor:NCBrandColor.shared.textView]
         }

iOSClient/Main/NCMainTabBar.swift

@@ -48,6 +48,8 @@ class NCMainTabBar: UITabBar {
             appDelegate.darkMode = false
         }
         
+        barTintColor = NCBrandColor.shared.systemBackground
+
         changeTheming()
     }
     
@@ -62,7 +64,6 @@ class NCMainTabBar: UITabBar {
     }
     
     @objc func changeTheming() {
-        barTintColor = NCBrandColor.shared.backgroundView
         backgroundColor = NCBrandColor.shared.tabBar
         tintColor = NCBrandColor.shared.brandElement
         if let centerButton = self.viewWithTag(99) {

iOSClient/Main/Section Header Footer/NCSectionHeaderFooter.swift

@@ -49,7 +49,6 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
         
         buttonOrder.setTitle("", for: .normal)
         buttonOrder.setTitleColor(.systemBlue, for: .normal)
-        
         buttonMore.setImage(UIImage.init(named: "more")!.image(color:  NCBrandColor.shared.icon, size: 25), for: .normal)
                 
         // Gradient
@@ -63,6 +62,8 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
         
         NotificationCenter.default.addObserver(self, selector: #selector(changeTheming), name: NSNotification.Name(rawValue: NCGlobal.shared.notificationCenterChangeTheming), object: nil)
         
+        backgroundColor = NCBrandColor.shared.systemBackground
+        
         changeTheming()
     }
     
@@ -73,9 +74,7 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
     
     @objc func changeTheming() {
         
-        backgroundColor = NCBrandColor.shared.backgroundView
         separator.backgroundColor = NCBrandColor.shared.separator
-        buttonOrder.setTitleColor(.systemBlue, for: .normal)
         
         if textViewColor != NCBrandColor.shared.textView {
             markdownParser = MarkdownParser(font: UIFont.systemFont(ofSize: 15), color: NCBrandColor.shared.textView)

iOSClient/Media/NCMedia.swift

@@ -78,11 +78,14 @@ class NCMedia: UIViewController, NCEmptyDataSetDelegate, NCSelectDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        view.backgroundColor = NCBrandColor.shared.systemBackground
+
         collectionView.register(UINib.init(nibName: "NCGridMediaCell", bundle: nil), forCellWithReuseIdentifier: "gridCell")
         
         collectionView.alwaysBounceVertical = true
         collectionView.contentInset = UIEdgeInsets(top: 75, left: 0, bottom: 50, right: 0);
-                
+        collectionView.backgroundColor = NCBrandColor.shared.systemBackground
+        
         gridLayout = NCGridMediaLayout()
         gridLayout.itemForLine = CGFloat(min(CCUtility.getMediaWidthImage(), 5))
         gridLayout.sectionHeadersPinToVisibleBounds = true
@@ -230,8 +233,6 @@ class NCMedia: UIViewController, NCEmptyDataSetDelegate, NCSelectDelegate {
     //MARK: - NotificationCenter
 
     @objc func changeTheming() {
-        view.backgroundColor = NCBrandColor.shared.backgroundView
-        collectionView.backgroundColor = NCBrandColor.shared.backgroundView
         collectionView.reloadData()
         
         cacheImages.cellLivePhotoImage = NCUtility.shared.loadImage(named: "livephoto", color: .white)

iOSClient/Menu/NCMenu.swift

@@ -164,9 +164,7 @@ class NCMenuPanelController: FloatingPanelController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        if #available(iOS 13.0, *) {
-            self.surfaceView.backgroundColor = .systemBackground
-        }
+        self.surfaceView.backgroundColor = NCBrandColor.shared.systemBackground
         self.isRemovalInteractionEnabled = true
         self.surfaceView.cornerRadius = 16
     }

iOSClient/Notification/NCNotification.swift

@@ -34,12 +34,14 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        self.title = NSLocalizedString("_notification_", comment: "")
-                
-        self.tableView.tableFooterView = UIView()
-        self.tableView.rowHeight = UITableView.automaticDimension
-        self.tableView.estimatedRowHeight = 50.0
-        self.tableView.allowsSelection = false
+        title = NSLocalizedString("_notification_", comment: "")
+        view.backgroundColor = NCBrandColor.shared.systemBackground
+
+        tableView.tableFooterView = UIView()
+        tableView.rowHeight = UITableView.automaticDimension
+        tableView.estimatedRowHeight = 50.0
+        tableView.allowsSelection = false
+        tableView.backgroundColor = NCBrandColor.shared.systemBackground
         
         // Empty
         emptyDataSet = NCEmptyDataSet.init(view: tableView, offset: 0, delegate: self)
@@ -61,8 +63,6 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
     }
     
     @objc func changeTheming() {
-        view.backgroundColor = NCBrandColor.shared.backgroundView
-        tableView.backgroundColor = NCBrandColor.shared.backgroundView
         tableView.reloadData()        
     }
 

iOSClient/RichWorkspace/NCViewerRichWorkspace.swift

@@ -40,6 +40,7 @@ import MarkdownKit
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        view.backgroundColor = NCBrandColor.shared.systemBackground
         presentationController?.delegate = self
         
         let closeItem = UIBarButtonItem(title: NSLocalizedString("_back_", comment: ""), style: .plain, target: self, action: #selector(closeItemTapped(_:)))
@@ -85,7 +86,6 @@ import MarkdownKit
     }
     
     @objc func changeTheming() {
-        view.backgroundColor = NCBrandColor.shared.backgroundView
         if textViewColor != NCBrandColor.shared.textView {
             markdownParser = MarkdownParser(font: UIFont.systemFont(ofSize: 15), color: NCBrandColor.shared.textView)
             markdownParser.header.font = UIFont.systemFont(ofSize: 25)

iOSClient/ScanDocument/ScanCollectionView.swift

@@ -59,20 +59,25 @@ class DragDropViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        view.backgroundColor = NCBrandColor.shared.systemBackground
+
         collectionViewSource.dragInteractionEnabled = true
         collectionViewSource.dragDelegate = self
         collectionViewSource.dropDelegate = self
-        
+        collectionViewSource.backgroundColor = NCBrandColor.shared.systemBackground
+
         collectionViewDestination.dragInteractionEnabled = true
         collectionViewDestination.dropDelegate = self
         collectionViewDestination.dragDelegate = self
         collectionViewDestination.reorderingCadence = .fast //default value - .immediate
-        
+        collectionViewDestination.backgroundColor = NCBrandColor.shared.systemBackground
+
         self.navigationItem.title = NSLocalizedString("_scanned_images_", comment: "")
         cancel.title = NSLocalizedString("_cancel_", comment: "")
         save.title = NSLocalizedString("_save_", comment: "")
         labelTitlePDFzone.text = NSLocalizedString("_scan_label_document_zone_", comment: "")
-        
+        labelTitlePDFzone.backgroundColor = NCBrandColor.shared.systemBackground
+
         segmentControlFilter.setTitle(NSLocalizedString("_filter_original_", comment: ""), forSegmentAt: 0)
         segmentControlFilter.setTitle(NSLocalizedString("_filter_grayscale_", comment: ""), forSegmentAt: 1)
         segmentControlFilter.setTitle(NSLocalizedString("_filter_bn_", comment: ""), forSegmentAt: 2)
@@ -94,15 +99,10 @@ class DragDropViewController: UIViewController {
     }
     
     @objc func changeTheming() {
-        view.backgroundColor = NCBrandColor.shared.backgroundView
-
-        collectionViewSource.backgroundColor = NCBrandColor.shared.backgroundView
-        collectionViewDestination.backgroundColor = NCBrandColor.shared.backgroundView
         collectionViewSource.reloadData()
         collectionViewDestination.reloadData()
 
         labelTitlePDFzone.textColor = NCBrandColor.shared.textView
-        labelTitlePDFzone.backgroundColor = .systemBackground
     }
     
     //MARK: Button Action

iOSClient/Select/NCSelect.swift

@@ -100,6 +100,8 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent
         self.navigationController?.navigationBar.prefersLargeTitles = true
         self.navigationController?.presentationController?.delegate = self
         
+        view.backgroundColor = NCBrandColor.shared.systemBackground
+
         activeAccount = NCManageDatabase.shared.getActiveAccount()
         
         // Cell
@@ -112,6 +114,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent
         // Footer
         collectionView.register(UINib.init(nibName: "NCSectionFooter", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: "sectionFooter")
         collectionView.alwaysBounceVertical = true
+        collectionView.backgroundColor = NCBrandColor.shared.systemBackground
         
         listLayout = NCListLayout()
         gridLayout = NCGridLayout()
@@ -119,7 +122,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent
         // Add Refresh Control
         collectionView.addSubview(refreshControl)
         refreshControl.tintColor = NCBrandColor.shared.brandText
-        refreshControl.backgroundColor = NCBrandColor.shared.brandElement
+        refreshControl.backgroundColor = NCBrandColor.shared.systemBackground
         refreshControl.addTarget(self, action: #selector(loadDatasource), for: .valueChanged)
         
         // Empty
@@ -207,10 +210,8 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent
     }
     
     @objc func changeTheming() {
-        view.backgroundColor = NCBrandColor.shared.backgroundView
-        collectionView.backgroundColor = NCBrandColor.shared.backgroundView
+        
         collectionView.reloadData()
-        refreshControl.backgroundColor = NCBrandColor.shared.backgroundView
         selectCommandViewSelect?.separatorView.backgroundColor = NCBrandColor.shared.separator
     }
     

iOSClient/Share/NCShare.swift

@@ -59,6 +59,8 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        view.backgroundColor = NCBrandColor.shared.systemBackground
+
         viewContainerConstraint.constant = height
         searchFieldTopConstraint.constant = 10
                 
@@ -76,6 +78,7 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
         tableView.dataSource = self
         tableView.delegate = self
         tableView.allowsSelection = false
+        tableView.backgroundColor = NCBrandColor.shared.systemBackground
 
         tableView.register(UINib.init(nibName: "NCShareLinkCell", bundle: nil), forCellReuseIdentifier: "cellLink")
         tableView.register(UINib.init(nibName: "NCShareUserCell", bundle: nil), forCellReuseIdentifier: "cellUser")
@@ -120,8 +123,6 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
     }
     
     @objc func changeTheming() {
-        view.backgroundColor = NCBrandColor.shared.backgroundView
-        tableView.backgroundColor = NCBrandColor.shared.backgroundView
         tableView.reloadData()
         shareLinkLabel.textColor = NCBrandColor.shared.textView
     }
@@ -276,7 +277,7 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
         dropDown = DropDown()
         let appearance = DropDown.appearance()
         
-        appearance.backgroundColor = NCBrandColor.shared.backgroundView
+        appearance.backgroundColor = NCBrandColor.shared.systemBackground
         appearance.cornerRadius = 10
         appearance.shadowColor = UIColor(white: 0.5, alpha: 1)
         appearance.shadowOpacity = 0.9

iOSClient/Share/NCShareComments.swift

@@ -40,6 +40,7 @@ class NCShareComments: UIViewController, NCShareCommentsCellDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        view.backgroundColor = NCBrandColor.shared.systemBackground
         viewContainerConstraint.constant = height
         
         tableView.dataSource = self
@@ -48,7 +49,7 @@ class NCShareComments: UIViewController, NCShareCommentsCellDelegate {
         tableView.rowHeight = UITableView.automaticDimension
         tableView.estimatedRowHeight = tableView.bounds.height
         tableView.allowsSelection = false
-        tableView.backgroundColor = NCBrandColor.shared.backgroundView
+        tableView.backgroundColor = NCBrandColor.shared.systemBackground
         tableView.separatorColor = NCBrandColor.shared.separator
         
         tableView.register(UINib.init(nibName: "NCShareCommentsCell", bundle: nil), forCellReuseIdentifier: "cell")
@@ -97,8 +98,6 @@ class NCShareComments: UIViewController, NCShareCommentsCellDelegate {
     }
     
     @objc func changeTheming() {
-        view.backgroundColor = NCBrandColor.shared.backgroundView
-        tableView.backgroundColor = NCBrandColor.shared.backgroundView
         tableView.reloadData()
         labelUser.textColor = NCBrandColor.shared.textView
     }

iOSClient/Share/NCShareCommon.swift

@@ -82,7 +82,7 @@ class NCShareCommon: NSObject {
             shareLinkMenuView.height = 440
         }
         
-        shareLinkMenuView.backgroundColor = NCBrandColor.shared.backgroundView
+        shareLinkMenuView.backgroundColor = NCBrandColor.shared.systemBackground
         shareLinkMenuView.metadata = metadata
         shareLinkMenuView.viewWindow = viewWindow
         shareLinkMenuView.shareViewController = shareViewController
@@ -126,7 +126,7 @@ class NCShareCommon: NSObject {
             shareUserMenuView.height = 260
         }
         
-        shareUserMenuView.backgroundColor = NCBrandColor.shared.backgroundView
+        shareUserMenuView.backgroundColor = NCBrandColor.shared.systemBackground
         shareUserMenuView.metadata = metadata
         shareUserMenuView.viewWindow = viewWindow
         shareUserMenuView.shareViewController = shareViewController
@@ -155,12 +155,11 @@ class NCShareCommon: NSObject {
         let calendar = FSCalendar(frame: CGRect(x: globalPoint!.x + 10, y: globalPoint!.y + 10, width: width - 20, height: 300))
         
         if #available(iOS 13.0, *) {
-            calendar.backgroundColor = .systemBackground
             calendar.appearance.headerTitleColor = .label
         } else {
-            calendar.backgroundColor = .white
             calendar.appearance.headerTitleColor = .black
         }
+        calendar.backgroundColor = NCBrandColor.shared.systemBackground
         calendar.placeholderType = .none
         calendar.appearance.headerMinimumDissolvedAlpha = 0.0
         

iOSClient/Share/NCSharePaging.swift

@@ -41,6 +41,8 @@ class NCSharePaging: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        view.backgroundColor = NCBrandColor.shared.systemBackground
+
         // Verify Comments & Sharing enabled
         let serverVersionMajor = NCManageDatabase.shared.getCapabilitiesServerInt(account: appDelegate.account, elements: NCElementsJSON.shared.capabilitiesVersionMajor)
         let comments = NCManageDatabase.shared.getCapabilitiesServerBool(account: appDelegate.account, elements: NCElementsJSON.shared.capabilitiesFilesComments, exists: false)
@@ -72,6 +74,9 @@ class NCSharePaging: UIViewController {
         pagingViewController.activityEnabled = activityEnabled
         pagingViewController.commentsEnabled = commentsEnabled
         pagingViewController.sharingEnabled = sharingEnabled
+        pagingViewController.backgroundColor = NCBrandColor.shared.systemBackground
+        pagingViewController.menuBackgroundColor = NCBrandColor.shared.systemBackground
+        pagingViewController.selectedBackgroundColor = NCBrandColor.shared.systemBackground
        
         pagingViewController.metadata = metadata
         
@@ -133,11 +138,6 @@ class NCSharePaging: UIViewController {
     //MARK: - NotificationCenter
     
     @objc func changeTheming() {
-        view.backgroundColor = NCBrandColor.shared.backgroundView
-        
-        pagingViewController.backgroundColor = NCBrandColor.shared.backgroundView
-        pagingViewController.menuBackgroundColor = NCBrandColor.shared.backgroundView
-        pagingViewController.selectedBackgroundColor = NCBrandColor.shared.backgroundView
         pagingViewController.textColor = NCBrandColor.shared.textView
         pagingViewController.selectedTextColor = NCBrandColor.shared.textView
         pagingViewController.indicatorColor = NCBrandColor.shared.brandElement
@@ -272,7 +272,7 @@ class NCSharePagingView: PagingView {
     override func setupConstraints() {
         
         let headerView = Bundle.main.loadNibNamed("NCShareHeaderView", owner: self, options: nil)?.first as! NCShareHeaderView
-        headerView.backgroundColor = NCBrandColor.shared.backgroundView
+        headerView.backgroundColor = NCBrandColor.shared.systemBackground
         headerView.ocId = metadata!.ocId
         
         if FileManager.default.fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadata!.ocId, etag: metadata!.etag)) {

iOSClient/Trash/NCTrash.swift

@@ -58,6 +58,7 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        view.backgroundColor = NCBrandColor.shared.systemBackground
         self.navigationController?.navigationBar.prefersLargeTitles = true
 
         // Cell
@@ -69,6 +70,7 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
         collectionView.register(UINib.init(nibName: "NCTrashSectionFooter", bundle: nil), forSupplementaryViewOfKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: "sectionFooter")
 
         collectionView.alwaysBounceVertical = true
+        collectionView.backgroundColor = NCBrandColor.shared.systemBackground
 
         listLayout = NCListLayout()
         gridLayout = NCGridLayout()
@@ -124,9 +126,6 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
     }
     
     @objc func changeTheming() {
-        
-        view.backgroundColor = NCBrandColor.shared.backgroundView
-        collectionView.backgroundColor = NCBrandColor.shared.backgroundView
         collectionView.reloadData()
     }
     
@@ -262,7 +261,7 @@ extension NCTrash: UICollectionViewDataSource {
             }
             
             trashHeader.delegate = self
-            trashHeader.backgroundColor = NCBrandColor.shared.backgroundView
+            trashHeader.backgroundColor = NCBrandColor.shared.systemBackground
             trashHeader.separator.backgroundColor = NCBrandColor.shared.separator
             trashHeader.setStatusButton(datasource: datasource)
             trashHeader.setTitleSorted(datasourceTitleButton: titleButton)

iOSClient/Trash/Section/NCTrashSectionHeaderFooter.swift

@@ -44,7 +44,7 @@ class NCTrashSectionHeaderMenu: UICollectionReusableView {
         buttonMore.setImage(UIImage.init(named: "more")!.image(color: NCBrandColor.shared.icon, size: 25), for: .normal)
         
         separator.backgroundColor = NCBrandColor.shared.separator
-        backgroundColor = NCBrandColor.shared.backgroundView
+        backgroundColor = NCBrandColor.shared.systemBackground
     }
     
     func setTitleSorted(datasourceTitleButton: String) {

iOSClient/Viewer/NCViewerImage/NCViewerImage.swift

@@ -219,7 +219,7 @@ class NCViewerImage: UIViewController {
     @objc func changeTheming() {
         
         if currentMode == .normal {
-            view.backgroundColor = NCBrandColor.shared.backgroundView
+            view.backgroundColor = NCBrandColor.shared.systemBackground
             textColor = NCBrandColor.shared.textView
         }
         toolBar.tintColor = NCBrandColor.shared.brandElement
@@ -671,7 +671,7 @@ extension NCViewerImage: UIGestureRecognizerDelegate {
         if currentMode == .full {
             
             navigationController?.setNavigationBarHidden(false, animated: false)
-            view.backgroundColor = NCBrandColor.shared.backgroundView
+            view.backgroundColor = NCBrandColor.shared.systemBackground
             textColor = NCBrandColor.shared.textView
             progressView.isHidden = false
             

iOSClient/Viewer/NCViewerPDF/NCViewerPDF.swift

@@ -61,7 +61,7 @@ class NCViewerPDF: UIViewController, NCViewerPDFSearchDelegate {
         pdfDocument = PDFDocument(url: URL(fileURLWithPath: filePath))
         
         pdfView.document = pdfDocument
-        pdfView.backgroundColor = NCBrandColor.shared.backgroundView
+        pdfView.backgroundColor = NCBrandColor.shared.systemBackground
         pdfView.displayMode = .singlePageContinuous
         pdfView.autoScales = true
         pdfView.displayDirection = .horizontal
@@ -190,7 +190,7 @@ class NCViewerPDF: UIViewController, NCViewerPDFSearchDelegate {
     @objc func changeTheming() {
         
         if navigationController?.isNavigationBarHidden == false {
-            pdfView.backgroundColor = NCBrandColor.shared.backgroundView
+            pdfView.backgroundColor = NCBrandColor.shared.systemBackground
         }
     }
     
@@ -222,7 +222,7 @@ class NCViewerPDF: UIViewController, NCViewerPDFSearchDelegate {
             
             navigationController?.setNavigationBarHidden(false, animated: false)
             pdfThumbnailView.isHidden = false
-            pdfView.backgroundColor = NCBrandColor.shared.backgroundView
+            pdfView.backgroundColor = NCBrandColor.shared.systemBackground
 
         } else {