marinofaggiana 5 жил өмнө
parent
commit
104781d9a4

+ 0 - 1
iOSClient/Main/CCMain.m

@@ -3168,7 +3168,6 @@
                                         [self actionDelete:indexPath];
         }];
         
-
         [actionSheet show];
     }
     

+ 5 - 2
iOSClient/Media/NCMedia.swift

@@ -253,9 +253,12 @@ class NCMedia: UIViewController, DropdownMenuDelegate, DZNEmptyDataSetSource, DZ
         menu?.rowHeight = 45
         menu?.highlightColor = NCBrandColor.sharedInstance.brand
         menu?.tableView.alwaysBounceVertical = false
-        menu?.tableViewBackgroundColor = UIColor.white
+        menu?.tableViewSeperatorColor = NCBrandColor.sharedInstance.separator
         menu?.topOffsetY = menuView.bounds.height
-    
+        menu?.tableViewBackgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        menu?.cellBackgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        menu?.textColor = NCBrandColor.sharedInstance.textView
+        
         menu?.showMenu()
     }
     

+ 14 - 1
iOSClient/Offline/NCOffline.swift

@@ -295,7 +295,10 @@ class NCOffline: UIViewController, UIGestureRecognizerDelegate, NCListCellDelega
         menuView?.sectionHeaderHeight = 8
         menuView?.highlightColor = NCBrandColor.sharedInstance.brand
         menuView?.tableView.alwaysBounceVertical = false
-        menuView?.tableViewBackgroundColor = UIColor.white
+        menuView?.tableViewSeperatorColor = NCBrandColor.sharedInstance.separator
+        menuView?.tableViewBackgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        menuView?.cellBackgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        menuView?.textColor = NCBrandColor.sharedInstance.textView
         
         let header = (sender as? UIButton)?.superview
         let headerRect = self.collectionView.convert(header!.bounds, from: self.view)
@@ -363,6 +366,11 @@ class NCOffline: UIViewController, UIGestureRecognizerDelegate, NCListCellDelega
             actionSheet?.headerView = headerView
             actionSheet?.headerView?.frame.size.height = 50
             
+            ActionSheetTableView.appearance().backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+            ActionSheetTableView.appearance().separatorLineColor = NCBrandColor.sharedInstance.separator
+            ActionSheetItemCell.appearance().backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+            ActionSheetItemCell.appearance().titleColor = NCBrandColor.sharedInstance.textView
+            
             actionSheet?.present(in: self, from: sender as! UIButton)
         } else {
             
@@ -767,6 +775,11 @@ extension NCOffline {
         actionSheet?.headerView = headerView
         actionSheet?.headerView?.frame.size.height = 50
         
+        ActionSheetTableView.appearance().backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        ActionSheetTableView.appearance().separatorLineColor = NCBrandColor.sharedInstance.separator
+        ActionSheetItemCell.appearance().backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        ActionSheetItemCell.appearance().titleColor = NCBrandColor.sharedInstance.textView
+        
         actionSheet?.present(in: self, from: sender as! UIButton)
     }
 }

+ 4 - 1
iOSClient/Select/NCSelect.swift

@@ -375,7 +375,10 @@ class NCSelect: UIViewController, UIGestureRecognizerDelegate, NCListCellDelegat
         menuView?.sectionHeaderHeight = 8
         menuView?.highlightColor = NCBrandColor.sharedInstance.brand
         menuView?.tableView.alwaysBounceVertical = false
-        menuView?.tableViewBackgroundColor = UIColor.white
+        menuView?.tableViewSeperatorColor = NCBrandColor.sharedInstance.separator
+        menuView?.tableViewBackgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        menuView?.cellBackgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        menuView?.textColor = NCBrandColor.sharedInstance.textView
         
         let header = (sender as? UIButton)?.superview
         let headerRect = self.collectionView.convert(header!.bounds, from: self.view)

+ 5 - 0
iOSClient/Share/NCShareComments.swift

@@ -187,6 +187,11 @@ class NCShareComments: UIViewController, NCShareCommentsCellDelegate {
             if item is ActionSheetCancelButton { print("Cancel buttons has the value `true`") }
         }
         
