remove ios12

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

Share/NCShareExtension.swift

@@ -89,10 +89,10 @@ class NCShareExtension: UIViewController {
         refreshControl.addTarget(self, action: #selector(reloadDatasource), for: .valueChanged)
 
         commandView.backgroundColor = NCBrandColor.shared.secondarySystemBackground
-        separatorView.backgroundColor = NCBrandColor.shared.separator
+        separatorView.backgroundColor = .separator
         separatorHeightConstraint.constant = 0.5
 
-        tableView.separatorColor = NCBrandColor.shared.separator
+        tableView.separatorColor = .separator
         tableView.layer.cornerRadius = 10
         tableView.tableFooterView = UIView(frame: CGRect(origin: .zero, size: CGSize(width: 0, height: 1)))
         commandViewHeightConstraint.constant = heightCommandView

iOSClient/Activity/NCActivity.swift

@@ -221,7 +221,7 @@ extension NCActivity: UITableViewDataSource {
         cell.labelUser.textColor = NCBrandColor.shared.label
         // Date
         cell.labelDate.text = CCUtility.dateDiff(comment.creationDateTime as Date)
-        cell.labelDate.textColor = NCBrandColor.shared.systemGray4
+        cell.labelDate.textColor = .systemGray4
         // Message
         cell.labelMessage.text = comment.message
         cell.labelMessage.textColor = NCBrandColor.shared.label

iOSClient/Brand/NCBrand.swift

@@ -163,12 +163,6 @@ class NCBrandColor: NSObject {
     public var themingColorElement: String = ""
     public var themingColorText: String = ""
 
-    @objc public var annotationColor: UIColor {
-        get {
-            return .systemBlue
-        }
-    }
-
     @objc public var systemBlue: UIColor {
         get {
             if #available(iOS 13, *) {
@@ -275,113 +269,9 @@ class NCBrandColor: NSObject {
         }
     }
 
-    @objc public var secondaryLabel: UIColor {
-        get {
-            if #available(iOS 13, *) {
-                return .secondaryLabel
-            } else {
-                return UIColor(red: 0.24, green: 0.24, blue: 0.26, alpha: 0.6)
-            }
-        }
-    }
-
-    @objc public var separator: UIColor {
-        get {
-            if #available(iOS 13, *) {
-                return .separator
-            } else {
-                return UIColor(red: 0.89, green: 0.89, blue: 0.89, alpha: 1.0)
-            }
-        }
-    }
-
-    @objc public var opaqueSeparator: UIColor {
-        get {
-            if #available(iOS 13, *) {
-                return .opaqueSeparator
-            } else {
-                return UIColor(red: 0.78, green: 0.78, blue: 0.78, alpha: 1.0)
-            }
-        }
-    }
-
-    @objc public var systemGray: UIColor {
-        get {
-            if #available(iOS 13, *) {
-                return .systemGray
-            } else {
-                return UIColor(red: 0.56, green: 0.56, blue: 0.58, alpha: 1.0)
-            }
-        }
-    }
-
     @objc public var systemGray1: UIColor {
         get {
-            if #available(iOS 13, *) {
-                return UIColor(red: 0.60, green: 0.60, blue: 0.60, alpha: 1.0)
-            } else {
-                return UIColor(red: 0.60, green: 0.60, blue: 0.60, alpha: 1.0)
-            }
-        }
-    }
-
-    @objc public var systemGray2: UIColor {
-        get {
-            if #available(iOS 13, *) {
-                return .systemGray2
-            } else {
-                return UIColor(red: 0.68, green: 0.68, blue: 0.7, alpha: 1.0)
-            }
-        }
-    }
-
-    @objc public var systemGray3: UIColor {
-        get {
-            if #available(iOS 13, *) {
-                return .systemGray3
-            } else {
-                return UIColor(red: 0.78, green: 0.78, blue: 0.8, alpha: 1.0)
-            }
-        }
-    }
-
-    @objc public var systemGray4: UIColor {
-        get {
-            if #available(iOS 13, *) {
-                return .systemGray4
-            } else {
-                return UIColor(red: 0.82, green: 0.82, blue: 0.84, alpha: 1.0)
-            }
-        }
-    }
-
-    @objc public var systemGray5: UIColor {
-        get {
-            if #available(iOS 13, *) {
-                return .systemGray5
-            } else {
-                return UIColor(red: 0.9, green: 0.9, blue: 0.92, alpha: 1.0)
-            }
-        }
-    }
-
-    @objc public var systemGray6: UIColor {
-        get {
-            if #available(iOS 13, *) {
-                return .systemGray6
-            } else {
-                return UIColor(red: 0.95, green: 0.95, blue: 0.97, alpha: 1.0)
-            }
-        }
-    }
-
-    @objc public var systemFill: UIColor {
-        get {
-            if #available(iOS 13, *) {
-                return .systemFill
-            } else {
-                return UIColor(red: 120/255, green: 120/255, blue: 120/255, alpha: 1.0)
-            }
+            return UIColor(red: 0.60, green: 0.60, blue: 0.60, alpha: 1.0)
         }
     }
 

