update

appbuilder-ios/AppBuilder/AppBuilder.xcodeproj/project.pbxproj

@@ -446,7 +446,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 2.2.6;
-				PRODUCT_BUNDLE_IDENTIFIER = io.newuniverse.AppBuilder;
+				PRODUCT_BUNDLE_IDENTIFIER = io.newuniverse.AppBuilder1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
@@ -477,7 +477,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 2.2.6;
-				PRODUCT_BUNDLE_IDENTIFIER = io.newuniverse.AppBuilder;
+				PRODUCT_BUNDLE_IDENTIFIER = io.newuniverse.AppBuilder1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;

appbuilder-ios/AppBuilder/AppBuilder/FirstTabViewController.swift

@@ -28,6 +28,7 @@ class FirstTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
     var dateRefresh: Date?
     public static var forceRefresh = false
     public static var atFirstPage = true
+    public static var showModal = false
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -122,7 +123,7 @@ class FirstTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
     }
     
     override func viewDidAppear(_ animated: Bool) {
-        if self.isUsingMyWebview() && self.webView.url != nil && !self.webView.url!.absoluteString.contains("nexilis/pages/tab1-main-only") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab3-main-only") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab1-main") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab3-commerce") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab1-video") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab3-main") {
+        if (self.isUsingMyWebview() && self.webView.url != nil && !self.webView.url!.absoluteString.contains("nexilis/pages/tab1-main-only") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab3-main-only") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab1-main") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab3-commerce") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab1-video") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab3-main")) || FirstTabViewController.showModal {
             ViewController.alwaysHideButton = true
             self.hideTabBar()
             ThirdTabViewController.atFirstPage = false
@@ -289,6 +290,7 @@ class FirstTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
                     self.webView.scrollView.setContentOffset(CGPoint.zero, animated: true)
                 }
             }
+            FirstTabViewController.showModal = param1
         } else if message.name == "toggleVoiceSearch" {
             if !isAllowSpeech {
                 setupSpeech()

appbuilder-ios/AppBuilder/AppBuilder/FourthTabViewController.swift

@@ -94,6 +94,7 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                 if let viewController = viewController as? ViewController {
                     if viewController.tabBar.isHidden {
                         viewController.tabBar.isHidden = false
+                        ViewController.alwaysHideButton = false
                         ViewController.middleButton.isHidden = false
                     }
                 }
@@ -102,6 +103,7 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                     if let viewController = viewController as? ViewController {
                         if viewController.tabBar.isHidden {
                             viewController.tabBar.isHidden = false
+                            ViewController.alwaysHideButton = false
                         }
                     }
                 }
@@ -452,6 +454,8 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                 self.tableView.reloadData()
                 FirstTabViewController.forceRefresh = true
                 ThirdTabViewController.forceRefresh = true
+                FirstTabViewController.showModal = false
+                ThirdTabViewController.showModal = false
             }))
             self.present(alert, animated: true, completion: nil)
         } else if item.title == "Sign-In".localized() {
@@ -468,6 +472,8 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                 self.tableView.reloadData()
                 FirstTabViewController.forceRefresh = true
                 ThirdTabViewController.forceRefresh = true
+                FirstTabViewController.showModal = false
+                ThirdTabViewController.showModal = false
             }
             navigationController?.show(controller, sender: nil)
         } else if item.title == "Sign-Out".localized() {
@@ -520,6 +526,8 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                                     self.tableView.reloadData()
                                     FirstTabViewController.forceRefresh = true
                                     ThirdTabViewController.forceRefresh = true
+                                    FirstTabViewController.showModal = false
+                                    ThirdTabViewController.showModal = false
                                 })
                             }
                             if !Utils.getForceAnonymous() {

appbuilder-ios/AppBuilder/AppBuilder/SecondTabViewController.swift

@@ -308,6 +308,7 @@ class SecondTabViewController: UIViewController, UIScrollViewDelegate, UIGesture
                 if let viewController = viewController as? ViewController {
                     if viewController.tabBar.isHidden {
                         viewController.tabBar.isHidden = false
+                        ViewController.alwaysHideButton = false
                         ViewController.middleButton.isHidden = false
                     }
                 }
@@ -315,6 +316,7 @@ class SecondTabViewController: UIViewController, UIScrollViewDelegate, UIGesture
                 DispatchQueue.main.async {
                     if let viewController = viewController as? ViewController {
                         if viewController.tabBar.isHidden {
+                            ViewController.alwaysHideButton = false
                             viewController.tabBar.isHidden = false
                         }
                     }
@@ -620,6 +622,10 @@ class SecondTabViewController: UIViewController, UIScrollViewDelegate, UIGesture
 extension SecondTabViewController: UITableViewDelegate, UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if noData {
+            return
+        }
+        tableView.deselectRow(at: indexPath, animated: true)
         switch segment.selectedSegmentIndex {
         case 0:
             let data: Chat
@@ -875,6 +881,7 @@ extension SecondTabViewController: UITableViewDelegate, UITableViewDataSource {
                 content.addSubview(labelNochat)
                 labelNochat.anchor(centerX: content.centerXAnchor, centerY: content.centerYAnchor)
                 cell.backgroundColor = .clear
+                cell.selectionStyle = .none
                 return cell
             }
             let data: Chat

appbuilder-ios/AppBuilder/AppBuilder/ThirdTabViewController.swift

@@ -29,6 +29,7 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
     public static var forceRefresh = false
     public static var inView = false
     public static var atFirstPage = true
+    public static var showModal = false
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -130,7 +131,7 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
     
     override func viewDidAppear(_ animated: Bool) {
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.2, execute: {
-            if self.isUsingMyWebview() && self.webView.url != nil && !self.webView.url!.absoluteString.contains("nexilis/pages/tab1-main-only") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab3-main-only") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab1-main") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab3-commerce") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab1-video") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab3-main") {
+            if (self.isUsingMyWebview() && self.webView.url != nil && !self.webView.url!.absoluteString.contains("nexilis/pages/tab1-main-only") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab3-main-only") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab1-main") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab3-commerce") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab1-video") && !self.webView.url!.absoluteString.contains("nexilis/pages/tab3-main")) || ThirdTabViewController.showModal {
                 ViewController.alwaysHideButton = true
                 self.hideTabBar()
                 ThirdTabViewController.atFirstPage = false
@@ -301,6 +302,7 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
                     self.webView.scrollView.setContentOffset(CGPoint.zero, animated: true)
                 }
             }
