marinofaggiana 4 ani în urmă
părinte
comite
5a8e7303c6

+ 1 - 1
Share/ShareViewController.m

@@ -196,7 +196,7 @@
     // Title
     [self.navigationController.navigationBar setTitleTextAttributes: @{NSForegroundColorAttributeName:self.navigationController.navigationBar.tintColor}];
     
-    self.navigationItem.title = [NCBrandOptions sharedInstance].brand;
+    self.navigationItem.title = [NCBrandOptions sharedInstance].brandElement;
     self.navigationItem.leftBarButtonItem = leftButtonCancel;
     self.navigationItem.rightBarButtonItems = [[NSArray alloc] initWithObjects:rightButtonUpload, nil];
     self.navigationItem.hidesBackButton = YES;

+ 1 - 1
iOSClient/AppDelegate.m

@@ -863,7 +863,7 @@
     UIButton *buttonPlus = [UIButton buttonWithType:UIButtonTypeCustom];
     buttonPlus.tag = 99;
     [buttonPlus setImage:buttonImage forState:UIControlStateNormal];
-    buttonPlus.backgroundColor = NCBrandColor.sharedInstance.brand;
+    buttonPlus.backgroundColor = NCBrandColor.sharedInstance.brandElement;
     buttonPlus.layer.cornerRadius = buttonSize / 2;
     buttonPlus.layer.masksToBounds = NO;
     buttonPlus.layer.shadowOffset = CGSizeMake(0, 0);

+ 1 - 1
iOSClient/Login/NCAppConfigView.swift

@@ -38,7 +38,7 @@ class NCAppConfigView: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        self.view.backgroundColor = NCBrandColor.sharedInstance.brand
+        self.view.backgroundColor = NCBrandColor.sharedInstance.brandElement
         titleLabel.textColor = NCBrandColor.sharedInstance.brandText
         
         titleLabel.text = NSLocalizedString("_appconfig_view_title_", comment: "")

+ 1 - 1
iOSClient/Main/AppDelegate+Swift.swift

@@ -36,7 +36,7 @@ extension AppDelegate {
             viewController.navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor:NCBrandColor.sharedInstance.textView]
             viewController.navigationController?.navigationBar.largeTitleTextAttributes = [NSAttributedString.Key.foregroundColor:NCBrandColor.sharedInstance.textView]
         }
-        viewController.navigationController?.navigationBar.tintColor = NCBrandColor.sharedInstance.brand
+        viewController.navigationController?.navigationBar.tintColor = NCBrandColor.sharedInstance.brandElement
         viewController.navigationController?.navigationBar.setNeedsLayout()
     }
     

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -330,7 +330,7 @@
 
     [self.sortButton setTitleColor:NCBrandColor.sharedInstance.brandElement forState:UIControlStateNormal];
     // color searchbar