iOSClient/Diagnostics/NCCapabilitiesViewController.swift

@@ -90,73 +90,73 @@ class NCCapabilitiesViewController: UIViewController, UIDocumentInteractionContr
 
         statusFileSharing.layer.cornerRadius = 12.5
         statusFileSharing.layer.borderWidth = 0.5
-        statusFileSharing.layer.borderColor = NCBrandColor.shared.systemGray.cgColor
+        statusFileSharing.layer.borderColor = UIColor.systemGray.cgColor
         statusFileSharing.layer.masksToBounds = true
         statusFileSharing.backgroundColor = NCBrandColor.shared.secondarySystemBackground
 
         statusExternalSite.layer.cornerRadius = 12.5
         statusExternalSite.layer.borderWidth = 0.5
-        statusExternalSite.layer.borderColor = NCBrandColor.shared.systemGray.cgColor
+        statusExternalSite.layer.borderColor = UIColor.systemGray.cgColor
         statusExternalSite.layer.masksToBounds = true
         statusExternalSite.backgroundColor = NCBrandColor.shared.secondarySystemBackground
 
         statusEndToEndEncryption.layer.cornerRadius = 12.5
         statusEndToEndEncryption.layer.borderWidth = 0.5
-        statusEndToEndEncryption.layer.borderColor = NCBrandColor.shared.systemGray.cgColor
+        statusEndToEndEncryption.layer.borderColor = UIColor.systemGray.cgColor
         statusEndToEndEncryption.layer.masksToBounds = true
         statusEndToEndEncryption.backgroundColor = NCBrandColor.shared.secondarySystemBackground
 
         statusActivity.layer.cornerRadius = 12.5
         statusActivity.layer.borderWidth = 0.5
-        statusActivity.layer.borderColor = NCBrandColor.shared.systemGray.cgColor
+        statusActivity.layer.borderColor = UIColor.systemGray.cgColor
         statusActivity.layer.masksToBounds = true
         statusActivity.backgroundColor = NCBrandColor.shared.secondarySystemBackground
 
         statusNotification.layer.cornerRadius = 12.5
         statusNotification.layer.borderWidth = 0.5
-        statusNotification.layer.borderColor = NCBrandColor.shared.systemGray.cgColor
+        statusNotification.layer.borderColor = UIColor.systemGray.cgColor
         statusNotification.layer.masksToBounds = true
         statusNotification.backgroundColor = NCBrandColor.shared.secondarySystemBackground
 
         statusDeletedFiles.layer.cornerRadius = 12.5
         statusDeletedFiles.layer.borderWidth = 0.5
-        statusDeletedFiles.layer.borderColor = NCBrandColor.shared.systemGray.cgColor
+        statusDeletedFiles.layer.borderColor = UIColor.systemGray.cgColor
         statusDeletedFiles.layer.masksToBounds = true
         statusDeletedFiles.backgroundColor = NCBrandColor.shared.secondarySystemBackground
 
         statusText.layer.cornerRadius = 12.5
         statusText.layer.borderWidth = 0.5
-        statusText.layer.borderColor = NCBrandColor.shared.systemGray.cgColor
+        statusText.layer.borderColor = UIColor.systemGray.cgColor
         statusText.layer.masksToBounds = true
         statusText.backgroundColor = NCBrandColor.shared.secondarySystemBackground
 
         statusCollabora.layer.cornerRadius = 12.5
         statusCollabora.layer.borderWidth = 0.5
-        statusCollabora.layer.borderColor = NCBrandColor.shared.systemGray.cgColor
+        statusCollabora.layer.borderColor = UIColor.systemGray.cgColor
         statusCollabora.layer.masksToBounds = true
         statusCollabora.backgroundColor = NCBrandColor.shared.secondarySystemBackground
 
         statusOnlyOffice.layer.cornerRadius = 12.5
         statusOnlyOffice.layer.borderWidth = 0.5
