Marino Faggiana 8 سال پیش
والد
کامیت
41812188ce
4فایلهای تغییر یافته به همراه19 افزوده شده و 7 حذف شده
  1. 5 0
      iOSClient/CCConstant.swift
  2. 7 4
      iOSClient/Create/CCCreateCloud.swift
  3. 2 2
      iOSClient/Move/CCMove.m
  4. 5 1
      iOSClient/Notification/CCNotification.swift

+ 5 - 0
iOSClient/CCConstant.swift

@@ -35,6 +35,11 @@ class CCConstant: NSObject {
         
         static let k_Color_SelectBackgrond: UIColor = UIColor(red: 0.0/255.0, green: 130.0/255.0, blue: 201.0/255.0, alpha: 0.1)
         
+        static let k_Color_NavigationBar: UIColor = UIColor(red: 0.0/255.0, green: 130.0/255.0, blue: 201.0/255.0, alpha: 1.0)
+        
+        static let k_Color_NavigationBar_Text: UIColor = UIColor.white
+
+        
         // Response searchList
         
         static let kOrganizationFullName    = "FullName"

+ 7 - 4
iOSClient/Create/CCCreateCloud.swift

@@ -365,8 +365,11 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         self.navigationItem.leftBarButtonItem = cancelButton
         self.navigationItem.rightBarButtonItem = saveButton
         
+        self.navigationController?.navigationBar.barTintColor = CCConstant.GlobalConstants.k_Color_NavigationBar
+        self.navigationController?.navigationBar.tintColor = CCConstant.GlobalConstants.k_Color_NavigationBar_Text
+        self.navigationController?.navigationBar.titleTextAttributes = [NSForegroundColorAttributeName: CCConstant.GlobalConstants.k_Color_NavigationBar_Text]
+        
         self.tableView.separatorStyle = UITableViewCellSeparatorStyle.none
-        //self.tableView.separatorInset = UIEdgeInsetsMake(0, 0, 0, 0);
         
         self.reloadForm()
     }
@@ -509,9 +512,9 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         let viewController : CCMove = navigationController.topViewController as! CCMove
         
         viewController.delegate = self;
-        viewController.tintColor = UIColor.init(colorLiteralRed: 0.0/255.0, green: 130.0/255.0, blue: 201.0/255.0, alpha: 1.0) // COLOR_BRAND
-        viewController.barTintColor = UIColor.init(colorLiteralRed: 248.0/255.0, green: 248.0/255.0, blue: 248.0/255.0, alpha: 1.0) // COLOR_BAR;
-        viewController.tintColorTitle = UIColor.init(colorLiteralRed: 65.0/255.0, green: 64.0/255.0, blue: 66.0/255.0, alpha: 1.0) // COLOR_GRAY;
+        viewController.tintColor = CCConstant.GlobalConstants.k_Color_NavigationBar_Text
+        viewController.barTintColor = CCConstant.GlobalConstants.k_Color_NavigationBar
+        viewController.tintColorTitle = CCConstant.GlobalConstants.k_Color_NavigationBar_Text
         viewController.move.title = NSLocalizedString("_select_", comment: "");
         viewController.networkingOperationQueue =  appDelegate.netQueue
         

+ 2 - 2
iOSClient/Move/CCMove.m

@@ -110,8 +110,8 @@
     self.navigationController.navigationBar.barTintColor = self.barTintColor;
     self.navigationController.navigationBar.tintColor = self.tintColor;
     
-    self.navigationController.toolbar.barTintColor = self.barTintColor;
-    self.navigationController.toolbar.tintColor = self.tintColor;
+    self.navigationController.toolbar.barTintColor = COLOR_TABBAR;
+    self.navigationController.toolbar.tintColor = COLOR_TABBAR_TEXT;
     
     // read folder
     [self readFolder];

+ 5 - 1
iOSClient/Notification/CCNotification.swift

@@ -33,9 +33,13 @@ class CCNotification: UITableViewController, OCNetworkingDelegate {
         super.viewDidLoad()
         
         self.navigationController?.navigationBar.topItem?.title = NSLocalizedString("_notification_", comment: "")
+        self.navigationController?.navigationBar.barTintColor = CCConstant.GlobalConstants.k_Color_NavigationBar
+        self.navigationController?.navigationBar.tintColor = CCConstant.GlobalConstants.k_Color_NavigationBar_Text
+        self.navigationController?.navigationBar.titleTextAttributes = [NSForegroundColorAttributeName: CCConstant.GlobalConstants.k_Color_NavigationBar_Text]
+
         self.navigationItem.setRightBarButton(UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(viewClose)), animated: true)
         
-        self.tableView.separatorColor = UIColor(colorLiteralRed: 153.0/255.0, green: 153.0/255.0, blue: 153.0/255.0, alpha: 0.2)
+        self.tableView.separatorColor = CCConstant.GlobalConstants.k_Color_Seperator
         self.tableView.tableFooterView = UIView()
 
         // Register to receive notification reload data