marinofaggiana před 5 roky
rodič
revize
66a1f53c5e

+ 3 - 1
iOSClient/Brand/NCBrand.swift

@@ -42,7 +42,7 @@ class NCBrandColor: NSObject {
     @objc public var encrypted:             UIColor = .red
     @objc public var backgroundView:        UIColor = .white
     @objc public var textView:              UIColor = .black
-    @objc public var seperator:             UIColor = UIColor(red: 235.0/255.0, green: 235.0/255.0, blue: 235.0/255.0, alpha: 1.0)
+    @objc public var separator:             UIColor = UIColor(red: 235.0/255.0, green: 235.0/255.0, blue: 235.0/255.0, alpha: 1.0)
     @objc public var tabBar:                UIColor = .white
     @objc public let nextcloud:             UIColor = UIColor(red: 0.0/255.0, green: 130.0/255.0, blue: 201.0/255.0, alpha: 1.0)
     @objc public let nextcloudSoft:         UIColor = UIColor(red: 90.0/255.0, green: 160.0/255.0, blue: 210.0/255.0, alpha: 1.0)
@@ -62,10 +62,12 @@ class NCBrandColor: NSObject {
             tabBar = .black
             backgroundView = .black
             textView = .white
+            separator = UIColor(red: 60.0/255.0, green: 60.0/255.0, blue: 60.0/255.0, alpha: 1.0)
         } else {
             tabBar = .white
             backgroundView = .white
             textView = .black
+            separator = UIColor(red: 235.0/255.0, green: 235.0/255.0, blue: 235.0/255.0, alpha: 1.0)
         }
     }
     

+ 2 - 2
iOSClient/Favorites/CCFavorites.m

@@ -73,7 +73,6 @@
     self.metadata = [tableMetadata new];
     
     self.tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.tableView.frame.size.width, 1)];
-    self.tableView.separatorColor = [NCBrandColor sharedInstance].seperator;
     self.tableView.emptyDataSetDelegate = self;
     self.tableView.emptyDataSetSource = self;
     self.tableView.delegate = self;
@@ -106,6 +105,7 @@
     [appDelegate aspectNavigationControllerBar:self.navigationController.navigationBar online:[appDelegate.reachability isReachable] hidden:NO];
     [appDelegate aspectTabBar:self.tabBarController.tabBar hidden:NO];
     self.tableView.backgroundColor = [NCBrandColor sharedInstance].backgroundView;
+    self.tableView.separatorColor = [NCBrandColor sharedInstance].separator;
     
     // Plus Button
     [appDelegate plusButtonVisibile:true];
@@ -460,7 +460,7 @@
     actionSheet.cancelButtonTextAttributes = @{ NSFontAttributeName:[UIFont boldSystemFontOfSize:17], NSForegroundColorAttributeName:[UIColor blackColor] };
     actionSheet.disableButtonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:[UIColor darkGrayColor] };
     
-    actionSheet.separatorColor = [NCBrandColor sharedInstance].seperator;
+    actionSheet.separatorColor = [NCBrandColor sharedInstance].separator;
     actionSheet.cancelButtonTitle = NSLocalizedString(@"_cancel_",nil);
     
     // assegnamo l'immagine anteprima se esiste, altrimenti metti quella standars

+ 5 - 5
iOSClient/Main/CCMain.m

@@ -126,7 +126,6 @@
     // delegate
     self.tableView.delegate = self;
     self.tableView.tableFooterView = [UIView new];
-    self.tableView.separatorColor = [NCBrandColor sharedInstance].seperator;
     self.tableView.emptyDataSetDelegate = self;
     self.tableView.emptyDataSetSource = self;
     self.searchController.delegate = self;
@@ -174,7 +173,8 @@
     [appDelegate aspectNavigationControllerBar:self.navigationController.navigationBar online:[appDelegate.reachability isReachable] hidden:NO];
     [appDelegate aspectTabBar:self.tabBarController.tabBar hidden:NO];
     self.tableView.backgroundColor = [NCBrandColor sharedInstance].backgroundView;
-    
+    self.tableView.separatorColor = [NCBrandColor sharedInstance].separator;
+
     // Plus Button
     [appDelegate plusButtonVisibile:true];
 
@@ -2253,7 +2253,7 @@
     appDelegate.reMainMenu.waitUntilAnimationIsComplete = NO;
     
     appDelegate.reMainMenu.separatorHeight = 0.5;
