dark mode

iOSClient/Activity/NCActivity.storyboard

@@ -20,7 +20,7 @@
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="20" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="X49-xg-JXO">
                                 <rect key="frame" x="0.0" y="44" width="375" height="734"/>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="tableCell" rowHeight="120" id="ggj-aE-fnh" customClass="activityTableViewCell" customModule="Nextcloud" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="20" width="375" height="120"/>
@@ -59,7 +59,7 @@
                                                 </imageView>
                                                 <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="KpO-no-BMl">
                                                     <rect key="frame" x="50" y="39.666666666666657" width="325" height="60"/>
-                                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="60" id="deQ-wc-jNT" userLabel="height = 60"/>
                                                     </constraints>
@@ -70,7 +70,7 @@
                                                         <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                                     </collectionViewFlowLayout>
                                                     <cells>
-                                                        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="collectionCell" id="uIN-z5-7vk" customClass="activityCollectionViewCell" customModule="Nextcloud" customModuleProvider="target">
+                                                        <collectionViewCell clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="collectionCell" id="uIN-z5-7vk" customClass="activityCollectionViewCell" customModule="Nextcloud" customModuleProvider="target">
                                                             <rect key="frame" x="0.0" y="5" width="50" height="50"/>
                                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO">
@@ -83,6 +83,7 @@
                                                                     </imageView>
                                                                 </subviews>
                                                             </view>
+                                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                             <connections>
                                                                 <outlet property="imageView" destination="J5b-2X-AsF" id="7dI-m8-o1E"/>
                                                             </connections>
@@ -90,6 +91,7 @@
                                                     </cells>
                                                 </collectionView>
                                             </subviews>
+                                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             <constraints>
                                                 <constraint firstAttribute="trailing" secondItem="fcO-YL-MuT" secondAttribute="trailing" constant="10" id="1pG-qk-inI"/>
                                                 <constraint firstItem="LQ8-cO-794" firstAttribute="top" secondItem="i35-U4-bEk" secondAttribute="top" id="3fU-rp-D7s"/>
@@ -122,7 +124,6 @@
                                 </connections>
                             </tableView>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="USa-eR-a1s" firstAttribute="trailing" secondItem="X49-xg-JXO" secondAttribute="trailing" id="5we-Fh-GVu"/>
                             <constraint firstItem="X49-xg-JXO" firstAttribute="top" secondItem="USa-eR-a1s" secondAttribute="top" id="SfR-9z-HeQ"/>

iOSClient/Activity/NCActivity.swift

@@ -58,7 +58,11 @@ class NCActivity: UIViewController, DZNEmptyDataSetSource, DZNEmptyDataSetDelega
         // Color
         appDelegate.aspectNavigationControllerBar(self.navigationController?.navigationBar, online: appDelegate.reachability.isReachable(), hidden: false)
         appDelegate.aspectTabBar(self.tabBarController?.tabBar, hidden: false)
-        tableView.backgroundColor = NCBrandColor.sharedInstance.backgroundView
+        if filterFileId == nil {
+            tableView.backgroundColor = NCBrandColor.sharedInstance.backgroundView
+        } else {
+            tableView.backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        }
         
         self.title = NSLocalizedString("_activity_", comment: "")
     }
@@ -81,7 +85,11 @@ class NCActivity: UIViewController, DZNEmptyDataSetSource, DZNEmptyDataSetDelega
     }
     
     func backgroundColor(forEmptyDataSet scrollView: UIScrollView) -> UIColor? {
-        return NCBrandColor.sharedInstance.backgroundView
+        if filterFileId == nil {
+            return NCBrandColor.sharedInstance.backgroundView
+        } else {
+            return NCBrandColor.sharedInstance.backgroundForm
+        }
     }
     
     func image(forEmptyDataSet scrollView: UIScrollView) -> UIImage? {
@@ -121,7 +129,6 @@ class activityTableViewCell: UITableViewCell {
         
         collectionView.delegate = self
         collectionView.dataSource = self
-        collectionView.backgroundColor = NCBrandColor.sharedInstance.backgroundView
     }
 }
 
