alqindiirsyam 2 ani în urmă
părinte
comite
2c4c4be2aa

+ 1 - 2
appbuilder-ios/AppBuilder/AppBuilder/SecondTabViewController.swift

@@ -870,7 +870,6 @@ extension SecondTabViewController: UITableViewDelegate, UITableViewDataSource {
         switch segment.selectedSegmentIndex {
         case 0:
             cell = tableView.dequeueReusableCell(withIdentifier: "reuseIdentifierChat", for: indexPath)
-            cell.separatorInset.left = 60.0
             let content = cell.contentView
             if content.subviews.count > 0 {
                 content.subviews.forEach { $0.removeFromSuperview() }
@@ -885,7 +884,6 @@ extension SecondTabViewController: UITableViewDelegate, UITableViewDataSource {
                 cell.separatorInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: .greatestFiniteMagnitude)
                 return cell
             }
-            cell.separatorInset = UIEdgeInsets(top: 0, left: cell.layoutMargins.left, bottom: 0, right: 0)
             let data: Chat
             if isFilltering {
                 data = fillteredData[indexPath.row] as! Chat
@@ -1097,6 +1095,7 @@ extension SecondTabViewController: UITableViewDelegate, UITableViewDataSource {
             cell.contentConfiguration = content
         }
         cell.backgroundColor = .clear
+        cell.separatorInset = UIEdgeInsets(top: 0, left: 60.0, bottom: 0, right: 0)
         return cell
     }
     

+ 9 - 4
appbuilder-ios/NexilisLite/NexilisLite/Source/Nexilis.swift

@@ -600,6 +600,8 @@ public class Nexilis: NSObject {
         navigationController.navigationBar.isTranslucent = false
         navigationController.navigationBar.overrideUserInterfaceStyle = .dark
         navigationController.navigationBar.barStyle = .black
+        let cancelButtonAttributes: [NSAttributedString.Key: Any] = [NSAttributedString.Key.foregroundColor: UIColor.white]
+        UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
         let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
         navigationController.navigationBar.titleTextAttributes = textAttributes
         navigationController.view.backgroundColor = .mainColor
@@ -932,10 +934,13 @@ public class Nexilis: NSObject {
         if let _ = waitQueue[message.getStatus()] {
             print("MESSAGE INCOMING DATA \(message.toLogString())")
             if message.mBodies.keys.contains(CoreMessage_TMessageKey.ERRCOD) {
-                print("LEAVE GROUP INCOMING DATA")
-                waitQueue[message.getStatus()] = message
-                groupWait.leave()
-                return
+                if onDispatchGroupLeave != message.getStatus() {
+                    onDispatchGroupLeave = message.getStatus()
+                    print("LEAVE GROUP INCOMING DATA")
+                    waitQueue[message.getStatus()] = message
+                    groupWait.leave()
+                    return
+                }
             }
         }
         IncomingThread.default.addQueue(message: message)

+ 12 - 0
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/BroadcastViewController.swift

@@ -90,6 +90,18 @@ class BroadcastViewController: UITableViewController, UITextFieldDelegate, UITex
             _ = Nexilis.write(message: CoreMessage_TMessageBank.getFormList(p_pin: me, p_last_id: "0"))
         }
         
+        navigationController?.navigationBar.backgroundColor = .mainColor
+        navigationController?.navigationBar.tintColor = .white
+        navigationController?.navigationBar.barTintColor = .mainColor
+        navigationController?.navigationBar.isTranslucent = false
+        navigationController?.navigationBar.overrideUserInterfaceStyle = .dark
+        navigationController?.navigationBar.barStyle = .black
+        navigationController?.view.backgroundColor = .mainColor
+        let cancelButtonAttributes: [NSAttributedString.Key: Any] = [NSAttributedString.Key.foregroundColor: UIColor.white]
+        UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
+        let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
+        navigationController?.navigationBar.titleTextAttributes = textAttributes
+        
         titleTextField.delegate = self
         messageTextView.delegate = self
         linkTextField.delegate = self

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

@@ -114,6 +114,7 @@ class ContactChatViewController: UITableViewController {
         if(isAdmin){
             childrenMenu.append(UIAction(title: "Broadcast Message".localized(), image: UIImage(systemName: "envelope.open"), handler: {[weak self](_) in
                 let controller = AppStoryBoard.Palio.instance.instantiateViewController(identifier: "broadcastNav")
+                controller.modalPresentationStyle = .fullScreen
                 self?.navigationController?.present(controller, animated: true, completion: nil)
             }))
             childrenMenu.append(UIAction(title: "Live Streaming".localized(), image: UIImage(systemName: "video.bubble.left"), handler: {[weak self](_) in
@@ -730,7 +731,6 @@ extension ContactChatViewController {
         switch segment.selectedSegmentIndex {
         case 0:
             cell = tableView.dequeueReusableCell(withIdentifier: "reuseIdentifierChat", for: indexPath)
-            cell.separatorInset.left = 60.0
             let content = cell.contentView
             if content.subviews.count > 0 {
                 content.subviews.forEach { $0.removeFromSuperview() }
@@ -745,12 +745,10 @@ extension ContactChatViewController {
                 cell.separatorInset = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: .greatestFiniteMagnitude)
                 return cell
             }
-            cell.separatorInset = UIEdgeInsets(top: 0, left: cell.layoutMargins.left, bottom: 0, right: 0)
             let data: Chat
             if isFilltering {
                 data = fillteredData[indexPath.row] as! Chat
             } else {
-                print("DATA CHATS \(chats)")
                 data = chats[indexPath.row]
             }
             let imageView = UIImageView()
@@ -987,6 +985,8 @@ extension ContactChatViewController {
             content.text = ""
             cell.contentConfiguration = content
         }
+        cell.backgroundColor = .clear
+        cell.separatorInset = UIEdgeInsets(top: 0, left: 60.0, bottom: 0, right: 0)
         return cell
     }