marinofaggiana 4 years ago
parent
commit
921f4b8776

+ 2 - 2
iOSClient/Main/CCMain+Swift.swift

@@ -27,7 +27,7 @@ extension CCMain {
                 self.navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor : NCBrandColor.sharedInstance.textView]
                 self.navigationController?.navigationBar.largeTitleTextAttributes = [NSAttributedString.Key.foregroundColor : NCBrandColor.sharedInstance.textView]
                 self.navigationController?.navigationBar.barTintColor = NCBrandColor.sharedInstance.backgroundView
-                self.navigationController?.navigationBar.tintColor = NCBrandColor.sharedInstance.brand
+                self.navigationController?.navigationBar.tintColor = NCBrandColor.sharedInstance.brandElement
                 self.navigationController?.navigationBar.shadowImage = nil
                 self.navigationController?.navigationBar.setValue(false, forKey: "hidesShadow")
             }
@@ -50,7 +50,7 @@ extension CCMain {
                 self.navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor : NCBrandColor.sharedInstance.textView]
                 self.navigationController?.navigationBar.largeTitleTextAttributes = [NSAttributedString.Key.foregroundColor : NCBrandColor.sharedInstance.textView]
                 self.navigationController?.navigationBar.barTintColor = NCBrandColor.sharedInstance.backgroundView
-                self.navigationController?.navigationBar.tintColor = NCBrandColor.sharedInstance.brand
+                self.navigationController?.navigationBar.tintColor = NCBrandColor.sharedInstance.brandElement
                 self.navigationController?.navigationBar.shadowImage = UIImage()
                 self.navigationController?.navigationBar.setValue(true, forKey: "hidesShadow")
             }

+ 1 - 1
iOSClient/Main/Create cloud/NCCreateFormUploadScanDocument.swift

@@ -661,7 +661,7 @@ class NCCreateScanDocument : NSObject, ImageScannerControllerDelegate {
         let scannerVC = ImageScannerController()
         scannerVC.imageScannerDelegate = self
         scannerVC.navigationBar.isTranslucent = false
-        scannerVC.navigationBar.barTintColor = NCBrandColor.sharedInstance.brand
+        scannerVC.navigationBar.barTintColor = NCBrandColor.sharedInstance.brandElement
         scannerVC.navigationBar.tintColor = NCBrandColor.sharedInstance.brandText
         scannerVC.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: NCBrandColor.sharedInstance.brandText]
         

+ 2 - 2
iOSClient/Select/NCSelect.swift

@@ -117,7 +117,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, NCListCellDelegat
         
         // Configure Refresh Control
         refreshControl.tintColor = NCBrandColor.sharedInstance.brandText
