From 20d3912960d51cd8c040fa8dd950cebd6e46ac9b Mon Sep 17 00:00:00 2001 From: yare Date: Thu, 7 Jul 2022 15:48:41 +0545 Subject: [PATCH] new user text changed to new registration --- GME Remit.xcodeproj/project.pbxproj | 8 +- .../xcshareddata/xcschemes/GME Remit.xcscheme | 108 ++++++++++++++++++ .../ViewModel/SetupRecipientViewModel.swift | 6 +- .../Modules/SideMenu/SideMenu.storyboard | 66 ++++++++++- .../SideMenu/SideMenuViewController.swift | 23 ++++ .../bn.lproj/Localizable.strings | 2 +- .../en.lproj/Localizable.strings | 2 +- .../ja.lproj/Localizable.strings | 2 +- .../ne.lproj/Localizable.strings | 2 +- .../si.lproj/Localizable.strings | 2 +- .../vi-VN.lproj/Localizable.strings | 2 +- 11 files changed, 208 insertions(+), 15 deletions(-) create mode 100644 GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 2b3ef50b..239e60fb 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -7588,7 +7588,7 @@ CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 11; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 68KRG7GPAV; ENABLE_BITCODE = NO; @@ -7604,7 +7604,7 @@ "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", ); - MARKETING_VERSION = 1.3.2; + MARKETING_VERSION = 1.3.4; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--generate-entitlement-der"; OTHER_LDFLAGS = ( "$(OTHER_LDFLAGS)", @@ -7629,7 +7629,7 @@ CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 11; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 68KRG7GPAV; ENABLE_BITCODE = NO; @@ -7645,7 +7645,7 @@ "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", ); - MARKETING_VERSION = 1.3.2; + MARKETING_VERSION = 1.3.4; OTHER_LDFLAGS = ( "$(OTHER_LDFLAGS)", "-ObjC", diff --git a/GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme b/GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme new file mode 100644 index 00000000..b8eea3ab --- /dev/null +++ b/GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift index 27276a8a..6bf7534e 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift @@ -419,9 +419,9 @@ extension SetupRecipientViewModel: SetupRecipientViewModelInterface { selectedStateProvinceLinker.onNext(model) let count = model.districts?.count ?? 0 - if count != 0 { - selectedBranchLinker.onNext(nil) - } +// if count != 0 { +// selectedBranchLinker.onNext(nil) +// } selectedDistrictLinker.onNext(nil) case .district: diff --git a/GME Remit/Modules/SideMenu/SideMenu.storyboard b/GME Remit/Modules/SideMenu/SideMenu.storyboard index 6585dba1..c7de0e45 100644 --- a/GME Remit/Modules/SideMenu/SideMenu.storyboard +++ b/GME Remit/Modules/SideMenu/SideMenu.storyboard @@ -1,9 +1,9 @@ - + - + @@ -275,6 +275,66 @@ + @@ -414,7 +474,9 @@ + + diff --git a/GME Remit/Modules/SideMenu/SideMenuViewController.swift b/GME Remit/Modules/SideMenu/SideMenuViewController.swift index a227a00b..d1ec0800 100644 --- a/GME Remit/Modules/SideMenu/SideMenuViewController.swift +++ b/GME Remit/Modules/SideMenu/SideMenuViewController.swift @@ -13,6 +13,7 @@ import Localize_Swift import RxSwift import RxCocoa +import SafariServices protocol SideMenuDelegate: class { func didSelectMenu(_ viewController: UIViewController, didSelectMenu: SideMenuViewController.MenuType) @@ -67,6 +68,10 @@ class SideMenuViewController: UIViewController { @IBOutlet weak var logoutIconImageView: UIImageView! @IBOutlet weak var noticeButton: UIButton! + @IBOutlet weak var atmButton: UIButton! + + @IBOutlet weak var aboutJmeImageView: UIImageView! + weak var sideMenuDelegate: SideMenuDelegate? private let disposeBag = DisposeBag() @@ -158,10 +163,18 @@ class SideMenuViewController: UIViewController { self.sideMenuController?.hideLeftView() sideMenuDelegate?.didSelectMenu(self, didSelectMenu: .notice) } + + + @IBAction func atmButtonPressed(_ sender: Any) { + let urlString = "https://japanremit.com/document/Manual/JpPost.html" + showTutorial(url: urlString) + } + @IBAction func backButton(_ sender: UIButton) { self.sideMenuController?.hideLeftView(animated: true, completionHandler: nil) } + @IBAction func logout(_ sender: Any) { alertWithOkCancel( type: .normal, @@ -204,4 +217,14 @@ class SideMenuViewController: UIViewController { func getWithdrawNotificationName() -> Notification.Name { return Notification.Name.init(SideMenuNavigationNotifications.withdraw) } + + func showTutorial(url: String) { + if let url = URL(string: url) { + let config = SFSafariViewController.Configuration() + config.entersReaderIfAvailable = false + + let vc = SFSafariViewController(url: url, configuration: config) + present(vc, animated: true) + } + } } diff --git a/GME Remit/MultiLanguages/bn.lproj/Localizable.strings b/GME Remit/MultiLanguages/bn.lproj/Localizable.strings index eb3ba870..ad12ba06 100644 --- a/GME Remit/MultiLanguages/bn.lproj/Localizable.strings +++ b/GME Remit/MultiLanguages/bn.lproj/Localizable.strings @@ -1173,7 +1173,7 @@ "hassle_free_transfer_text"="ঝামেলা মুক্ত আপনার প্রিয়জনের কাছে অর্থ স্থানান্তর"; "connect_local_community_text"="স্থানীয় সম্প্রদায়ে সংযুক্ত"; "earn_reward_point_text"="পুরষ্কার পয়েন্ট উপার্জন করুন এবং অবাক উপহার পাবেন"; -"new_user_text"="নতুন ব্যবহারকারী"; +"new_user_text"="নতুন রেজিসট্রেশন"; "existing_jme_users_without_app_login"="অ্যাপ লগইন ছাড়াই বিদ্যমান জেএমই ব্যবহারকারীরা"; diff --git a/GME Remit/MultiLanguages/en.lproj/Localizable.strings b/GME Remit/MultiLanguages/en.lproj/Localizable.strings index 5a99579c..b0603f0a 100644 --- a/GME Remit/MultiLanguages/en.lproj/Localizable.strings +++ b/GME Remit/MultiLanguages/en.lproj/Localizable.strings @@ -1,7 +1,7 @@ "login_text" = "Login"; "tap_to_login_using_finger_text" = "Tap to login with fingerprint"; -"new_user_text" = "New User"; +"new_user_text" = "New Registration"; "hassle_free_transfer_text" = "Hassle free money transfer to your loved ones"; "connect_local_community_text" = "Connect to local community"; "earn_reward_point_text" = "Earn reward points and get surprise gifts"; diff --git a/GME Remit/MultiLanguages/ja.lproj/Localizable.strings b/GME Remit/MultiLanguages/ja.lproj/Localizable.strings index 85493254..5be3676a 100644 --- a/GME Remit/MultiLanguages/ja.lproj/Localizable.strings +++ b/GME Remit/MultiLanguages/ja.lproj/Localizable.strings @@ -1,7 +1,7 @@ "login_text" = "ログイン"; "tap_to_login_using_finger_text" = "指紋にてログインするためにタップしてください。"; -"new_user_text" = "新規ユーザー"; +"new_user_text" = "新規登録"; "hassle_free_transfer_text" = "大切な人にお金を送る"; "connect_local_community_text" = "地域社会とつながる"; "earn_reward_point_text" = "ポイントを貯めて、サプライズギフトをもらいましょう"; diff --git a/GME Remit/MultiLanguages/ne.lproj/Localizable.strings b/GME Remit/MultiLanguages/ne.lproj/Localizable.strings index a56b1d22..c08e7279 100644 --- a/GME Remit/MultiLanguages/ne.lproj/Localizable.strings +++ b/GME Remit/MultiLanguages/ne.lproj/Localizable.strings @@ -1179,7 +1179,7 @@ "hassle_free_transfer_text"="तपाईका प्रियजनहरूलाई परेशानीमुक्त पैसा स्थानान्तरण गर्नुहोस्"; "connect_local_community_text"="स्थानीय समुदायमा जडान गर्नुहोस्"; "earn_reward_point_text"="इनाम अंकहरू कमाउनुहोस् र अचम्मका उपहारहरू पाउनुहोस्"; -"new_user_text"="नयाँ प्रयोगकर्ता"; +"new_user_text"="नयाँ दर्ता"; "existing_jme_users_without_app_login"="अनुप्रयोग लगइन बिना JME प्रयोगकर्ता अवस्थित छ"; diff --git a/GME Remit/MultiLanguages/si.lproj/Localizable.strings b/GME Remit/MultiLanguages/si.lproj/Localizable.strings index 223480f0..e348caf5 100644 --- a/GME Remit/MultiLanguages/si.lproj/Localizable.strings +++ b/GME Remit/MultiLanguages/si.lproj/Localizable.strings @@ -459,7 +459,7 @@ "change_later_text" = "ඔබට පසුව ඔබේ කැමැත්ත වෙනස් කළ හැක"; // Splash Screen -"new_user_text" = "නව පරිශීලකයෙක්"; +"new_user_text" = "නව ලියාපදිංචිවීම"; "existing_jme_users_without_app_login" = "ඇප් එකට ලොගින් නොවී සිටින JME පරිශීලකයින්"; "earn_reward_point_text" = "ප්‍රසාද ලකුණු උපයන්න සහ අනපේක්ෂිත තෑගි ලබා ගන්න"; "connect_local_community_text" = "ප්‍රාදේශීය ප්‍රජාවට සම්බන්ධ වන්න"; diff --git a/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings b/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings index 471a3c56..f7e512d9 100644 --- a/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings +++ b/GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings @@ -1174,7 +1174,7 @@ Chúng tôi đang xác minh thông tin của bạn."; "hassle_free_transfer_text"="Chuyển tiền cho những người yêu thương của bạn"; "connect_local_community_text"="Kết nối đến cộng đồng địa phương"; "earn_reward_point_text"="Kiếm điểm thưởng và giành quà bất ngờ"; -"new_user_text"="Người dùng mới"; +"new_user_text"="Đăng kí mới"; "existing_jme_users_without_app_login"="Người dùng JME hiện tại không đăng nhập ứng dụng";