+        ActionSheetTableView.appearance().backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        ActionSheetTableView.appearance().separatorLineColor = NCBrandColor.sharedInstance.separator
+        ActionSheetItemCell.appearance().backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        ActionSheetItemCell.appearance().titleColor = NCBrandColor.sharedInstance.textView
+        
         actionSheet?.present(in: self, from: sender as! UIButton)
     }
 }

+ 27 - 2
iOSClient/Trash/NCTrash.swift

@@ -211,7 +211,10 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
         menuView?.rowHeight = 45
         menuView?.highlightColor = NCBrandColor.sharedInstance.brand
         menuView?.tableView.alwaysBounceVertical = false
-        menuView?.tableViewBackgroundColor = UIColor.white
+        menuView?.tableViewSeperatorColor = NCBrandColor.sharedInstance.separator
+        menuView?.tableViewBackgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        menuView?.cellBackgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        menuView?.textColor = NCBrandColor.sharedInstance.textView
 
         let header = (sender as? UIButton)?.superview as! NCTrashSectionHeaderMenu
         let headerRect = self.collectionView.convert(header.bounds, from: self.view)
@@ -248,7 +251,9 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
         menuView?.rowHeight = 45
         menuView?.highlightColor = NCBrandColor.sharedInstance.brand
         menuView?.tableView.alwaysBounceVertical = false
-        menuView?.tableViewBackgroundColor = UIColor.white
+        menuView?.tableViewBackgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        menuView?.cellBackgroundColor = NCBrandColor.sharedInstance.backgroundForm
+        menuView?.textColor = NCBrandColor.sharedInstance.textView
         
         let header = (sender as? UIButton)?.superview as! NCTrashSectionHeaderMenu
         let headerRect = self.collectionView.convert(header.bounds, from: self.view)
@@ -290,6 +295,11 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
             actionSheet?.headerView = headerView
             actionSheet?.headerView?.frame.size.height = 50
             
+            ActionSheetTableView.appearance().backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+            ActionSheetTableView.appearance().separatorLineColor = NCBrandColor.sharedInstance.separator
+            ActionSheetItemCell.appearance().backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+            ActionSheetItemCell.appearance().titleColor = NCBrandColor.sharedInstance.textView
+            
             actionSheet?.present(in: self, from: sender as! UIButton)
         } else {
             let buttonPosition:CGPoint = (sender as! UIButton).convert(CGPoint.zero, to:collectionView)
@@ -325,6 +335,11 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
             actionSheet?.headerView = headerView
             actionSheet?.headerView?.frame.size.height = 50
             
+            ActionSheetTableView.appearance().backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+            ActionSheetTableView.appearance().separatorLineColor = NCBrandColor.sharedInstance.separator
+            ActionSheetItemCell.appearance().backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+            ActionSheetItemCell.appearance().titleColor = NCBrandColor.sharedInstance.textView
+            
             actionSheet?.present(in: self, from: sender as! UIButton)
         } else {
             let buttonPosition:CGPoint = (sender as! UIButton).convert(CGPoint.zero, to:collectionView)
@@ -394,6 +409,11 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
                     if item is ActionSheetCancelButton { return }
                 }
                 
+                ActionSheetTableView.appearance().backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+                ActionSheetTableView.appearance().separatorLineColor = NCBrandColor.sharedInstance.separator
+                ActionSheetItemCell.appearance().backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+                ActionSheetItemCell.appearance().titleColor = NCBrandColor.sharedInstance.textView
+                
                 actionSheet?.present(in: self, from: self.view)
             }
         }
@@ -438,6 +458,11 @@ class NCTrash: UIViewController, UIGestureRecognizerDelegate, NCTrashListCellDel
                     if item is ActionSheetCancelButton { return }
                 }
                 
+                ActionSheetTableView.appearance().backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+                ActionSheetTableView.appearance().separatorLineColor = NCBrandColor.sharedInstance.separator
+                ActionSheetItemCell.appearance().backgroundColor = NCBrandColor.sharedInstance.backgroundForm
+                ActionSheetItemCell.appearance().titleColor = NCBrandColor.sharedInstance.textView
+                
                 actionSheet?.present(in: self, from: self.view)
             }