update

appbuilder-ios/AppBuilder/AppBuilder/FourthTabViewController.swift

@@ -134,11 +134,11 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                         Item(icon: UIImage(systemName: "person.fill"), title: "Personal Information".localized()),
 //                        Item(icon: UIImage(systemName: "laptopcomputer.and.iphone"), title: "Login to Nexilis Web".localized()),
                             Item(icon: UIImage(systemName: "textformat.abc"), title: "Change Language".localized()),
-                        Item(icon: UIImage(systemName: "person.crop.rectangle"), title: "Login as Admin / Internal".localized()),
+                        Item(icon: UIImage(systemName: "person.crop.rectangle"), title: "Access Admin / Internal Features".localized()),
                     ]
                 }
                 if !isChangeProfile {
-                    Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "arrow.up.and.person.rectangle.portrait"), title: "Change Device".localized()))
+                    Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "arrow.up.and.person.rectangle.portrait"), title: "Login".localized()))
                 } else if isChangeProfile {
                     Item.menus["Personal"]?.append(Item(icon: UIImage(systemName: "rectangle.portrait.and.arrow.right"), title: "Logout".localized()))
                 }
@@ -183,8 +183,8 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                     Item(icon: UIImage(systemName: "person.fill"), title: "Personal Information".localized()),
 //                        Item(icon: UIImage(systemName: "laptopcomputer.and.iphone"), title: "Login to Nexilis Web".localized()),
                         Item(icon: UIImage(systemName: "textformat.abc"), title: "Change Language".localized()),
-                    Item(icon: UIImage(systemName: "person.crop.rectangle"), title: "Login as Admin / Internal".localized()),
-                    Item(icon: UIImage(systemName: "arrow.up.and.person.rectangle.portrait"), title: "Change Device".localized())
+                    Item(icon: UIImage(systemName: "person.crop.rectangle"), title: "Access Admin / Internal Features".localized()),
+                    Item(icon: UIImage(systemName: "arrow.up.and.person.rectangle.portrait"), title: "Login".localized())
                 ]
                 if !imageSignIn.isEmpty {
                     do {
@@ -277,11 +277,11 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
             switch menu.title {
             case "Personal Information".localized():
                 cell.accessoryType = .disclosureIndicator
-            case "Login as Admin / Internal".localized():
+            case "Access Admin / Internal Features".localized():
                 cell.accessoryType = .disclosureIndicator
             case "Login to Nexilis Web".localized():
                 cell.accessoryType = .disclosureIndicator
-            case "Change Device".localized():
+            case "Login".localized():
                 cell.accessoryType = .disclosureIndicator
 //            case "Logout".localized():
             case "Change Admin / Internal Password".localized():
@@ -325,7 +325,7 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                 }
                 navigationController?.show(controller, sender: nil)
             }
-        } else if item.title == "Login as Admin / Internal".localized() || item.title == "Change Admin / Internal Password".localized() {
+        } else if item.title == "Access Admin / Internal Features".localized() || item.title == "Change Admin / Internal Password".localized() {
             if(ViewController.checkIsChangePerson()){
                 if !CheckConnection.isConnectedToNetwork()  || API.nGetCLXConnState() == 0 {
                     let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))
@@ -344,10 +344,10 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                     }
                 }
                 else {
-                    if let action = self.actionLogin(for: "admin", title: "Login as Admin".localized()) {
+                    if let action = self.actionLogin(for: "admin", title: "Access Admin Features".localized()) {
                         alertController.addAction(action)
                     }
-                    if let action = self.actionLogin(for: "internal", title: "Login as Internal Team".localized()) {
+                    if let action = self.actionLogin(for: "internal", title: "Access Internal Features".localized()) {
                         alertController.addAction(action)
                     }
                 }
@@ -389,7 +389,7 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                 ThirdTabViewController.forceRefresh = true
             }))
             self.present(alert, animated: true, completion: nil)