-        refreshControl.backgroundColor = NCBrandColor.sharedInstance.brand
+        refreshControl.backgroundColor = NCBrandColor.sharedInstance.brandElement
         refreshControl.addTarget(self, action: #selector(loadDatasource), for: .valueChanged)
         
         // empty Data Source
@@ -368,7 +368,7 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, NCListCellDelegat
         menuView?.delegate = self
         menuView?.rowHeight = 45
         menuView?.sectionHeaderHeight = 8
-        menuView?.highlightColor = NCBrandColor.sharedInstance.brand
+        menuView?.highlightColor = NCBrandColor.sharedInstance.brandElement
         menuView?.tableView.alwaysBounceVertical = false
         menuView?.tableViewSeperatorColor = NCBrandColor.sharedInstance.separator
         menuView?.tableViewBackgroundColor = NCBrandColor.sharedInstance.backgroundForm

+ 1 - 1
iOSClient/Share/NCShare.swift

@@ -462,7 +462,7 @@ class NCShareUserCell: UITableViewCell {
         super.awakeFromNib()
         
         switchCanEdit.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
-        switchCanEdit.onTintColor = NCBrandColor.sharedInstance.brand
+        switchCanEdit.onTintColor = NCBrandColor.sharedInstance.brandElement
         buttonMenu.setImage(CCGraphics.changeThemingColorImage(UIImage.init(named: "shareMenu"), width:100, height: 100, color: UIColor.gray), for: .normal)
     }
     

+ 1 - 1
iOSClient/Share/NCShareCommon.swift

@@ -166,7 +166,7 @@ class NCShareCommon: NSObject {
         calendar.appearance.weekdayTextColor = UIColor(red: 100/255, green: 100/255, blue: 100/255, alpha: 1)
         calendar.appearance.weekdayFont = UIFont.systemFont(ofSize: 12)
         
-        calendar.appearance.todayColor = NCBrandColor.sharedInstance.brand
+        calendar.appearance.todayColor = NCBrandColor.sharedInstance.brandElement
         calendar.appearance.titleFont = UIFont.systemFont(ofSize: 12)
         
         viewWindow.addSubview(calendar)

+ 7 - 7
iOSClient/Share/NCShareLinkMenuView.swift

@@ -84,19 +84,19 @@ class NCShareLinkMenuView: UIView, UIGestureRecognizerDelegate, NCShareNetworkin
         layer.shadowOpacity = 0.2
         
         switchAllowEditing?.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
-        switchAllowEditing?.onTintColor = NCBrandColor.sharedInstance.brand
+        switchAllowEditing?.onTintColor = NCBrandColor.sharedInstance.brandElement
         switchReadOnly?.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
-        switchReadOnly?.onTintColor = NCBrandColor.sharedInstance.brand
+        switchReadOnly?.onTintColor = NCBrandColor.sharedInstance.brandElement
         switchAllowUploadAndEditing?.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
-        switchAllowUploadAndEditing?.onTintColor = NCBrandColor.sharedInstance.brand
+        switchAllowUploadAndEditing?.onTintColor = NCBrandColor.sharedInstance.brandElement
         switchFileDrop?.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
-        switchFileDrop?.onTintColor = NCBrandColor.sharedInstance.brand
+        switchFileDrop?.onTintColor = NCBrandColor.sharedInstance.brandElement
         switchHideDownload.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
-        switchHideDownload.onTintColor = NCBrandColor.sharedInstance.brand
+        switchHideDownload.onTintColor = NCBrandColor.sharedInstance.brandElement
         switchPasswordProtect.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
-        switchPasswordProtect.onTintColor = NCBrandColor.sharedInstance.brand
+        switchPasswordProtect.onTintColor = NCBrandColor.sharedInstance.brandElement
         switchSetExpirationDate.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
-        switchSetExpirationDate.onTintColor = NCBrandColor.sharedInstance.brand
+        switchSetExpirationDate.onTintColor = NCBrandColor.sharedInstance.brandElement
         
         labelAllowEditing?.text = NSLocalizedString("_share_allow_editing_", comment: "")
         labelAllowEditing?.textColor = NCBrandColor.sharedInstance.textView

+ 1 - 1
iOSClient/Share/NCSharePaging.swift

@@ -100,7 +100,7 @@ class NCSharePaging: UIViewController {
         pagingViewController.selectedBackgroundColor = NCBrandColor.sharedInstance.backgroundForm
         pagingViewController.textColor = NCBrandColor.sharedInstance.textView
         pagingViewController.selectedTextColor = NCBrandColor.sharedInstance.textView
-        pagingViewController.indicatorColor = NCBrandColor.sharedInstance.brand
+        pagingViewController.indicatorColor = NCBrandColor.sharedInstance.brandElement
         (pagingViewController.view as! NCSharePagingView).setupConstraints()
         pagingViewController.reloadMenu()
     }

+ 1 - 1
iOSClient/Trash/NCTrash.swift

@@ -122,7 +122,7 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
         appDelegate.changeTheming(self, tableView: nil, collectionView: collectionView, form: false)
         
         refreshControl.tintColor = NCBrandColor.sharedInstance.brandText
-        refreshControl.backgroundColor = NCBrandColor.sharedInstance.brand
+        refreshControl.backgroundColor = NCBrandColor.sharedInstance.brandElement
     }
     
     // MARK: DZNEmpty