-        statusOnlyOffice.layer.borderColor = NCBrandColor.shared.systemGray.cgColor
+        statusOnlyOffice.layer.borderColor = UIColor.systemGray.cgColor
         statusOnlyOffice.layer.masksToBounds = true
         statusOnlyOffice.backgroundColor = NCBrandColor.shared.secondarySystemBackground
 
         statusUserStatus.layer.cornerRadius = 12.5
         statusUserStatus.layer.borderWidth = 0.5
-        statusUserStatus.layer.borderColor = NCBrandColor.shared.systemGray.cgColor
+        statusUserStatus.layer.borderColor = UIColor.systemGray.cgColor
         statusUserStatus.layer.masksToBounds = true
         statusUserStatus.backgroundColor = NCBrandColor.shared.secondarySystemBackground
 
         statusComments.layer.cornerRadius = 12.5
         statusComments.layer.borderWidth = 0.5
-        statusComments.layer.borderColor = NCBrandColor.shared.systemGray.cgColor
+        statusComments.layer.borderColor = UIColor.systemGray.cgColor
         statusComments.layer.masksToBounds = true
         statusComments.backgroundColor = NCBrandColor.shared.secondarySystemBackground
 
         statusLockFile.layer.cornerRadius = 12.5
         statusLockFile.layer.borderWidth = 0.5
-        statusLockFile.layer.borderColor = NCBrandColor.shared.systemGray.cgColor
+        statusLockFile.layer.borderColor = UIColor.systemGray.cgColor
         statusLockFile.layer.masksToBounds = true
         statusLockFile.backgroundColor = NCBrandColor.shared.secondarySystemBackground
 

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -1648,7 +1648,7 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
         if appDelegate.isSearchingMode, let literalSearch = self.literalSearch, let title = cell.fileTitleLabel?.text {
             let longestWordRange = (title.lowercased() as NSString).range(of: literalSearch)
             let attributedString = NSMutableAttributedString(string: title, attributes: [NSAttributedString.Key.font : UIFont.systemFont(ofSize: 15)])
-            attributedString.setAttributes([NSAttributedString.Key.font : UIFont.boldSystemFont(ofSize: 15), NSAttributedString.Key.foregroundColor : NCBrandColor.shared.annotationColor], range: longestWordRange)
+            attributedString.setAttributes([NSAttributedString.Key.font : UIFont.boldSystemFont(ofSize: 15), NSAttributedString.Key.foregroundColor : UIColor.systemBlue], range: longestWordRange)
             cell.fileTitleLabel?.attributedText = attributedString
         }
         return cell

iOSClient/Main/Collection Common/NCGridCell.swift

@@ -117,8 +117,8 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
 
         labelTitle.text = ""
         labelInfo.text = ""
