[stable-5.2.7] NMC/2172 - dashboard theming

iOSClient/Extensions/UINavigationController+Extension.swift

@@ -32,7 +32,7 @@ extension UINavigationController {
 
     func setNavigationBarAppearance() {
 
-        navigationBar.tintColor = .systemBlue
+        navigationBar.tintColor = NCBrandColor.shared.brand
 
         let standardAppearance = UINavigationBarAppearance()
         standardAppearance.configureWithDefaultBackground()
@@ -52,7 +52,7 @@ extension UINavigationController {
 
     func setGroupAppearance() {
 
-        navigationBar.tintColor = .systemBlue
+        navigationBar.tintColor = NCBrandColor.shared.brand
 
         let standardAppearance = UINavigationBarAppearance()
         standardAppearance.configureWithDefaultBackground()

iOSClient/Favorites/NCFavorite.swift

@@ -32,6 +32,7 @@ class NCFavorite: NCCollectionViewCommon {
         titleCurrentFolder = NSLocalizedString("_favorites_", comment: "")
         layoutKey = NCGlobal.shared.layoutViewFavorite
         enableSearchBar = false
+        headerMenuButtonsView = true
         headerRichWorkspaceDisable = true
         emptyImage = UIImage(named: "star.fill")?.image(color: NCBrandColor.shared.yellowFavorite, size: UIScreen.main.bounds.width)
         emptyTitle = "_favorite_no_files_"

iOSClient/Files/NCFiles.swift

@@ -38,7 +38,7 @@ class NCFiles: NCCollectionViewCommon {
         enableSearchBar = true
         headerRichWorkspaceDisable = false
         headerMenuTransferView = true
-        emptyImage = UIImage(named: "folder")?.image(color: NCBrandColor.shared.brandElement, size: UIScreen.main.bounds.width)
+        emptyImage = UIImage(named: "folder")
         emptyTitle = "_files_no_files_"
         emptyDescription = "_no_file_pull_down_"
     }

iOSClient/Groupfolders/NCGroupfolders.swift

@@ -33,7 +33,7 @@ class NCGroupfolders: NCCollectionViewCommon {
         layoutKey = NCGlobal.shared.layoutViewGroupfolders
         enableSearchBar = false
         headerRichWorkspaceDisable = true
-        emptyImage = UIImage(named: "folder_group")?.image(color: NCBrandColor.shared.brandElement, size: UIScreen.main.bounds.width)
+        emptyImage = UIImage(named: "folder_group")
         emptyTitle = "_files_no_files_"
         emptyDescription = "_tutorial_groupfolders_view_"
     }

iOSClient/Main/Collection Common/Cell/NCCellProtocol.swift

@@ -41,6 +41,7 @@ protocol NCCellProtocol {
     var fileMoreImage: UIImageView? { get set }
     var cellSeparatorView: UIView? { get set }
     var indexPath: IndexPath { get set }
+    var fileSharedLabel: UILabel? { get set }
 
     func titleInfoTrailingDefault()
     func titleInfoTrailingFull()
@@ -112,6 +113,10 @@ extension NCCellProtocol {
         get { return nil }
         set {}
     }
+    var fileSharedLabel: UILabel? {
+        get { return nil }
+        set { }
+    }
 
     func titleInfoTrailingDefault() {}
     func titleInfoTrailingFull() {}

iOSClient/Main/Collection Common/Cell/NCGridCell.swift

@@ -176,7 +176,7 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
     }
 
     func selected(_ status: Bool) {
-        guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(objectId), !metadata.isInTransfer else {
+        guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(objectId), !metadata.isInTransfer, !metadata.e2eEncrypted else {
             imageSelect.isHidden = true
             imageVisualEffect.isHidden = true
             return
@@ -192,7 +192,7 @@ class NCGridCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
             imageSelect.image = NCImageCache.images.checkedYes
             imageVisualEffect.isHidden = false
         } else {
-            imageSelect.isHidden = true
+            imageSelect.image = NCImageCache.images.checkedNo
             imageVisualEffect.isHidden = true
         }
     }

iOSClient/Main/Collection Common/Cell/NCListCell.swift

@@ -29,7 +29,6 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
     @IBOutlet weak var imageSelect: UIImageView!
     @IBOutlet weak var imageStatus: UIImageView!
     @IBOutlet weak var imageFavorite: UIImageView!
-    @IBOutlet weak var imageFavoriteBackground: UIImageView!
     @IBOutlet weak var imageLocal: UIImageView!
     @IBOutlet weak var labelTitle: UILabel!
     @IBOutlet weak var labelInfo: UILabel!
@@ -40,12 +39,9 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
     @IBOutlet weak var buttonMore: UIButton!
     @IBOutlet weak var progressView: UIProgressView!
     @IBOutlet weak var separator: UIView!
-    @IBOutlet weak var tag0: UILabel!
-    @IBOutlet weak var tag1: UILabel!
-
+    @IBOutlet weak var labelShared: UILabel!
     @IBOutlet weak var imageItemLeftConstraint: NSLayoutConstraint!
     @IBOutlet weak var separatorHeightConstraint: NSLayoutConstraint!
-    @IBOutlet weak var titleTrailingConstraint: NSLayoutConstraint!
     @IBOutlet weak var subInfoTrailingConstraint: NSLayoutConstraint!
 
     private var objectId = ""
@@ -114,7 +110,11 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
         get { return separator }
         set { separator = newValue }
     }
-
+
+    var fileSharedLabel: UILabel? {
+        get { return labelShared }
+        set { labelShared = newValue }
+    }
     override func awakeFromNib() {
         super.awakeFromNib()
 
@@ -148,23 +148,14 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
 
         labelTitle.text = ""
         labelInfo.text = ""
-        labelSubinfo.text = ""
         labelTitle.textColor = .label
         labelInfo.textColor = .systemGray
         labelSubinfo.textColor = .systemGray
-
-        imageFavoriteBackground.isHidden = true
     }
 
     override func prepareForReuse() {
         super.prepareForReuse()
         imageItem.backgroundColor = nil
-        if fileFavoriteImage?.image != nil {
-            imageFavoriteBackground.isHidden = false
-        } else {
-            imageFavoriteBackground.isHidden = true
-        }
-
         accessibilityHint = nil
         accessibilityLabel = nil
         accessibilityValue = nil
@@ -205,12 +196,10 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
     }
 
     func titleInfoTrailingFull() {
-        titleTrailingConstraint.constant = 10
         subInfoTrailingConstraint.constant = 10
     }
 
     func titleInfoTrailingDefault() {
-        titleTrailingConstraint.constant = 90
         subInfoTrailingConstraint.constant = 90
     }
 
@@ -287,52 +276,14 @@ class NCListCell: UICollectionViewCell, UIGestureRecognizerDelegate, NCCellProto
     }
 
     func writeInfoDateSize(date: NSDate, size: Int64) {
-        labelInfo.text = NCUtility().dateDiff(date as Date)
-        labelSubinfo.text = " · " + NCUtilityFileSystem().transformedSize(size)
+        labelInfo.text = NCUtility().dateDiff(date as Date) + " · " + NCUtilityFileSystem().transformedSize(size)
+        labelSubinfo.text = ""
     }
 
     func setAccessibility(label: String, value: String) {
         accessibilityLabel = label
         accessibilityValue = value
     }
-
-    func setTags(tags: [String]) {
-        if tags.isEmpty {
-            tag0.isHidden = true
-            tag1.isHidden = true
-            labelInfo.isHidden = false
-            labelSubinfo.isHidden = false
-        } else {
-            tag0.isHidden = false
-            tag1.isHidden = true
-            labelInfo.isHidden = true
-            labelSubinfo.isHidden = true
-
-            if let tag = tags.first {
-                tag0.text = tag
-                if tags.count > 1 {
-                    tag1.isHidden = false
-                    tag1.text = "+\(tags.count - 1)"
-                }
-            }
-        }
-    }
-
-    func setIconOutlines() {
-        imageFavoriteBackground.isHidden = fileFavoriteImage?.image == nil
-
-        if imageStatus.image != nil {
-            imageStatus.makeCircularBackground(withColor: .systemBackground)
-        } else {
-            imageStatus.backgroundColor = .clear
-        }
-
-        if imageLocal.image != nil {
-            imageLocal.makeCircularBackground(withColor: .systemBackground)
-        } else {
-            imageLocal.backgroundColor = .clear
-        }
-    }
 }
 
 protocol NCListCellDelegate: AnyObject {