alqindiirsyam 1 년 전
부모
커밋
638128ca40

+ 1 - 0
appbuilder-ios/NexilisLite/NexilisLite/Resource/id.lproj/Localizable.strings

@@ -369,3 +369,4 @@
 "Validation Transaction Limit" = "Batas Validasi Transaksi";
 "Set a transation validation amount" = "Tetapkan jumlah validasi transaksi";
 "Any transaction over this amount will display an alert and require you to accept the alert to validate before proceeding with the transaction" = "Setiap transaksi yang melebihi jumlah ini akan menampilkan peringatan dan mengharuskan Anda menerima peringatan tersebut untuk memvalidasi sebelum melanjutkan transaksi";
+"Stay Alert, Stay Safe, Keep Clean and don't Panic. #stayhome" = "Tetap Waspada, Tetap Aman, Tetap Bersih dan jangan Panik. #tinggal di rumah";

+ 9 - 0
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorGroup.swift

@@ -2019,6 +2019,15 @@ extension EditorGroup: UIDocumentPickerDelegate, DocumentPickerDelegate, QLPrevi
             self.previewItem = (document as! [URL])[0] as NSURL
             let previewController = QLPreviewController()
             let navController = CustomNavigationController(rootViewController: previewController)
+            navController.navigationBar.tintColor = .white
+            navController.navigationBar.barTintColor = self.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+            navController.navigationBar.isTranslucent = false
+            navController.navigationBar.overrideUserInterfaceStyle = .dark
+            navController.navigationBar.barStyle = .black
+            let cancelButtonAttributes: [NSAttributedString.Key: Any] = [NSAttributedString.Key.foregroundColor: UIColor.white, NSAttributedString.Key.font : UIFont.systemFont(ofSize: 16)]
+            UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
+            let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
+            navController.navigationBar.titleTextAttributes = textAttributes
             let leftBarButton = navigationQLPreviewDocument(title: "Cancel".localized(), style: .plain, target: self, action: #selector(cancelDocumentPreview))
             let rightBarButton = navigationQLPreviewDocument(title: "Send".localized(), style: .done, target: self, action: #selector(sendDocument))
 //            leftBarButton.tintColor = .white

+ 9 - 0
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorPersonal.swift

@@ -3118,6 +3118,15 @@ extension EditorPersonal: UIDocumentPickerDelegate, DocumentPickerDelegate, QLPr
             self.previewItem = (document as! [URL])[0] as NSURL
             let previewController = QLPreviewController()
             let navController = CustomNavigationController(rootViewController: previewController)
+            navController.navigationBar.tintColor = .white
+            navController.navigationBar.barTintColor = self.traitCollection.userInterfaceStyle == .dark ? .blackDarkMode : .mainColor
+            navController.navigationBar.isTranslucent = false
+            navController.navigationBar.overrideUserInterfaceStyle = .dark
+            navController.navigationBar.barStyle = .black
+            let cancelButtonAttributes: [NSAttributedString.Key: Any] = [NSAttributedString.Key.foregroundColor: UIColor.white, NSAttributedString.Key.font : UIFont.systemFont(ofSize: 16)]
+            UIBarButtonItem.appearance().setTitleTextAttributes(cancelButtonAttributes, for: .normal)
+            let textAttributes = [NSAttributedString.Key.foregroundColor:UIColor.white]
+            navController.navigationBar.titleTextAttributes = textAttributes
             let leftBarButton = navigationQLPreviewDocument(title: "Cancel".localized(), style: .plain, target: self, action: #selector(cancelDocumentPreview))
             let rightBarButton = navigationQLPreviewDocument(title: "Send".localized(), style: .done, target: self, action: #selector(sendDocument))
 //            leftBarButton.tintColor = .white

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

@@ -159,9 +159,11 @@ public class ProfileViewController: UITableViewController {
         if navigationController?.navigationBar.backgroundColor != .clear {
             navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.white]
             navigationController?.navigationBar.tintColor = .white
-            navigationItem.rightBarButtonItem?.tintColor = .white
+            navigationItem.rightBarButtonItem?.setTitleTextAttributes([NSAttributedString.Key.foregroundColor: UIColor.white], for: .normal)
         } else {
             navigationController?.navigationBar.titleTextAttributes = [NSAttributedString.Key.foregroundColor: UIColor.black]
+            navigationController?.navigationBar.tintColor = .black
+            navigationItem.rightBarButtonItem?.setTitleTextAttributes([NSAttributedString.Key.foregroundColor: UIColor.black], for: .normal)
         }
         if fromListFriend {
             if let me = UserDefaults.standard.string(forKey: "me"), me == self.data || self.flag == Flag.me {

+ 11 - 2
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Streaming/QmeraStreamingViewController.swift

@@ -31,6 +31,9 @@ class QmeraStreamingViewController: UIViewController {
     
     private var heightTableView: NSLayoutConstraint?
     
+    private let templateTagline = "Stay Alert, Stay Safe, Keep Clean and don't Panic. #stayhome".localized()
+    private var isEmptyTagline = false
+    
     private var chats: [StreamingChat] = [] {
         didSet {
             DispatchQueue.main.async {
@@ -75,7 +78,13 @@ class QmeraStreamingViewController: UIViewController {
         label.font = UIFont.systemFont(ofSize: 14)
         label.textColor = .white
         label.textAlignment = .left
-        label.text = streamingData["tagline"] as? String
+        let taglinetext = (streamingData["tagline"] as? String) ?? ""
+        if !taglinetext.isEmpty {
+            label.text = taglinetext
+        } else {
+            isEmptyTagline = true
+            label.text = templateTagline
+        }
         return label
     }()
     
@@ -464,7 +473,7 @@ class QmeraStreamingViewController: UIViewController {
             }
             self.textFields.removeAll()
             self.alert?.addTextField{ (texfield) in
-                texfield.text = type == 0 ? (self.status.text!) : (self.tagline.text!)
+                texfield.text = type == 0 ? (self.status.text!) : self.isEmptyTagline ? "" : (self.tagline.text!)
                 texfield.addPadding(.right(40))
                 self.textFields.append(texfield)
             }