+            ThirdTabViewController.showModal = param1
         } else if message.name == "toggleVoiceSearch" {
             if !isAllowSpeech {
                 setupSpeech()

appbuilder-ios/AppBuilder/AppBuilder/ViewController.swift

@@ -257,6 +257,8 @@ class ViewController: UITabBarController, UITabBarControllerDelegate, SettingMAB
                 controller.isDismiss = { newThumb in
                     FirstTabViewController.forceRefresh = true
                     ThirdTabViewController.forceRefresh = true
+                    FirstTabViewController.showModal = false
+                    ThirdTabViewController.showModal = false
                 }
                 let navigationController = UINavigationController(rootViewController: controller)
                 navigationController.modalPresentationStyle = .fullScreen

appbuilder-ios/NexilisLite/NexilisLite/Resource/id.lproj/Localizable.strings

@@ -25,7 +25,7 @@
 "minutes ago" = "menit yang lalu";
 "hours ago" = "jam yang lalu";
 "Start Chat" = "Mulai Percakapan";
-"Type Messages" = "Tulis pesan";
+"Write Messages" = "Tulis pesan";
 "Send message" = "Kirim Pesan";
 "No Conversation" = "Tidak ada percakapan";
 "Photo" = "Foto";
@@ -132,7 +132,7 @@
 "Access Admin / Internal Features" = "Akses Fitur Admin / Internal";
 "Access Admin Features" = "Akses Fitur Admin";
 "Access Internal Features" = "Akses Fitur Internal";
-"Message Mode" = "Modus Pesan";
+"Message Mode" = "Mode Pesan";
 "Confidential Message" = "Pesan Rahasia";
 "Confirmation Message" = "Pesan Konfirmasi";
 "Send Comment" = "Kirim Komentar";
@@ -259,3 +259,5 @@
 "Successfully changed" = "Berhasil diubah";
 "You can't request Call Center more than one" = "Anda tidak dapat meminta pusat panggilan lebih dari satu kali";
 "You have requested Call Center, please wait for response." = "Anda telah meminta Pusat Panggilan, harap tunggu tanggapan.";
+"Audio Call Ended" = "Panggilan Suara telah berakhir";
+"Live Streaming session hasn\'t started yet" = "Sesi Siaran Langsung belum dimulai";

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

@@ -1179,7 +1179,7 @@ public class EditorGroup: UIViewController {
         if viewController is EditorGroup && file_id == "" && dataMessageForward == nil {
             if ((textFieldSend.text!.trimmingCharacters(in: .whitespacesAndNewlines) == "Send message".localized() && textFieldSend.textColor == UIColor.lightGray && attachment_flag != "11") || textFieldSend.text!.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ) {
                 dismissKeyboard()
-                viewController.showToast(message: "Type Messages".localized(), font: UIFont.systemFont(ofSize: 12, weight: .medium), controller: self)
+                viewController.showToast(message: "Write Messages".localized(), font: UIFont.systemFont(ofSize: 12, weight: .medium), controller: self)
                 if (textFieldSend.text!.trimmingCharacters(in: .whitespacesAndNewlines) != "Send message".localized()) {
                     textFieldSend.text = ""
                 }
@@ -2610,10 +2610,16 @@ extension EditorGroup: UITableViewDelegate, UITableViewDataSource {
                 }
                 let streamingNav = UINavigationController(rootViewController: streamingController)
                 streamingNav.modalPresentationStyle = .custom
-                streamingNav.navigationBar.barTintColor = .mainColor
                 streamingNav.navigationBar.tintColor = .white
+                streamingNav.navigationBar.barTintColor = .mainColor
+                streamingNav.navigationBar.isTranslucent = false
+                streamingNav.navigationBar.overrideUserInterfaceStyle = .dark
+                streamingNav.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]
                 streamingNav.navigationBar.titleTextAttributes = textAttributes
+                streamingNav.view.backgroundColor = .mainColor
                 streamingNav.navigationBar.isTranslucent = false
                 navigationController?.present(streamingNav, animated: true, completion: nil)
             }

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

@@ -2036,7 +2036,7 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
         if viewController is EditorPersonal && file_id == "" && dataMessageForward == nil && !isAutoSendCC{
             if ((textFieldSend.text!.trimmingCharacters(in: .whitespacesAndNewlines) == "Send message".localized() && textFieldSend.textColor == UIColor.lightGray && attachment_flag != "11") || textFieldSend.text!.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty ) {
                 dismissKeyboard()
-                viewController.showToast(message: "Type Messages".localized(), font: UIFont.systemFont(ofSize: 12, weight: .medium), controller: self)
+                viewController.showToast(message: "Write Messages".localized(), font: UIFont.systemFont(ofSize: 12, weight: .medium), controller: self)
                 if (textFieldSend.text!.trimmingCharacters(in: .whitespacesAndNewlines) != "Send message".localized()) {
                     textFieldSend.text = ""
                 }
@@ -3753,8 +3753,13 @@ extension EditorPersonal: UITableViewDelegate, UITableViewDataSource {
                     }
                 let streamingNav = UINavigationController(rootViewController: streamingController)
                 streamingNav.modalPresentationStyle = .custom
-                streamingNav.navigationBar.barTintColor = .mainColor
                 streamingNav.navigationBar.tintColor = .white
+                streamingNav.navigationBar.barTintColor = .mainColor
+                streamingNav.navigationBar.isTranslucent = false
+                streamingNav.navigationBar.overrideUserInterfaceStyle = .dark
+                streamingNav.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]
                 streamingNav.navigationBar.titleTextAttributes = textAttributes
                 streamingNav.view.backgroundColor = .mainColor

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

@@ -439,6 +439,10 @@ class ContactChatViewController: UITableViewController {
 extension ContactChatViewController {
     
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if noData {
+            return
+        }
+        tableView.deselectRow(at: indexPath, animated: true)
         switch segment.selectedSegmentIndex {
         case 0:
             let data: Chat
@@ -731,6 +735,7 @@ extension ContactChatViewController {
                 content.addSubview(labelNochat)
                 labelNochat.anchor(centerX: content.centerXAnchor, centerY: content.centerYAnchor)
                 cell.backgroundColor = .clear
+                cell.selectionStyle = .none
                 return cell
             }
             let data: Chat

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

@@ -93,7 +93,7 @@ public class QmeraCreateStreamingViewController: UITableViewController {
         title = "Live Streaming".localized()
         
         navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Cancel".localized(), style: .plain, target: self, action: #selector(didTapCancel(sender:)))
-        navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Done".localized(), style: .plain, target: self, action: #selector(didTapRight(sender:)))
+        navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Start".localized(), style: .plain, target: self, action: #selector(didTapRight(sender:)))
         
         descriptionView.delegate = self
         

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

@@ -278,6 +278,7 @@ class QmeraStreamingViewController: UIViewController {
     }
     
     @objc func close(sender: Any?) {
+        hideKeyboard()
         var alert = UIAlertController(title: "", message: "Are you sure you want to end Live Streaming?".localized(), preferredStyle: .alert)
         if !isLive {
             alert = UIAlertController(title: "", message: "Are you sure you want to leave Live Streaming?".localized(), preferredStyle: .alert)