-        labelTitle.textColor = NCBrandColor.shared.label
-        labelInfo.textColor = NCBrandColor.shared.systemGray
+        labelTitle.textColor = .label
+        labelInfo.textColor = .systemGray
     }
 
     override func prepareForReuse() {

iOSClient/Main/Collection Common/NCListCell.swift

@@ -134,13 +134,13 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
         longPressedGestureMore.delaysTouchesBegan = true
         buttonMore.addGestureRecognizer(longPressedGestureMore)
 
-        separator.backgroundColor = NCBrandColor.shared.separator
+        separator.backgroundColor = .separator
         separatorHeightConstraint.constant = 0.5
 
         labelTitle.text = ""
         labelInfo.text = ""
-        labelTitle.textColor = NCBrandColor.shared.label
-        labelInfo.textColor = NCBrandColor.shared.systemGray
+        labelTitle.textColor = .label
+        labelInfo.textColor = .systemGray
     }
 
     override func prepareForReuse() {

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -105,7 +105,7 @@ extension NCCreateFormUploadConflictDelegate {
         buttonCancel.layer.masksToBounds = true
         buttonCancel.layer.borderWidth = 0.5
         buttonCancel.layer.borderColor = UIColor.darkGray.cgColor
-        buttonCancel.backgroundColor = NCBrandColor.shared.systemGray5
+        buttonCancel.backgroundColor = .systemGray5
         buttonCancel.setTitle(NSLocalizedString("_cancel_", comment: ""), for: .normal)
         buttonCancel.setTitleColor(NCBrandColor.shared.label, for: .normal)
 

iOSClient/Main/Section Header Footer/NCSectionHeaderFooter.swift

@@ -101,7 +101,7 @@ class NCSectionHeaderMenu: UICollectionReusableView, UIGestureRecognizerDelegate
         viewRichWorkspace?.addGestureRecognizer(tap)
 
         viewSeparatorHeightConstraint.constant = 0.5
-        viewSeparator.backgroundColor = NCBrandColor.shared.separator
+        viewSeparator.backgroundColor = .separator
 
         markdownParser = MarkdownParser(font: UIFont.systemFont(ofSize: 15), color: NCBrandColor.shared.label)
         markdownParser.header.font = UIFont.systemFont(ofSize: 25)
@@ -334,7 +334,7 @@ class NCSectionFooter: UICollectionReusableView, NCSectionFooterDelegate {
         labelSection.textColor = NCBrandColor.shared.gray
         labelSection.text = ""
 
-        separator.backgroundColor = NCBrandColor.shared.separator
+        separator.backgroundColor = .separator
         separatorHeightConstraint.constant = 0.5
 
         buttonIsHidden(true)

iOSClient/Menu/NCMenu.swift

@@ -72,7 +72,7 @@ class NCMenu: UITableViewController {
         let action = actions[indexPath.row]
         guard action.title != NCMenuAction.seperatorIdentifier else {
             let cell = UITableViewCell()
-            cell.backgroundColor = NCBrandColor.shared.separator
+            cell.backgroundColor = .separator
             return cell
         }
         let cell = tableView.dequeueReusableCell(withIdentifier: "menuActionCell", for: indexPath)

iOSClient/More/NCMore.swift

@@ -385,7 +385,7 @@ class NCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
             cell.backgroundColor = NCBrandColor.shared.secondarySystemGroupedBackground
             cell.accessoryType = UITableViewCell.AccessoryType.disclosureIndicator
 
-            cell.separator.backgroundColor = NCBrandColor.shared.separator
+            cell.separator.backgroundColor = .separator
             cell.separatorHeigth.constant = 0.4
             
             cell.layer.cornerRadius = 0

iOSClient/Notification/NCNotification.swift

@@ -175,7 +175,7 @@ class NCNotification: UITableViewController, NCNotificationCellDelegate, NCEmpty
         cell.secondary.layer.cornerRadius = 15
         cell.secondary.layer.masksToBounds = true
         cell.secondary.layer.borderWidth = 1
-        cell.secondary.layer.borderColor = NCBrandColor.shared.systemGray.cgColor
+        cell.secondary.layer.borderColor = UIColor.systemGray.cgColor
         cell.secondary.layer.backgroundColor = NCBrandColor.shared.secondarySystemBackground.cgColor
         cell.secondary.setTitleColor(.black, for: .normal)
 

iOSClient/ScanDocument/NCScan.swift

@@ -77,7 +77,7 @@ class NCScan: UIViewController, NCScanCellCellDelegate {
         save.title = NSLocalizedString("_save_", comment: "")
 
         labelTitlePDFzone.text = NSLocalizedString("_scan_label_document_zone_", comment: "")
-        labelTitlePDFzone.backgroundColor = NCBrandColor.shared.systemGray6
+        labelTitlePDFzone.backgroundColor = .systemGray6
         labelTitlePDFzone.textColor = NCBrandColor.shared.label
 
         segmentControlFilter.setTitle(NSLocalizedString("_filter_original_", comment: ""), forSegmentAt: 0)

iOSClient/Select/NCSelect.swift

@@ -95,7 +95,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, UIAdaptivePresent
         self.navigationController?.presentationController?.delegate = self
 
         view.backgroundColor = NCBrandColor.shared.systemBackground
-        selectCommandViewSelect?.separatorView.backgroundColor = NCBrandColor.shared.separator
+        selectCommandViewSelect?.separatorView.backgroundColor = .separator
 
         activeAccount = NCManageDatabase.shared.getActiveAccount()
 
@@ -785,7 +785,7 @@ class NCSelectCommandView: UIView {
     override func awakeFromNib() {
 
         separatorHeightConstraint.constant = 0.5
-        separatorView.backgroundColor = NCBrandColor.shared.separator
+        separatorView.backgroundColor = .separator
 
         overwriteLabel?.text = NSLocalizedString("_overwrite_", comment: "")
 

iOSClient/Share/Advanced/NCShareAdvancePermissionFooter.swift

@@ -41,7 +41,7 @@ class NCShareAdvancePermissionFooter: UIView {
         buttonCancel.layer.cornerRadius = 25
         buttonCancel.layer.masksToBounds = true
         buttonCancel.layer.borderWidth = 1
-        buttonCancel.layer.borderColor = NCBrandColor.shared.systemGray.cgColor
+        buttonCancel.layer.borderColor = UIColor.systemGray.cgColor
         buttonCancel.backgroundColor = NCBrandColor.shared.secondarySystemBackground
         buttonCancel.addTarget(self, action: #selector(cancelClicked), for: .touchUpInside)
         buttonCancel.setTitleColor(.black, for: .normal)

iOSClient/Share/Advanced/NCShareAdvancePermissionHeader.swift

@@ -45,7 +45,7 @@ class NCShareAdvancePermissionHeader: UIView {
         }
         fileName.text = metadata.fileNameView
         fileName.textColor = NCBrandColor.shared.label
-        info.textColor = NCBrandColor.shared.secondaryLabel
+        info.textColor = .secondaryLabel
         info.text = CCUtility.transformedSize(metadata.size) + ", " + CCUtility.dateDiff(metadata.date as Date)
     }
 }

iOSClient/Share/NCSharePaging.swift

@@ -328,7 +328,7 @@ class NCSharePagingView: PagingView {
         if metadata.favorite {
             headerView.favorite.setImage(NCUtility.shared.loadImage(named: "star.fill", color: NCBrandColor.shared.yellowFavorite, size: 20), for: .normal)
         } else {
-            headerView.favorite.setImage(NCUtility.shared.loadImage(named: "star.fill", color: NCBrandColor.shared.systemGray, size: 20), for: .normal)
+            headerView.favorite.setImage(NCUtility.shared.loadImage(named: "star.fill", color: .systemGray, size: 20), for: .normal)
         }
         headerView.info.text = CCUtility.transformedSize(metadata.size) + ", " + CCUtility.dateDiff(metadata.date as Date)
         addSubview(headerView)
@@ -378,7 +378,7 @@ class NCShareHeaderView: UIView {
             if error == .success {
                 self.favorite.setImage(NCUtility.shared.loadImage(
                     named: "star.fill",
-                    color: metadata.favorite ? NCBrandColor.shared.yellowFavorite : NCBrandColor.shared.systemGray,
+                    color: metadata.favorite ? NCBrandColor.shared.yellowFavorite : .systemGray,
                     size: 20), for: .normal)
             } else {
                 NCContentPresenter.shared.showError(error: error)

iOSClient/Transfers/NCTransferCell.swift

@@ -96,7 +96,7 @@ class NCTransferCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellP
         longPressedGestureMore.delaysTouchesBegan = true
         buttonMore.addGestureRecognizer(longPressedGestureMore)
 
-        separator.backgroundColor = NCBrandColor.shared.separator
+        separator.backgroundColor = .separator
         separatorHeightConstraint.constant = 0.5
 
         labelTitle.text = ""

iOSClient/Trash/Cell/NCTrashListCell+NCTrashCellProtocol.swift

@@ -70,7 +70,7 @@ class NCTrashListCell: UICollectionViewCell, NCTrashCellProtocol {
         imageItem.layer.cornerRadius = 6
         imageItem.layer.masksToBounds = true
 
-        separator.backgroundColor = NCBrandColor.shared.separator
+        separator.backgroundColor = .separator
         separatorHeightConstraint.constant = 0.5
     }
 

iOSClient/UserStatus/NCUserStatus.swift

@@ -83,7 +83,7 @@ class NCUserStatus: UIViewController {
 
         onlineButton.layer.cornerRadius = 10
         onlineButton.layer.masksToBounds = true
-        onlineButton.backgroundColor = NCBrandColor.shared.systemGray5
+        onlineButton.backgroundColor = .systemGray5
         let onLine = NCUtility.shared.getUserStatus(userIcon: nil, userStatus: "online", userMessage: nil)
         onlineImage.image = onLine.onlineStatus
         onlineLabel.text = onLine.statusMessage
@@ -91,7 +91,7 @@ class NCUserStatus: UIViewController {
 
         awayButton.layer.cornerRadius = 10
         awayButton.layer.masksToBounds = true
-        awayButton.backgroundColor = NCBrandColor.shared.systemGray5
+        awayButton.backgroundColor = .systemGray5
         let away = NCUtility.shared.getUserStatus(userIcon: nil, userStatus: "away", userMessage: nil)
         awayImage.image = away.onlineStatus
         awayLabel.text = away.statusMessage
@@ -99,7 +99,7 @@ class NCUserStatus: UIViewController {
 
         dndButton.layer.cornerRadius = 10
         dndButton.layer.masksToBounds = true
-        dndButton.backgroundColor = NCBrandColor.shared.systemGray5
+        dndButton.backgroundColor = .systemGray5
         let dnd = NCUtility.shared.getUserStatus(userIcon: nil, userStatus: "dnd", userMessage: nil)
         dndImage.image = dnd.onlineStatus
         dndLabel.text = dnd.statusMessage
@@ -109,7 +109,7 @@ class NCUserStatus: UIViewController {
 
         invisibleButton.layer.cornerRadius = 10
         invisibleButton.layer.masksToBounds = true
-        invisibleButton.backgroundColor = NCBrandColor.shared.systemGray5
+        invisibleButton.backgroundColor = .systemGray5
         let invisible = NCUtility.shared.getUserStatus(userIcon: nil, userStatus: "invisible", userMessage: nil)
         invisibleImage.image = invisible.onlineStatus
         invisibleLabel.text = invisible.statusMessage
@@ -121,7 +121,7 @@ class NCUserStatus: UIViewController {
         statusMessageLabel.textColor = NCBrandColor.shared.label
 
         statusMessageEmojiTextField.delegate = self
-        statusMessageEmojiTextField.backgroundColor = NCBrandColor.shared.systemGray5
+        statusMessageEmojiTextField.backgroundColor = .systemGray5
 
         statusMessageTextField.delegate = self
         statusMessageTextField.placeholder = NSLocalizedString("_status_message_placehorder_", comment: "")
@@ -154,7 +154,7 @@ class NCUserStatus: UIViewController {
         clearStatusMessageButton.layer.masksToBounds = true
         clearStatusMessageButton.layer.borderWidth = 0.5
         clearStatusMessageButton.layer.borderColor = UIColor.darkGray.cgColor
-        clearStatusMessageButton.backgroundColor = NCBrandColor.shared.systemGray5
+        clearStatusMessageButton.backgroundColor = .systemGray5
         clearStatusMessageButton.setTitle(NSLocalizedString("_clear_status_message_", comment: ""), for: .normal)
         clearStatusMessageButton.setTitleColor(NCBrandColor.shared.label, for: .normal)
 

iOSClient/Viewer/NCViewerMedia/NCViewerMediaDetailView.swift

@@ -59,7 +59,7 @@ class NCViewerMediaDetailView: UIView {
     override func awakeFromNib() {
         super.awakeFromNib()
 
-        separator.backgroundColor = NCBrandColor.shared.separator
+        separator.backgroundColor = .separator
         sizeLabel.text = ""
         sizeValue.text = ""
         dateLabel.text = ""

iOSClient/Viewer/NCViewerPDF/NCViewerPDF.swift

@@ -496,7 +496,7 @@ class NCViewerPDF: UIViewController, NCViewerPDFSearchDelegate {
         pdfSelection.pages.forEach { page in
             let highlight = PDFAnnotation(bounds: pdfSelection.bounds(for: page), forType: .highlight, withProperties: nil)
             highlight.endLineStyle = .square
-            highlight.color = NCBrandColor.shared.annotationColor
+            highlight.color = .systemBlue
             page.addAnnotation(highlight)
         }
         if let page = pdfSelection.pages.first {

iOSClient/Viewer/NCViewerPDF/NCViewerPDFSearch.swift

@@ -91,7 +91,7 @@ class NCViewerPDFSearch: UITableViewController, UISearchBarDelegate, PDFDocument
 
         let nsRange = NSString(string: extendSelection.string!).range(of: pdfSelection.string!, options: String.CompareOptions.caseInsensitive)
         if nsRange.location != NSNotFound {
-            let attributedSubString = NSAttributedString(string: NSString(string: extendSelection.string!).substring(with: nsRange), attributes: [NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: 17), NSAttributedString.Key.foregroundColor : NCBrandColor.shared.annotationColor])
+            let attributedSubString = NSAttributedString(string: NSString(string: extendSelection.string!).substring(with: nsRange), attributes: [NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: 17), NSAttributedString.Key.foregroundColor : UIColor.systemBlue])
             let attributedString = NSMutableAttributedString(string: extendSelection.string!)
             attributedString.replaceCharacters(in: nsRange, with: attributedSubString)
             cell.searchResultTextLabel.attributedText = attributedString