-    appDelegate.reMainMenu.separatorColor = [NCBrandColor sharedInstance].seperator;
+    appDelegate.reMainMenu.separatorColor = [NCBrandColor sharedInstance].separator;
     
     appDelegate.reMainMenu.backgroundColor = [NCBrandColor sharedInstance].backgroundView;
     appDelegate.reMainMenu.textColor = [UIColor blackColor];
@@ -2370,7 +2370,7 @@
     appDelegate.reSelectMenu.waitUntilAnimationIsComplete = NO;
     
     appDelegate.reSelectMenu.separatorHeight = 0.5;
-    appDelegate.reSelectMenu.separatorColor = [NCBrandColor sharedInstance].seperator;
+    appDelegate.reSelectMenu.separatorColor = [NCBrandColor sharedInstance].separator;
     
     appDelegate.reSelectMenu.backgroundColor = [NCBrandColor sharedInstance].backgroundView;
     appDelegate.reSelectMenu.textColor = [UIColor blackColor];
@@ -2980,7 +2980,7 @@
     actionSheet.cancelButtonTextAttributes = @{ NSFontAttributeName:[UIFont boldSystemFontOfSize:17], NSForegroundColorAttributeName:[NCBrandColor sharedInstance].textView };
     actionSheet.disableButtonTextAttributes = @{ NSFontAttributeName:[UIFont systemFontOfSize:16], NSForegroundColorAttributeName:[NCBrandColor sharedInstance].textView };
     
-    actionSheet.separatorColor = [NCBrandColor sharedInstance].seperator;
+    actionSheet.separatorColor = [NCBrandColor sharedInstance].separator;
     actionSheet.cancelButtonTitle = NSLocalizedString(@"_cancel_",nil);
     
     // ******************************************* DIRECTORY *******************************************

+ 1 - 2
iOSClient/Main/CCMore.swift

@@ -58,8 +58,6 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLo
         tableView.delegate = self
         tableView.dataSource = self
         
-        tableView.separatorColor = NCBrandColor.sharedInstance.seperator
-        
         if #available(iOS 11, *) {
             //tableView.contentInsetAdjustmentBehavior = .never
         }
@@ -190,6 +188,7 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource, CCLo
         changeTheming()
         tableView.backgroundColor = NCBrandColor.sharedInstance.backgroundView;
         viewQuota.backgroundColor = NCBrandColor.sharedInstance.backgroundView;
+        tableView.separatorColor = NCBrandColor.sharedInstance.separator
 
         // Title
         self.navigationItem.title = NSLocalizedString("_more_", comment: "")

+ 2 - 2
iOSClient/Main/Cell/CCCellMain.xib

@@ -14,7 +14,7 @@
         <tableViewCell contentMode="scaleToFill" selectionStyle="blue" indentationWidth="0.0" reuseIdentifier="CellMain" id="2" customClass="CCCellMain">
             <rect key="frame" x="0.0" y="0.0" width="600" height="60"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
-            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2" id="sQq-jC-UEV">
+            <tableViewCellContentView key="contentView" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2" id="sQq-jC-UEV">
                 <rect key="frame" x="0.0" y="0.0" width="600" height="59.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
@@ -89,7 +89,6 @@
                         </constraints>
                     </imageView>
                 </subviews>
-                <color key="tintColor" red="1" green="0.5" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 <constraints>
                     <constraint firstItem="aRp-Ql-cyA" firstAttribute="leading" secondItem="HRe-1g-6Q1" secondAttribute="trailing" id="17F-cr-JRN"/>
                     <constraint firstItem="Gci-mp-QNh" firstAttribute="centerY" secondItem="sQq-jC-UEV" secondAttribute="centerY" id="1DB-lM-7dD"/>
@@ -115,6 +114,7 @@
                     <constraint firstAttribute="trailing" secondItem="aRp-Ql-cyA" secondAttribute="trailing" id="o1F-h3-kBd"/>
                 </constraints>
             </tableViewCellContentView>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <gestureRecognizers/>
             <connections>
                 <outlet property="comment" destination="Gci-mp-QNh" id="l6k-8K-UB7"/>

+ 3 - 2
iOSClient/Main/Cell/CCCellMainTransfer.xib

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -95,6 +95,7 @@
                     <constraint firstAttribute="bottom" secondItem="p7I-KN-FVZ" secondAttribute="bottom" constant="13.5" id="ofO-Ef-6wt"/>
                 </constraints>
             </tableViewCellContentView>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
                 <outlet property="file" destination="5" id="h6v-aL-JbR"/>
                 <outlet property="labelInfoFile" destination="p7I-KN-FVZ" id="bIH-yL-aSv"/>