-    self.searchController.searchBar.tintColor = NCBrandColor.sharedInstance.brand;
+    self.searchController.searchBar.tintColor = NCBrandColor.sharedInstance.brandElement;
     // color searchbbar button text (cancel)
     UIButton *searchButton = self.searchController.searchBar.subviews.firstObject.subviews.lastObject;
     if (searchButton && [searchButton isKindOfClass:[UIButton class]]) {

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

@@ -380,7 +380,7 @@ import NCCommunication
     
     func getTemplate() {
      
-        indicator.color = NCBrandColor.sharedInstance.brand
+        indicator.color = NCBrandColor.sharedInstance.brandElement
         indicator.startAnimating()
         
         if self.editorId == k_editor_text || self.editorId == k_editor_onlyoffice {

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

@@ -139,7 +139,7 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
         row.title = NSLocalizedString("_quality_medium_", comment: "")
         row.cellConfig["backgroundColor"] = NCBrandColor.sharedInstance.backgroundForm
 
-        row.cellConfig["slider.minimumTrackTintColor"] = NCBrandColor.sharedInstance.brand
+        row.cellConfig["slider.minimumTrackTintColor"] = NCBrandColor.sharedInstance.brandElement
         
         row.cellConfig["slider.maximumValue"] = 1
         row.cellConfig["slider.minimumValue"] = 0
@@ -201,7 +201,7 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate, NC
         row.value = "PDF"
         row.cellConfig["backgroundColor"] = NCBrandColor.sharedInstance.backgroundForm
 
-        row.cellConfig["tintColor"] = NCBrandColor.sharedInstance.brand
+        row.cellConfig["tintColor"] = NCBrandColor.sharedInstance.brandElement
         row.cellConfig["textLabel.font"] = UIFont.systemFont(ofSize: 15.0)
         row.cellConfig["textLabel.textColor"] = NCBrandColor.sharedInstance.textView
         

+ 1 - 1
iOSClient/Main/NCMasterNavigationController.swift

@@ -55,7 +55,7 @@ class NCMasterNavigationController: UINavigationController {
 
     @objc func changeTheming() {
         navigationBar.barTintColor = NCBrandColor.sharedInstance.backgroundView
-        navigationBar.tintColor = NCBrandColor.sharedInstance.brand
+        navigationBar.tintColor = NCBrandColor.sharedInstance.brandElement
     }
 }
 

+ 1 - 1
iOSClient/Main/NCPhotosPickerViewController.swift

@@ -49,7 +49,7 @@ class NCPhotosPickerViewController: NSObject {
         configure.tapHereToChange = NSLocalizedString("_tap_here_to_change_", comment: "")
         
         configure.maxSelectedAssets = self.maxSelectedAssets
-        configure.selectedColor = NCBrandColor.sharedInstance.brand
+        configure.selectedColor = NCBrandColor.sharedInstance.brandElement
         configure.singleSelectedMode = singleSelectedMode
         
         let viewController = customPhotoPickerViewController(withTLPHAssets: { (assets) in

+ 2 - 2
iOSClient/Offline/NCOffline.swift

@@ -86,7 +86,7 @@ class NCOffline: UIViewController, UIGestureRecognizerDelegate, NCListCellDelega
         
         // 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
@@ -257,7 +257,7 @@ class NCOffline: UIViewController, UIGestureRecognizerDelegate, NCListCellDelega
         menuView?.delegate = self
         menuView?.rowHeight = 45
         menuView?.sectionHeaderHeight = 0.3
-        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/ScanDocument/ScanCollectionView.swift

@@ -79,7 +79,7 @@ class DragDropViewController: UIViewController {
         segmentControlFilter.setTitle(NSLocalizedString("_filter_bn_", comment: ""), forSegmentAt: 2)
 
         add.setImage(CCGraphics.changeThemingColorImage(UIImage(named: "add"), multiplier:2, color: NCBrandColor.sharedInstance.brandElement), for: .normal)
-        transferDown.setImage(CCGraphics.changeThemingColorImage(UIImage(named: "transferDown"), multiplier:2, color: NCBrandColor.sharedInstance.brand), for: .normal)
+        transferDown.setImage(CCGraphics.changeThemingColorImage(UIImage(named: "transferDown"), multiplier:2, color: NCBrandColor.sharedInstance.brandElement), for: .normal)
         
         let longPressRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(handleLongPressGesture(recognizer:)))
         add.addGestureRecognizer(longPressRecognizer)

+ 5 - 5
iOSClient/Share/NCShareUserMenuView.swift

@@ -73,15 +73,15 @@ class NCShareUserMenuView: UIView, UIGestureRecognizerDelegate, NCShareNetworkin
         layer.shadowOpacity = 0.2
         
         switchCanReshare.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
-        switchCanReshare.onTintColor = NCBrandColor.sharedInstance.brand
+        switchCanReshare.onTintColor = NCBrandColor.sharedInstance.brandElement
         switchCanCreate?.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
-        switchCanCreate?.onTintColor = NCBrandColor.sharedInstance.brand
+        switchCanCreate?.onTintColor = NCBrandColor.sharedInstance.brandElement
         switchCanChange?.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
-        switchCanChange?.onTintColor = NCBrandColor.sharedInstance.brand
+        switchCanChange?.onTintColor = NCBrandColor.sharedInstance.brandElement
         switchCanDelete?.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
-        switchCanDelete?.onTintColor = NCBrandColor.sharedInstance.brand
+        switchCanDelete?.onTintColor = NCBrandColor.sharedInstance.brandElement
         switchSetExpirationDate.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
-        switchSetExpirationDate.onTintColor = NCBrandColor.sharedInstance.brand
+        switchSetExpirationDate.onTintColor = NCBrandColor.sharedInstance.brandElement
         
         labelCanReshare?.text = NSLocalizedString("_share_can_reshare_", comment: "")
         labelCanReshare?.textColor = NCBrandColor.sharedInstance.textView

+ 1 - 1
iOSClient/Utility/NCContentPresenter.swift

@@ -200,7 +200,7 @@ class NCContentPresenter: NSObject {
     private func getBackgroundColorFromType(_ type: messageType) -> UIColor {
         switch type {
         case .info:
-            return NCBrandColor.sharedInstance.brand
+            return NCBrandColor.sharedInstance.brandElement
         case .error:
             return UIColor(red: 1, green: 0, blue: 0, alpha: 0.9)
         case .success:

+ 1 - 1
iOSClient/Viewer/NCViewerImage/NCViewerImageContentView.swift

@@ -109,7 +109,7 @@ public class NCViewerImageContentView: UIScrollView {
 
     private lazy var indicatorContainer: UIView = {
         let container = UIView()
-        container.backgroundColor = NCBrandColor.sharedInstance.brand
+        container.backgroundColor = NCBrandColor.sharedInstance.brandElement
         container.layer.cornerRadius = Constants.indicatorViewSize * 0.5
         container.layer.masksToBounds = true
         return container