@@ -144,7 +151,11 @@ extension NCActivity: UITableViewDelegate {
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         
         let view = UIView(frame: CGRect(x: 0, y: 0, width: tableView.bounds.width, height: 60))
-        view.backgroundColor = NCBrandColor.sharedInstance.backgroundView
+        if filterFileId == nil {
+            view.backgroundColor = NCBrandColor.sharedInstance.backgroundView
+        } else {
+            view.backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        }
         
         let label = UILabel()
         label.font = UIFont.boldSystemFont(ofSize: 16)
@@ -189,6 +200,13 @@ extension NCActivity: UITableViewDataSource {
             cell.didSelectItemEnable = self.didSelectItemEnable
             cell.subject.textColor = NCBrandColor.sharedInstance.textView
             
+            /*
+            if filterFileId == nil {
+                cell.backgroundColor = NCBrandColor.sharedInstance.backgroundView
+            } else {
+                cell.backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+            }
+            */
             // icon
             if activity.icon.count > 0 {
                 

iOSClient/Main/NCMainCommon.swift

@@ -66,9 +66,9 @@ class NCMainCommon: NSObject, PhotoEditorDelegate, NCAudioRecorderViewController
     }
     
     @objc func createImagesThemingColor() {
-        NCMainCommonImages.cellSharedImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 100, height: 100, color: .black)
+        NCMainCommonImages.cellSharedImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 100, height: 100, color: NCBrandColor.sharedInstance.textView)
         NCMainCommonImages.cellCanShareImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "share"), width: 100, height: 100, color: NCBrandColor.sharedInstance.graySoft)
-        NCMainCommonImages.cellShareByLinkImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "sharebylink"), width: 100, height: 100, color: .black)
+        NCMainCommonImages.cellShareByLinkImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "sharebylink"), width: 100, height: 100, color: NCBrandColor.sharedInstance.textView)
         NCMainCommonImages.cellFavouriteImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "favorite"), width: 100, height: 100, color: NCBrandColor.sharedInstance.yellowFavorite)
         NCMainCommonImages.cellMoreImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "more"), width: 50, height: 50, color: NCBrandColor.sharedInstance.optionItem)
         NCMainCommonImages.cellCommentImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "comment"), width: 30, height: 30, color: NCBrandColor.sharedInstance.graySoft)

iOSClient/Settings/CCSettings.m

@@ -322,6 +322,7 @@
         [appDelegate aspectTabBar:self.tabBarController.tabBar hidden:NO];
         self.tableView.backgroundColor = [NCBrandColor sharedInstance].backgroundView;
         [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"changeTheming" object:nil];
+        [[NCMainCommon sharedInstance] createImagesThemingColor];
         [self initializeForm];
         [self reloadForm];
     }

iOSClient/Share/NCShare.storyboard

@@ -17,7 +17,6 @@
                     <view key="view" contentMode="scaleToFill" id="xka-e7-U7G">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <viewLayoutGuide key="safeArea" id="EQO-kT-aOm"/>
                     </view>
                     <navigationItem key="navigationItem" id="3f0-GZ-Z6m"/>
@@ -68,7 +67,7 @@
                                     </textField>
                                     <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="DFs-4t-iWX">
                                         <rect key="frame" x="5" y="100" width="404" height="508"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <color key="separatorColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </tableView>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="avatar" translatesAutoresizingMaskIntoConstraints="NO" id="Oca-tA-DgS" customClass="NCAvatar" customModule="Nextcloud" customModuleProvider="target">
@@ -93,7 +92,6 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstItem="DFs-4t-iWX" firstAttribute="top" secondItem="j5C-gO-XF8" secondAttribute="bottom" constant="10" id="2W4-MV-Q3t"/>
                                     <constraint firstItem="9sc-sV-YF1" firstAttribute="centerY" secondItem="Oca-tA-DgS" secondAttribute="centerY" id="IAl-P4-FDb"/>
@@ -110,7 +108,6 @@
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="jzJ-Ra-l4b" firstAttribute="leading" secondItem="j3W-IW-lzW" secondAttribute="leading" id="B4V-GC-zYM"/>
                             <constraint firstItem="j3W-IW-lzW" firstAttribute="trailing" secondItem="jzJ-Ra-l4b" secondAttribute="trailing" constant="5" id="WPr-LS-NPk"/>
@@ -156,7 +153,7 @@
                                     </textField>
                                     <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="c94-b9-Sim">
                                         <rect key="frame" x="0.0" y="163" width="404" height="445"/>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     </tableView>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="8Cj-cK-AKZ">
                                         <rect key="frame" x="5" y="109" width="40" height="40"/>
@@ -218,7 +215,6 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                         </subviews>
-                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstItem="ngi-GT-jvv" firstAttribute="centerY" secondItem="oBQ-TP-qof" secondAttribute="centerY" id="2Xz-A8-l0g"/>
                                             <constraint firstAttribute="trailing" secondItem="ngi-GT-jvv" secondAttribute="trailing" constant="10" id="Gsg-bh-cgu"/>