+ 1 - 1
iOSClient/Main/Cell/NCListCell.swift

@@ -56,7 +56,7 @@ class NCListCell: UICollectionViewCell {
        
         imageMore.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "more"), multiplier: 2, color: NCBrandColor.sharedInstance.optionItem)
 
-        separator.backgroundColor = NCBrandColor.sharedInstance.seperator
+        separator.backgroundColor = NCBrandColor.sharedInstance.separator
     }
     
     @IBAction func touchUpInsideShare(_ sender: Any) {

+ 1 - 1
iOSClient/Main/Section/NCSectionHeaderFooter.swift

@@ -48,7 +48,7 @@ class NCSectionHeaderMenu: UICollectionReusableView {
         
         viewLabelSection.backgroundColor = NCBrandColor.sharedInstance.brand.withAlphaComponent(0.1)
         
-        separator.backgroundColor = NCBrandColor.sharedInstance.seperator
+        separator.backgroundColor = NCBrandColor.sharedInstance.separator
         self.backgroundColor = NCBrandColor.sharedInstance.backgroundView
     }
     

+ 1 - 1
iOSClient/Move/CCMove.m

@@ -102,7 +102,7 @@
     
     // TableView : at the end of rows nothing
     self.tableView.tableFooterView = [UIView new];
-    self.tableView.separatorColor =  NCBrandColor.sharedInstance.seperator;
+    self.tableView.separatorColor =  NCBrandColor.sharedInstance.separator;
     self.tableView.emptyDataSetDelegate = self;
     self.tableView.emptyDataSetSource = self;
 

+ 1 - 1
iOSClient/Notification/CCNotification.swift

@@ -39,7 +39,7 @@ class CCNotification: UITableViewController, CCNotificationCelllDelegate {
 
         self.navigationItem.setRightBarButton(UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(viewClose)), animated: true)
         
-        self.tableView.separatorColor = NCBrandColor.sharedInstance.seperator
+        self.tableView.separatorColor = NCBrandColor.sharedInstance.separator
         self.tableView.tableFooterView = UIView()
         self.tableView.rowHeight = UITableView.automaticDimension
         self.tableView.estimatedRowHeight = 50.0

+ 1 - 1
iOSClient/Shares/NCShares.m

@@ -62,7 +62,6 @@
     _dataSource = [NSMutableArray new];
     
     self.tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.tableView.frame.size.width, 1)];
-    self.tableView.separatorColor = [NCBrandColor sharedInstance].seperator;
     self.tableView.emptyDataSetDelegate = self;
     self.tableView.emptyDataSetSource = self;
     self.tableView.delegate = self;
@@ -85,6 +84,7 @@
     [appDelegate aspectNavigationControllerBar:self.navigationController.navigationBar online:[appDelegate.reachability isReachable] hidden:NO];
     [appDelegate aspectTabBar:self.tabBarController.tabBar hidden:NO];
     self.tableView.backgroundColor = [NCBrandColor sharedInstance].backgroundView;
+    self.tableView.separatorColor = [NCBrandColor sharedInstance].separator;
 
     // Plus Button
     [appDelegate plusButtonVisibile:true];

+ 1 - 1
iOSClient/Trash/Cell/NCTrashListCell.swift

@@ -52,7 +52,7 @@ class NCTrashListCell: UICollectionViewCell {
         imageRestore.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "restore"), multiplier: 2, color: NCBrandColor.sharedInstance.optionItem)
         imageMore.image = CCGraphics.changeThemingColorImage(UIImage.init(named: "more"), multiplier: 2, color: NCBrandColor.sharedInstance.optionItem)
         
-        separator.backgroundColor = NCBrandColor.sharedInstance.seperator
+        separator.backgroundColor = NCBrandColor.sharedInstance.separator
     }
     
     @IBAction func touchUpInsideMore(_ sender: Any) {

+ 1 - 1
iOSClient/Trash/Section/NCTrashSectionHeaderFooter.swift

@@ -53,7 +53,7 @@ class NCTrashSectionHeaderMenu: UICollectionReusableView {
         
         buttonMore.setImage(CCGraphics.changeThemingColorImage(UIImage.init(named: "more"), multiplier: 2, color: NCBrandColor.sharedInstance.icon), for: .normal)
         
-        separator.backgroundColor = NCBrandColor.sharedInstance.seperator
+        separator.backgroundColor = NCBrandColor.sharedInstance.separator
         backgroundColor = NCBrandColor.sharedInstance.backgroundView
     }