-        } else if item.title == "Change Device".localized() {
+        } else if item.title == "Login".localized() {
             let controller = AppStoryBoard.Palio.instance.instantiateViewController(withIdentifier: "changeDevice") as! ChangeDeviceViewController
             controller.isDismiss = { newThumb in
                 self.makeMenu(imageSignIn: newThumb)
@@ -450,13 +450,13 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
     
     private func actionLogin(for type: String, title: String) -> UIAlertAction? {
         return UIAlertAction(title: title, style: .default) { _ in
-            self.alert = UIAlertController(title: "Login as Admin".localized(), message: nil, preferredStyle: .alert)
+            self.alert = UIAlertController(title:"Access Admin Features".localized(), message: nil, preferredStyle: .alert)
             if type == "internal" {
-                self.alert = UIAlertController(title: "Login as Internal Team".localized(), message: nil, preferredStyle: .alert)
+                self.alert = UIAlertController(title: "Access Internal Features".localized(), message: nil, preferredStyle: .alert)
             }
             self.textFields.removeAll()
             self.alert?.addTextField{ (texfield) in
-                texfield.placeholder = "Password"
+                texfield.placeholder = "Password".localized()
                 texfield.isSecureTextEntry = true
                 texfield.addPadding(.right(40))
                 texfield.addTarget(self, action: #selector(self.alertTextFieldDidChange(_:)), for: UIControl.Event.editingChanged)
@@ -469,7 +469,7 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                 buttonHideUnhide.tintColor = .black
                 buttonHideUnhide.addTarget(self, action: #selector(self.showPassword), for: .touchUpInside)
             }
-            let submitAction = UIAlertAction(title: "Sign In".localized(), style: .default, handler: { (action) -> Void in
+            let submitAction = UIAlertAction(title: "Login".localized(), style: .default, handler: { (action) -> Void in
                 let textField = self.alert?.textFields![0]
                 if !CheckConnection.isConnectedToNetwork()  || API.nGetCLXConnState() == 0 {
                     let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))

appbuilder-ios/NexilisLite/NexilisLite/Resource/Palio.storyboard

@@ -944,6 +944,7 @@
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="descField" destination="nim-58-zjc" id="zth-t5-Han"/>
                         <outlet property="passwordField" destination="Hor-5y-mXt" id="a2P-Nb-M0P"/>
                         <outlet property="showPasswordButton" destination="ytt-6A-LrS" id="hG3-NY-3cH"/>
                         <outlet property="usernameField" destination="XNI-ec-RQS" id="dhB-Ay-LTJ"/>

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

@@ -72,8 +72,8 @@
 "Motorbike" = "Motor";
 "eBike" = "Sepeda";
 "Login as Admin / Internal" = "Masuk sebagai Admin / Internal";
-"Change Admin / Internal Password" = "Ganti Sandi Admin / Internal";
-"Change Device" = "Ganti Perangkat";
+"Change Admin / Internal Password" = "Ubah Sandi Admin / Internal";
+"Change Device" = "Ubah Perangkat";
 "Change Language" = "Ubah Bahasa";
 "Incoming Message(s)" = "Pesan Masuk";
 "Incoming Call(s)" = "Panggilan Masuk";
@@ -83,11 +83,11 @@
 "Version" = "Versi";
 "Powered by Qmera" = "Dipersembahkan oleh Qmera";
 "Powered by Nexilis" = "Dipersembahkan oleh Nexilis";
-"Sign-Up (Change profile)" = "Daftar (Ganti Profil)";
-"Change Profile" = "Ganti Profil";
-"Sign-In (Change Device)" = "Masuk (Ganti Perangkat)";
+"Sign-Up (Change profile)" = "Daftar (Ubah Profil)";
+"Change Profile" = "Ubah Profil";
+"Sign-In (Change Device)" = "Masuk (Ubah Perangkat)";
 "Successfully Logout" = "Berhasil Keluar";
-"Successfully changed device" = "Berhasil masuk/ganti perangkat";
+"Successfully changed device" = "Berhasil masuk/ubah perangkat";
 "Successfully downloaded" = "Berhasil diunduh ke galeri";
 "Logout" = "Keluar";
 "Are you sure want to logout?" = "Apakah anda ingin keluar?";
@@ -120,3 +120,13 @@
 "You were deleted this message" = "Anda telah menghapus pesan ini";
 "This message was deleted" = "Pesan ini telah dihapus";
 "Are you sure to unfriend" = "Apakah Anda yakin membatalkan pertemanan dengan";
+"Back" = "Kembali";
+"Login" = "Masuk";
+"Your Nickname" = "Nama Pengguna";
+"Password" = "Kata Sandi";
+"Submit" = "Kirim";
+"Username" = "Nama Pengguna";
+"Please enter your desired Username and Password" = "Silakan masukkan Nama Pengguna dan Kata Sandi yang Anda inginkan";
+"Access Admin / Internal Features" = "Akses Fitur Admin / Internal";
+"Access Admin Features" = "Akses Fitur Admin";
+"Access Internal Features" = "Akses Fitur Internal";

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

@@ -25,12 +25,14 @@ public class ChangeDeviceViewController: UIViewController {
             self.view.backgroundColor = UIColor.init(patternImage: image!)
         }
 
-        self.title = "Change Device".localized()
+        self.title = "Login".localized()
         navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Submit".localized(), style: .plain, target: self, action: #selector(didTapSubmit(sender:)))
         
         passwordField.addPadding(.right(40))
         passwordField.isSecureTextEntry = true
         showPasswordButton.setImage(UIImage(systemName: "eye.slash.fill"), for: .normal)
+        usernameField.placeholder = "Your Nickname".localized()
+        passwordField.placeholder = "Password".localized()
         
         showPasswordButton.addTarget(self, action: #selector(showPassword), for: .touchUpInside)
         

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

@@ -13,6 +13,7 @@ public class ChangeNamePassswordViewController: UIViewController {
     @IBOutlet weak var usernameField: UITextField!
     @IBOutlet weak var passwordField: UITextField!
     @IBOutlet weak var showPasswordButton: UIButton!
+    @IBOutlet weak var descField: UILabel!
     
     public var fromSetting = false
     public var isSuccess: (() -> ())?
@@ -34,15 +35,18 @@ public class ChangeNamePassswordViewController: UIViewController {
         if !fromSetting {
             let attributes = [NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: 16.0), NSAttributedString.Key.foregroundColor: UIColor.white]
             self.navigationController?.navigationBar.titleTextAttributes = attributes
-            navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(didTapExit(sender:)))
+            navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Cancel".localized(), style: .plain, target: self, action: #selector(didTapExit(sender:)))
         }
-        navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .save, target: self, action: #selector(didTapSave(sender:)))
+        navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Save".localized(), style: .plain, target: self, action: #selector(didTapSave(sender:)))
         
         passwordField.addPadding(.right(40))
         passwordField.isSecureTextEntry = true
         showPasswordButton.setImage(UIImage(systemName: "eye.slash.fill"), for: .normal)
         
         showPasswordButton.addTarget(self, action: #selector(showPassword), for: .touchUpInside)
+        usernameField.placeholder = "Username".localized()
+        passwordField.placeholder = "Password".localized()
+        descField.text = "Please enter your desired Username and Password".localized()
         
         let tapGesture = UITapGestureRecognizer(target: self, action: #selector(dismissKeyboard))
         tapGesture.cancelsTouchesInView = false