@@ -229,7 +225,6 @@
                                         </constraints>
                                     </view>
                                 </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstItem="oBQ-TP-qof" firstAttribute="top" secondItem="X2m-IC-J1u" secondAttribute="top" constant="10" id="09Y-bm-RvQ"/>
                                     <constraint firstAttribute="trailing" secondItem="c94-b9-Sim" secondAttribute="trailing" id="BtN-cJ-TTc"/>
@@ -252,7 +247,6 @@
                                 </constraints>
                             </view>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="eAi-wv-a4Y" firstAttribute="bottom" secondItem="X2m-IC-J1u" secondAttribute="bottom" constant="10" id="Gvn-eF-b0b"/>
                             <constraint firstItem="X2m-IC-J1u" firstAttribute="leading" secondItem="eAi-wv-a4Y" secondAttribute="leading" constant="5" id="Ufw-7y-DMv"/>

iOSClient/Share/NCShare.swift

@@ -58,13 +58,15 @@ class NCShare: UIViewController, UIGestureRecognizerDelegate, NCShareLinkCellDel
         searchField.placeholder = NSLocalizedString("_shareLinksearch_placeholder_", comment: "")
         
         shareLinkLabel.text = NSLocalizedString("_share_link_", comment: "")
+        shareLinkLabel.textColor = NCBrandColor.sharedInstance.textView
         shareLinkImage.image = NCShareCommon.sharedInstance.createLinkAvatar()
         buttonCopy.setImage(CCGraphics.changeThemingColorImage(UIImage.init(named: "shareCopy"), width: 100, height: 100, color: UIColor.gray), for: .normal)
 
         tableView.dataSource = self
         tableView.delegate = self
         tableView.allowsSelection = false
-        
+        tableView.backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+
         tableView.register(UINib.init(nibName: "NCShareLinkCell", bundle: nil), forCellReuseIdentifier: "cellLink")
         tableView.register(UINib.init(nibName: "NCShareUserCell", bundle: nil), forCellReuseIdentifier: "cellUser")
         
