update darkmode v3

appbuilder-ios/AppBuilder/AppBuilder/AppDelegate.swift

@@ -121,7 +121,7 @@ extension AppDelegate: ConnectDelegate, UNUserNotificationCenterDelegate {
         UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
         let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
         navigationController.navigationBar.titleTextAttributes = textAttributes
-        navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+        navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .black : .white
         if UIApplication.shared.visibleViewController?.navigationController != nil {
             UIApplication.shared.visibleViewController?.navigationController?.present(navigationController, animated: true, completion: nil)
         } else {
@@ -145,7 +145,7 @@ extension AppDelegate: ConnectDelegate, UNUserNotificationCenterDelegate {
         UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
         let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
         navigationController.navigationBar.titleTextAttributes = textAttributes
-        navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+        navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .black : .white
         if UIApplication.shared.visibleViewController?.navigationController != nil {
             UIApplication.shared.visibleViewController?.navigationController?.present(navigationController, animated: true, completion: nil)
         } else {

appbuilder-ios/AppBuilder/AppBuilder/Base.lproj/Main.storyboard

@@ -5,7 +5,6 @@
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -90,7 +89,7 @@
                             </view>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Exo-M2-oVn"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="BU2-P5-16y" firstAttribute="top" secondItem="T1X-gt-fSN" secondAttribute="top" id="6kj-QA-eHg"/>
                             <constraint firstItem="oT8-Uw-cgS" firstAttribute="leading" secondItem="Exo-M2-oVn" secondAttribute="leading" id="9FF-6z-ROG"/>
@@ -293,9 +292,4 @@
             <point key="canvasLocation" x="1293" y="1184"/>
         </scene>
     </scenes>
-    <resources>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
-    </resources>
 </document>

appbuilder-ios/AppBuilder/AppBuilder/FourthTabViewController.swift

@@ -656,7 +656,7 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
             UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
             let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
             navigationController.navigationBar.titleTextAttributes = textAttributes
-            navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+            navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .black : .white
             navigationController.navigationBar.overrideUserInterfaceStyle = .dark
             navigationController.navigationBar.barStyle = .black
             navigationController.modalPresentationStyle = .custom
@@ -676,7 +676,7 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
             UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
             let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
             navigationController.navigationBar.titleTextAttributes = textAttributes
-            navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+            navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .black : .white
             self.present(navigationController, animated: true)
         } else if item.title == "Backup & Restore".localized() {
             let controller = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "backupRestore") as! BackupRestoreView

appbuilder-ios/AppBuilder/AppBuilder/SecondTabViewController.swift

@@ -44,8 +44,8 @@ class SecondTabViewController: UIViewController, UIScrollViewDelegate, UIGesture
         searchController.searchResultsUpdater = self
         searchController.searchBar.autocapitalizationType = .none
         searchController.searchBar.delegate = self
-        searchController.searchBar.setMagnifyingGlassColorTo(color: self.traitCollection.userInterfaceStyle == .dark ? .white : .mainColor)
-        searchController.searchBar.updateHeight(height: 32, radius: 20)
+        searchController.searchBar.setMagnifyingGlassColorTo(color: self.traitCollection.userInterfaceStyle == .dark ? .white : .black)
+        searchController.searchBar.updateHeight(height: 32, radius: 20, borderColor: self.traitCollection.userInterfaceStyle == .dark ? UIColor.white.cgColor : UIColor.black.cgColor)
         searchController.obscuresBackgroundDuringPresentation = false
         searchController.searchBar.searchTextField.attributedPlaceholder = NSAttributedString(string: "Search chats & messages".localized(), attributes: [NSAttributedString.Key.foregroundColor: UIColor.gray, NSAttributedString.Key.font: UIFont.systemFont(ofSize: 16)])
         return searchController
@@ -175,7 +175,7 @@ class SecondTabViewController: UIViewController, UIScrollViewDelegate, UIGesture
         UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
         let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
         navigationController.navigationBar.titleTextAttributes = textAttributes
-        navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+        navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .black : .white
         navigationController.navigationBar.overrideUserInterfaceStyle = .dark
         navigationController.navigationBar.barStyle = .black
         self.navigationController?.present(navigationController, animated: true, completion: nil)

appbuilder-ios/AppBuilder/AppBuilder/ViewController.swift

@@ -67,6 +67,7 @@ class ViewController: UITabBarController, UITabBarControllerDelegate, SettingMAB
     }
     
     func startView() {
+        self.navigationController?.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .black : .white
         let topBorder = CALayer()
         topBorder.backgroundColor = UIColor.gray.withAlphaComponent(0.5).cgColor
         topBorder.frame = CGRect(x: 0, y: 0, width: tabBar.frame.size.width, height: 1)
@@ -313,7 +314,7 @@ class ViewController: UITabBarController, UITabBarControllerDelegate, SettingMAB
                 UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
                 let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
                 navigationController.navigationBar.titleTextAttributes = textAttributes
-                navigationController.view.backgroundColor = UIApplication.shared.windows.filter {$0.isKeyWindow}.first?.rootViewController?.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+                navigationController.view.backgroundColor = UIApplication.shared.windows.filter {$0.isKeyWindow}.first?.rootViewController?.traitCollection.userInterfaceStyle == .dark ? .black : .white
                 ViewController.def?.show(b: false)
                 ViewController.def?.thirdTab?.webView?.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
                 ViewController.def?.firstTab?.webView?.evaluateJavaScript("{if(pauseAll){pauseAll();}}")
@@ -590,7 +591,7 @@ class ViewController: UITabBarController, UITabBarControllerDelegate, SettingMAB
                 UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
                 let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
                 navigationController.navigationBar.titleTextAttributes = textAttributes
-                navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+                navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .black : .white
                 navigationController.modalPresentationStyle = .fullScreen
                 navigationController.modalTransitionStyle = .crossDissolve
                 self.present(navigationController, animated: true)
@@ -782,7 +783,7 @@ class ViewController: UITabBarController, UITabBarControllerDelegate, SettingMAB
         navigationController.navigationBar.isTranslucent = false
         let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.mainColor]
         navigationController.navigationBar.titleTextAttributes = textAttributes
-        navigationController.view.backgroundColor = .white
+        navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .black : .white
         termVC!.navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Close".localized(), style: .plain, target: self, action: #selector(closeTerm))
         welcomeVC.present(navigationController, animated: true)
     }

appbuilder-ios/NexilisLite/NexilisLite/Source/APIS.swift

@@ -201,7 +201,7 @@ public class APIS: NSObject {
         UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
         let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
         navigationController.navigationBar.titleTextAttributes = textAttributes
-        navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+        navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .black : .white
         if UIApplication.shared.visibleViewController?.navigationController != nil {
             UIApplication.shared.visibleViewController?.navigationController?.present(navigationController, animated: true, completion: nil)
         } else {

appbuilder-ios/NexilisLite/NexilisLite/Source/Extension.swift

@@ -1271,7 +1271,7 @@ extension UISearchBar
         textFieldInsideSearchBarLabel?.textColor = color
     }
     
-    public func updateHeight(height: CGFloat, radius: CGFloat = 8.0) {
+    public func updateHeight(height: CGFloat, radius: CGFloat = 8.0, borderColor: CGColor = UIColor.white.cgColor) {
             let image: UIImage? = UIImage.imageWithColor(color: UIColor.clear, size: CGSize(width: 1, height: height))
             setSearchFieldBackgroundImage(image, for: .normal)
             for subview in self.subviews {
@@ -1281,7 +1281,7 @@ extension UISearchBar
                             if let textField = child as? UISearchTextField {
                                 textField.layer.cornerRadius = radius
                                 textField.clipsToBounds = true
-                                textField.layer.borderColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? UIColor.white.cgColor : UIColor.black.cgColor
+                                textField.layer.borderColor = borderColor
                                 textField.layer.borderWidth = 1.0
                             }
                         }
@@ -1290,7 +1290,7 @@ extension UISearchBar
                     if let textField = subSubViews as? UITextField {
                         textField.layer.cornerRadius = radius
                         textField.clipsToBounds = true
-                        textField.layer.borderColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? UIColor.white.cgColor : UIColor.black.cgColor
+                        textField.layer.borderColor = borderColor
                         textField.layer.borderWidth = 1.0
                     }
                 }

appbuilder-ios/NexilisLite/NexilisLite/Source/FloatingButton/FloatingButton.swift

@@ -582,7 +582,7 @@ public class FloatingButton: UIView {
                 UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
                 let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
                 navigationController.navigationBar.titleTextAttributes = textAttributes
-                navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+                navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .black : .white
                 UIApplication.shared.rootViewController?.present(navigationController, animated: true, completion: nil)
             }
             hideButton()

appbuilder-ios/NexilisLite/NexilisLite/Source/Nexilis.swift

@@ -860,7 +860,7 @@ public class Nexilis: NSObject {
                 UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
                 let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
                 navigationController.navigationBar.titleTextAttributes = textAttributes
-                navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+                navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .black : .white
                 if UIApplication.shared.visibleViewController?.navigationController != nil {
                     UIApplication.shared.visibleViewController?.navigationController?.present(navigationController, animated: true, completion: nil)
                 } else {
@@ -904,7 +904,7 @@ public class Nexilis: NSObject {
                 UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
                 let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
                 navigationController.navigationBar.titleTextAttributes = textAttributes
-                navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+                navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .black : .white
                 if UIApplication.shared.visibleViewController?.navigationController != nil {
                     UIApplication.shared.visibleViewController?.navigationController?.present(navigationController, animated: true, completion: nil)
                 } else {
@@ -975,7 +975,7 @@ public class Nexilis: NSObject {
                 UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
                 let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
                 navigationController.navigationBar.titleTextAttributes = textAttributes
-                navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+                navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .black : .white
                 let rootVC = UIApplication.shared.windows.filter {$0.isKeyWindow}.first?.rootViewController
                 if rootVC?.presentedViewController == nil {
                     rootVC?.present(navigationController, animated: true, completion: nil)
@@ -2499,7 +2499,7 @@ extension Nexilis: MessageDelegate {
                                         UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
                                         let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
                                         navigationController.navigationBar.titleTextAttributes = textAttributes
-                                        navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+                                        navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .black : .white
                                         if UIApplication.shared.visibleViewController?.navigationController != nil {
                                             UIApplication.shared.visibleViewController?.navigationController?.present(navigationController, animated: true, completion: nil)
                                         } else {
@@ -2896,7 +2896,7 @@ extension Nexilis: MessageDelegate {
                                             UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
                                             let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
                                             navigationController.navigationBar.titleTextAttributes = textAttributes
-                                            navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+                                            navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .black : .white
                                             if UIApplication.shared.visibleViewController?.navigationController != nil {
                                                 UIApplication.shared.visibleViewController?.navigationController?.present(navigationController, animated: true, completion: nil)
                                             } else {
@@ -3337,7 +3337,7 @@ extension Nexilis: MessageDelegate {
                                         UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
                                         let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
                                         navigationController.navigationBar.titleTextAttributes = textAttributes
-                                        navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+                                        navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .black : .white
                                         if UIApplication.shared.visibleViewController?.navigationController != nil {
                                             UIApplication.shared.visibleViewController?.navigationController?.present(navigationController, animated: true, completion: nil)
                                         } else {
@@ -3380,7 +3380,7 @@ extension Nexilis: MessageDelegate {
                                 UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
                                 let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
                                 navigationController.navigationBar.titleTextAttributes = textAttributes
-                                navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+                                navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .black : .white
                                 if UIApplication.shared.visibleViewController?.navigationController != nil {
                                     UIApplication.shared.visibleViewController?.navigationController?.present(navigationController, animated: true, completion: nil)
                                 } else {
@@ -3473,7 +3473,7 @@ extension Nexilis: MessageDelegate {
                                 UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
                                 let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
                                 navigationController.navigationBar.titleTextAttributes = textAttributes
-                                navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+                                navigationController.view.backgroundColor = UIApplication.shared.visibleViewController?.traitCollection.userInterfaceStyle == .dark ? .black : .white
                                 if UIApplication.shared.visibleViewController?.navigationController != nil {
                                     UIApplication.shared.visibleViewController?.navigationController?.present(navigationController, animated: true, completion: nil)
                                 } else {

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Call/QmeraAudioViewController.swift

@@ -452,7 +452,7 @@ class QmeraAudioViewController: UIViewController {
         UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
         let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
         navigationController.navigationBar.titleTextAttributes = textAttributes
-        navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+        navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .black : .white
         if UIApplication.shared.visibleViewController?.navigationController != nil {
             UIApplication.shared.visibleViewController?.navigationController?.present(navigationController, animated: true, completion: nil)
         } else {

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Call/QmeraVideoViewController.swift

@@ -606,7 +606,7 @@ class QmeraVideoViewController: UIViewController {
         UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
         let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
         navigationController.navigationBar.titleTextAttributes = textAttributes
-        navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+        navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .black : .white
         if UIApplication.shared.visibleViewController?.navigationController != nil {
             UIApplication.shared.visibleViewController?.navigationController?.present(navigationController, animated: true, completion: nil)
         } else {

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/ChatGPTBotView.swift

@@ -500,7 +500,7 @@ class ChatGPTBotView: UIViewController, UIGestureRecognizerDelegate {
             searchBar.searchTextField.textColor = .mainColor
             searchBar.updateHeight(height: 32, radius: 20)
             searchBar.showsCancelButton = false
-            searchBar.setMagnifyingGlassColorTo(color: self.traitCollection.userInterfaceStyle == .dark ? .white : .mainColor)
+            searchBar.setMagnifyingGlassColorTo(color: .white)
             navigationItem.titleView = searchBar
             self.definesPresentationContext = true
         }

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorGroup.swift

@@ -674,7 +674,7 @@ public class EditorGroup: UIViewController {
             searchBar.searchTextField.textColor = .mainColor
             searchBar.updateHeight(height: 32, radius: 20)
             searchBar.showsCancelButton = false
-            searchBar.setMagnifyingGlassColorTo(color: self.traitCollection.userInterfaceStyle == .dark ? .white : .mainColor)
+            searchBar.setMagnifyingGlassColorTo(color: .white)
             navigationItem.titleView = searchBar
             self.definesPresentationContext = true
         }

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorPersonal.swift

@@ -163,6 +163,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
         viewButton.layer.shadowOpacity = 1
         viewButton.layer.shadowOffset = .zero
         viewButton.layer.shadowRadius = 3
+        viewButton.addTopBorder(with: UIColor.lightGray, andWidth: 1.0)
         
 //        buttonVoice.setImage(resizeImage(image: UIImage(named: "Voice-Record", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)), for: .normal)
         buttonSendImage.setImage(resizeImage(image: UIImage(named: "Send-Image", in: Bundle.resourceBundle(for: Nexilis.self), with: nil)!, targetSize: CGSize(width: 30, height: 30)).withTintColor(self.traitCollection.userInterfaceStyle == .dark ? .white : .mainColor), for: .normal)
@@ -749,7 +750,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
             searchBar.searchTextField.tintColor = .mainColor
             searchBar.searchTextField.textColor = .mainColor
             searchBar.showsCancelButton = false
-            searchBar.setMagnifyingGlassColorTo(color: self.traitCollection.userInterfaceStyle == .dark ? .white : .mainColor)
+            searchBar.setMagnifyingGlassColorTo(color: .white)
             searchBar.updateHeight(height: 32, radius: 20)
             navigationItem.titleView = searchBar
             self.definesPresentationContext = true
@@ -3607,6 +3608,9 @@ extension EditorPersonal: UIContextMenuInteractionDelegate {
             if self.containerAction.isHidden {
                 self.containerAction.isHidden = false
             }
+            if self.viewButton.isHidden {
+                self.viewButton.isHidden = false
+            }
             if self.constraintBottomTableViewWithTextfield.constant == -60.0 {
                 self.constraintBottomTableViewWithTextfield.constant = self.constraintBottomTableViewWithTextfield.constant + 70
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.3, execute: {
@@ -3640,6 +3644,7 @@ extension EditorPersonal: UIContextMenuInteractionDelegate {
         viewTextfield.isHidden = true
         viewAttachment.isHidden = true
         containerAction.isHidden = true
+        viewButton.isHidden = true
         constraintBottomTableViewWithTextfield.constant = constraintBottomTableViewWithTextfield.constant - 70
         view.addSubview(containerMultpileSelectSession)
         containerMultpileSelectSession.translatesAutoresizingMaskIntoConstraints = false

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorStarMessages.swift

@@ -1339,7 +1339,7 @@ public class EditorStarMessages: UIViewController, UITableViewDataSource, UITabl
             UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
             let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
             navigationController.navigationBar.titleTextAttributes = textAttributes
-            navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+            navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .black : .white
             if let controller = navigationController.viewControllers.first as? ContactChatViewController {
                 controller.isChooser = { [weak self] scope, pin in
                     if scope == "3" {

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Contact/ContactCallViewController.swift

@@ -86,7 +86,7 @@ class ContactCallViewController: UIViewController {
         searchController.obscuresBackgroundDuringPresentation = false
         searchController.searchBar.searchTextField.attributedPlaceholder = NSAttributedString(string: "Search".localized(), attributes: [NSAttributedString.Key.foregroundColor: UIColor.gray, NSAttributedString.Key.font: UIFont.systemFont(ofSize: 16)])
         searchController.searchBar.updateHeight(height: 32, radius: 20)
-        searchController.searchBar.setMagnifyingGlassColorTo(color: self.traitCollection.userInterfaceStyle == .dark ? .white : .mainColor)
+        searchController.searchBar.setMagnifyingGlassColorTo(color: .white)
         searchController.searchBar.tintColor = .mainColor
         
         navigationItem.searchController = searchController

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/AddFriendTableViewController.swift

@@ -66,7 +66,7 @@ class AddFriendTableViewController: UITableViewController {
         searchController.obscuresBackgroundDuringPresentation = false
         searchController.searchBar.searchTextField.attributedPlaceholder = NSAttributedString(string: "Search".localized(), attributes: [NSAttributedString.Key.foregroundColor: UIColor.gray, NSAttributedString.Key.font: UIFont.systemFont(ofSize: 16)])
         searchController.searchBar.updateHeight(height: 32, radius: 20)
-        searchController.searchBar.setMagnifyingGlassColorTo(color: self.traitCollection.userInterfaceStyle == .dark ? .white : .mainColor)
+        searchController.searchBar.setMagnifyingGlassColorTo(color: .white)
         searchController.searchBar.tintColor = .mainColor
         
         definesPresentationContext = true

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/BroadcastMembersTableViewController.swift

@@ -81,7 +81,7 @@ class BroadcastMembersTableViewController: UITableViewController, UISearchContro
         searchController.obscuresBackgroundDuringPresentation = false
         searchController.searchBar.searchTextField.attributedPlaceholder = NSAttributedString(string: "Search".localized(), attributes: [NSAttributedString.Key.foregroundColor: UIColor.gray, NSAttributedString.Key.font: UIFont.systemFont(ofSize: 16)])
         searchController.searchBar.updateHeight(height: 32, radius: 20)
-        searchController.searchBar.setMagnifyingGlassColorTo(color: self.traitCollection.userInterfaceStyle == .dark ? .white : .mainColor)
+        searchController.searchBar.setMagnifyingGlassColorTo(color: .white)
         searchController.searchBar.tintColor = .mainColor
         UIBarButtonItem.appearance(whenContainedInInstancesOf: [UISearchBar.self]).setTitleTextAttributes([NSAttributedString.Key.foregroundColor: UIColor.white], for: .normal)
         

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ContactChatViewController.swift

@@ -157,7 +157,7 @@ class ContactChatViewController: UITableViewController {
         searchController.searchBar.autocapitalizationType = .none
         searchController.searchBar.delegate = self
         searchController.obscuresBackgroundDuringPresentation = false
-        searchController.searchBar.setMagnifyingGlassColorTo(color: self.traitCollection.userInterfaceStyle == .dark ? .white : .mainColor)
+        searchController.searchBar.setMagnifyingGlassColorTo(color: .white)
         searchController.searchBar.updateHeight(height: 32, radius: 20)
         searchController.searchBar.tintColor = .mainColor
         searchController.searchBar.searchTextField.attributedPlaceholder = NSAttributedString(string: "Search".localized(), attributes: [NSAttributedString.Key.foregroundColor: UIColor.gray, NSAttributedString.Key.font: UIFont.systemFont(ofSize: 16)])

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/SettingTableViewController.swift

@@ -564,7 +564,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
             UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
             let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
             navigationController.navigationBar.titleTextAttributes = textAttributes
-            navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+            navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .black : .white
             navigationController.navigationBar.overrideUserInterfaceStyle = .dark
             navigationController.navigationBar.barStyle = .black
             navigationController.modalPresentationStyle = .custom
@@ -584,7 +584,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
             UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
             let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
             navigationController.navigationBar.titleTextAttributes = textAttributes
-            navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+            navigationController.view.backgroundColor = self.traitCollection.userInterfaceStyle == .dark ? .black : .white
             self.present(navigationController, animated: true)
         } else if item.title == "Backup & Restore".localized() {
             let controller = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "backupRestore") as! BackupRestoreView

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Streaming/SeminarListViewController.swift

@@ -60,7 +60,7 @@ class SeminarListViewController: UIViewController {
         searchController.obscuresBackgroundDuringPresentation = false
         searchController.searchBar.updateHeight(height: 32, radius: 20)
         searchController.searchBar.searchTextField.attributedPlaceholder = NSAttributedString(string: "Search".localized(), attributes: [NSAttributedString.Key.foregroundColor: UIColor.gray, NSAttributedString.Key.font: UIFont.systemFont(ofSize: 16)])
-        searchController.searchBar.setMagnifyingGlassColorTo(color: self.traitCollection.userInterfaceStyle == .dark ? .white : .mainColor)
+        searchController.searchBar.setMagnifyingGlassColorTo(color: .white)
         searchController.searchBar.tintColor = .mainColor
         
         tableView.delegate = self