@@ -326,6 +328,8 @@ extension NCShare: UITableViewDataSource {
             if let cell = tableView.dequeueReusableCell(withIdentifier: "cellLink", for: indexPath) as? NCShareLinkCell {
                 cell.tableShare = tableShare
                 cell.delegate = self
+                cell.labelTitle.text = NSLocalizedString("_share_link_", comment: "")
+                cell.labelTitle.textColor = NCBrandColor.sharedInstance.textView
                 return cell
             }
         } else {
@@ -335,6 +339,9 @@ extension NCShare: UITableViewDataSource {
                 cell.tableShare = tableShare
                 cell.delegate = self
                 cell.labelTitle.text = tableShare.shareWith
+                cell.labelTitle.textColor = NCBrandColor.sharedInstance.textView
+                cell.labelCanEdit.text = NSLocalizedString("_share_permission_edit_", comment: "")
+                cell.labelCanEdit.textColor = NCBrandColor.sharedInstance.textView
                 cell.isUserInteractionEnabled = true
                 cell.switchCanEdit.isHidden = false
                 cell.labelCanEdit.isHidden = false
@@ -400,7 +407,6 @@ class NCShareLinkCell: UITableViewCell {
         super.awakeFromNib()
         
         imageItem.image = NCShareCommon.sharedInstance.createLinkAvatar()
-        labelTitle.text = NSLocalizedString("_share_link_", comment: "")
         buttonCopy.setImage(CCGraphics.changeThemingColorImage(UIImage.init(named: "shareCopy"), width:100, height: 100, color: UIColor.gray), for: .normal)
         buttonMenu.setImage(CCGraphics.changeThemingColorImage(UIImage.init(named: "shareMenu"), width:100, height: 100, color: UIColor.gray), for: .normal)
     }
@@ -437,7 +443,6 @@ class NCShareUserCell: UITableViewCell {
         
         switchCanEdit.transform = CGAffineTransform(scaleX: 0.75, y: 0.75)
         switchCanEdit.onTintColor = NCBrandColor.sharedInstance.brand
-        labelCanEdit.text = NSLocalizedString("_share_permission_edit_", comment: "")
         buttonMenu.setImage(CCGraphics.changeThemingColorImage(UIImage.init(named: "shareMenu"), width:100, height: 100, color: UIColor.gray), for: .normal)
     }
     

iOSClient/Share/NCShareComments.swift

@@ -49,7 +49,9 @@ class NCShareComments: UIViewController, NCShareCommentsCellDelegate {
         tableView.rowHeight = UITableView.automaticDimension
         tableView.estimatedRowHeight = tableView.bounds.height
         tableView.allowsSelection = false
-
+        tableView.backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        tableView.separatorColor = NCBrandColor.sharedInstance.separator
+        
         tableView.register(UINib.init(nibName: "NCShareCommentsCell", bundle: nil), forCellReuseIdentifier: "cell")
 
         newCommentField.placeholder = NSLocalizedString("_new_comment_", comment: "")
@@ -65,6 +67,7 @@ class NCShareComments: UIViewController, NCShareCommentsCellDelegate {
         else{
             labelUser.text = tabAccount.displayName
         }
+        labelUser.textColor = NCBrandColor.sharedInstance.textView
         
         let fileNameLocalPath = CCUtility.getDirectoryUserData() + "/" + CCUtility.getStringUser(appDelegate.activeUser, activeUrl: appDelegate.activeUrl) + "-" + appDelegate.activeUser + ".png"
         if FileManager.default.fileExists(atPath: fileNameLocalPath) {
@@ -244,10 +247,13 @@ extension NCShareComments: UITableViewDataSource {
             }
             // Username
             cell.labelUser.text = tableComments.actorDisplayName
+            cell.labelUser.textColor = NCBrandColor.sharedInstance.textView
             // Date
             cell.labelDate.text = CCUtility.dateDiff(tableComments.creationDateTime as Date)
+            cell.labelDate.textColor = NCBrandColor.sharedInstance.graySoft
             // Message
             cell.labelMessage.text = tableComments.message
+            cell.labelMessage.textColor = NCBrandColor.sharedInstance.textView
             // Button Menu
             if tableComments.actorId == appDelegate.activeUserID {
                 cell.buttonMenu.isHidden = false

iOSClient/Share/NCShareCommentsCell.xib

@@ -88,6 +88,7 @@
                     <constraint firstItem="J1z-RG-U4A" firstAttribute="centerY" secondItem="qDs-UG-Mn7" secondAttribute="centerY" id="tIg-bm-Clb"/>
                 </constraints>
             </tableViewCellContentView>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
                 <outlet property="buttonMenu" destination="J1z-RG-U4A" id="eJS-IZ-VYk"/>
                 <outlet property="imageItem" destination="qDs-UG-Mn7" id="wqC-I1-MWx"/>

iOSClient/Share/NCShareCommon.swift

@@ -73,6 +73,7 @@ class NCShareCommon: NSObject {
             shareLinkMenuView.height = 440
         }
         
+        shareLinkMenuView.backgroundColor = NCBrandColor.sharedInstance.backgroundForm
         shareLinkMenuView.metadata = metadata
         shareLinkMenuView.viewWindow = viewWindow
         shareLinkMenuView.shareViewController = shareViewController
@@ -118,6 +119,7 @@ class NCShareCommon: NSObject {
             shareUserMenuView.height = 260
         }
         
+        shareUserMenuView.backgroundColor = NCBrandColor.sharedInstance.backgroundForm
         shareUserMenuView.metadata = metadata
         shareUserMenuView.viewWindow = viewWindow
         shareUserMenuView.shareViewController = shareViewController

iOSClient/Share/NCShareHeaderView.xib

@@ -42,7 +42,6 @@
                     </connections>
                 </button>
             </subviews>
-            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="79H-PA-1m2" secondAttribute="trailing" id="7ui-gc-9Vz"/>
                 <constraint firstItem="EaW-fI-EmD" firstAttribute="top" secondItem="n1G-pn-D8s" secondAttribute="bottom" constant="4" id="8Jc-BA-mYt"/>

iOSClient/Share/NCShareLinkCell.xib

@@ -69,6 +69,7 @@
                     <constraint firstAttribute="trailing" secondItem="J1z-RG-U4A" secondAttribute="trailing" constant="10" id="pQA-B9-MM5"/>
                 </constraints>
             </tableViewCellContentView>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
                 <outlet property="buttonCopy" destination="xaz-vY-Jzu" id="WVv-oI-jD8"/>
                 <outlet property="buttonMenu" destination="J1z-RG-U4A" id="L2V-Ev-Cx0"/>

iOSClient/Share/NCShareLinkFolderMenuView.xib

@@ -205,7 +205,6 @@
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
-            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Ff4-JE-zGU" firstAttribute="centerY" secondItem="hr8-Qe-xD0" secondAttribute="centerY" id="0WP-PE-HTp"/>
                 <constraint firstItem="IHP-P8-rm2" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="70" id="2RV-rL-sYG"/>

iOSClient/Share/NCShareLinkMenuView.swift

@@ -99,15 +99,25 @@ class NCShareLinkMenuView: UIView, UIGestureRecognizerDelegate, NCShareNetworkin
         switchSetExpirationDate.onTintColor = NCBrandColor.sharedInstance.brand
         
         labelAllowEditing?.text = NSLocalizedString("_share_allow_editing_", comment: "")
+        labelAllowEditing?.textColor = NCBrandColor.sharedInstance.textView
         labelReadOnly?.text = NSLocalizedString("_share_read_only_", comment: "")
+        labelReadOnly?.textColor = NCBrandColor.sharedInstance.textView
         labelAllowUploadAndEditing?.text = NSLocalizedString("_share_allow_upload_", comment: "")
+        labelAllowUploadAndEditing?.textColor = NCBrandColor.sharedInstance.textView
         labelFileDrop?.text = NSLocalizedString("_share_file_drop_", comment: "")
+        labelFileDrop?.textColor = NCBrandColor.sharedInstance.textView
         labelHideDownload?.text = NSLocalizedString("_share_hide_download_", comment: "")
+        labelHideDownload?.textColor = NCBrandColor.sharedInstance.textView
         labelPasswordProtect?.text = NSLocalizedString("_share_password_protect_", comment: "")
+        labelPasswordProtect?.textColor = NCBrandColor.sharedInstance.textView
         labelSetExpirationDate?.text = NSLocalizedString("_share_expiration_date_", comment: "")
+        labelSetExpirationDate?.textColor = NCBrandColor.sharedInstance.textView
         labelNoteToRecipient?.text = NSLocalizedString("_share_note_recipient_", comment: "")
+        labelNoteToRecipient?.textColor = NCBrandColor.sharedInstance.textView
         labelDeleteShareLink?.text = NSLocalizedString("_share_delete_sharelink_", comment: "")
+        labelDeleteShareLink?.textColor = NCBrandColor.sharedInstance.textView
         labelAddAnotherLink?.text = NSLocalizedString("_share_add_sharelink_", comment: "")
+        labelAddAnotherLink?.textColor = NCBrandColor.sharedInstance.textView
         
         fieldSetExpirationDate.inputView = UIView()
         

iOSClient/Share/NCShareLinkMenuView.xib

@@ -175,7 +175,6 @@
                     </connections>
                 </button>
             </subviews>
-            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Ff4-JE-zGU" firstAttribute="centerY" secondItem="hr8-Qe-xD0" secondAttribute="centerY" id="0WP-PE-HTp"/>
                 <constraint firstItem="IHP-P8-rm2" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="70" id="2RV-rL-sYG"/>

iOSClient/Share/NCSharePaging.swift

@@ -36,12 +36,14 @@ class NCSharePaging: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        self.view.backgroundColor = NCBrandColor.sharedInstance.backgroundForm
         pagingViewController.metadata = metadata
         
         // Navigation Controller
         var image = CCGraphics.changeThemingColorImage(UIImage(named: "exit")!, width: 40, height: 40, color: UIColor.gray)
         image = image?.withRenderingMode(.alwaysOriginal)
         self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: image, style:.plain, target: self, action: #selector(exitTapped))
+        self.navigationController?.navigationBar.barTintColor = NCBrandColor.sharedInstance.backgroundForm
         
         // Pagination
         addChild(pagingViewController)
@@ -49,7 +51,10 @@ class NCSharePaging: UIViewController {
         pagingViewController.didMove(toParent: self)
         
         // Customization
-        pagingViewController.selectedTextColor = .black
+        pagingViewController.backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        pagingViewController.selectedBackgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        pagingViewController.textColor = NCBrandColor.sharedInstance.textView
+        pagingViewController.selectedTextColor = NCBrandColor.sharedInstance.textView
         pagingViewController.indicatorColor = .black
         pagingViewController.indicatorOptions = .visible(
             height: 0.5,
@@ -65,7 +70,7 @@ class NCSharePaging: UIViewController {
             pagingViewController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
             pagingViewController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
             pagingViewController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-            ])
+        ])
         
         pagingViewController.dataSource = self        
         pagingViewController.select(index: indexPage)
@@ -172,6 +177,7 @@ class NCSharePagingView: PagingView {
     override func setupConstraints() {
         
         let headerView = Bundle.main.loadNibNamed("NCShareHeaderView", owner: self, options: nil)?.first as! NCShareHeaderView
+        headerView.backgroundColor = NCBrandColor.sharedInstance.backgroundForm
         headerView.ocId = metadata!.ocId
         
         if FileManager.default.fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadata!.ocId, fileNameView: metadata!.fileNameView)) {
@@ -187,6 +193,7 @@ class NCSharePagingView: PagingView {
             }
         }
         headerView.fileName.text = metadata?.fileNameView
+        headerView.fileName.textColor = NCBrandColor.sharedInstance.textView
         if metadata!.favorite {
             headerView.favorite.setImage(CCGraphics.changeThemingColorImage(UIImage.init(named: "favorite"), width: 40, height: 40, color: NCBrandColor.sharedInstance.yellowFavorite), for: .normal)
         } else {
@@ -218,7 +225,7 @@ class NCSharePagingView: PagingView {
             pageView.trailingAnchor.constraint(equalTo: trailingAnchor),
             pageView.bottomAnchor.constraint(equalTo: bottomAnchor),
             pageView.topAnchor.constraint(equalTo: topAnchor)
-            ])
+        ])
     }
 }
 

iOSClient/Share/NCShareUserCell.xib

@@ -88,6 +88,7 @@
                     <constraint firstAttribute="trailing" secondItem="J1z-RG-U4A" secondAttribute="trailing" constant="10" id="pQA-B9-MM5"/>
                 </constraints>
             </tableViewCellContentView>
+            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <connections>
                 <outlet property="buttonMenu" destination="J1z-RG-U4A" id="g71-Us-VMl"/>
                 <outlet property="imageItem" destination="qDs-UG-Mn7" id="cRP-ne-dd0"/>

iOSClient/Share/NCShareUserFolderMenuView.xib

@@ -153,7 +153,6 @@
                     <nil key="highlightedColor"/>
                 </label>
             </subviews>
-            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Ff4-JE-zGU" firstAttribute="centerY" secondItem="hr8-Qe-xD0" secondAttribute="centerY" id="0WP-PE-HTp"/>
                 <constraint firstItem="YWL-Ks-51c" firstAttribute="leading" secondItem="0yc-df-C1f" secondAttribute="trailing" constant="11" id="18d-Lv-xE7"/>

iOSClient/Share/NCShareUserMenuView.swift

@@ -84,12 +84,19 @@ class NCShareUserMenuView: UIView, UIGestureRecognizerDelegate, NCShareNetworkin
         switchSetExpirationDate.onTintColor = NCBrandColor.sharedInstance.brand
         
         labelCanReshare?.text = NSLocalizedString("_share_can_reshare_", comment: "")
+        labelCanReshare?.textColor = NCBrandColor.sharedInstance.textView
         labelCanCreate?.text = NSLocalizedString("_share_can_create_", comment: "")
+        labelCanCreate?.textColor = NCBrandColor.sharedInstance.textView
         labelCanChange?.text = NSLocalizedString("_share_can_change_", comment: "")
+        labelCanChange?.textColor = NCBrandColor.sharedInstance.textView
         labelCanDelete?.text = NSLocalizedString("_share_can_delete_", comment: "")
+        labelCanDelete?.textColor = NCBrandColor.sharedInstance.textView
         labelSetExpirationDate?.text = NSLocalizedString("_share_expiration_date_", comment: "")
+        labelSetExpirationDate?.textColor = NCBrandColor.sharedInstance.textView
         labelNoteToRecipient?.text = NSLocalizedString("_share_note_recipient_", comment: "")
+        labelNoteToRecipient?.textColor = NCBrandColor.sharedInstance.textView
         labelUnshare?.text = NSLocalizedString("_share_unshare_", comment: "")
+        labelUnshare?.textColor = NCBrandColor.sharedInstance.textView
         
         fieldSetExpirationDate.inputView = UIView()
         

iOSClient/Share/NCShareUserMenuView.xib

@@ -108,7 +108,6 @@
                     </connections>
                 </button>
             </subviews>
-            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="Ff4-JE-zGU" firstAttribute="centerY" secondItem="hr8-Qe-xD0" secondAttribute="centerY" id="0WP-PE-HTp"/>
                 <constraint firstItem="IHP-P8-rm2" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="70" id="2RV-rL-sYG"/>