From a30960929996625ada16795547a56776e3ae72c4 Mon Sep 17 00:00:00 2001 From: SerhiiShovkoplias Date: Fri, 24 Jul 2020 16:14:59 +0300 Subject: [PATCH] tari-project/wallet-ios#500 tari-project/wallet-android#429 tari-project/wallet-ios#508 --- MobileWallet/Common/Theme.swift | 2 +- MobileWallet/Screens/Settings/SettingsViewController.swift | 2 +- MobileWallet/UIElements/PasswordField/PasswordField.swift | 4 ++++ MobileWallet/en.lproj/Localizable.strings | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/MobileWallet/Common/Theme.swift b/MobileWallet/Common/Theme.swift index 18ab1fe2..71661994 100644 --- a/MobileWallet/Common/Theme.swift +++ b/MobileWallet/Common/Theme.swift @@ -399,7 +399,7 @@ struct Fonts: Loopable { let settingsFillablePhraseViewDescription = UIFont.Avenir.medium.withSize(12.0) let settingsPasswordTitle = UIFont.Avenir.medium.withSize(13.0) - let settingsPassword = UIFont.Avenir.roman.withSize(14.0) + let settingsPasswordPlaceholder = UIFont.Avenir.roman.withSize(14.0) let settingsPasswordWarning = UIFont.Avenir.heavy.withSize(13.0) } diff --git a/MobileWallet/Screens/Settings/SettingsViewController.swift b/MobileWallet/Screens/Settings/SettingsViewController.swift index 836811e1..525b0840 100644 --- a/MobileWallet/Screens/Settings/SettingsViewController.swift +++ b/MobileWallet/Screens/Settings/SettingsViewController.swift @@ -72,7 +72,7 @@ class SettingsViewController: SettingsParentTableViewController { var rawValue: String { switch self { - case .backUpWallet: return NSLocalizedString("settings.item.backup_wallet", comment: "Settings view") + case .backUpWallet: return NSLocalizedString("settings.item.wallet_backups", comment: "Settings view") case .reportBug: return NSLocalizedString("settings.item.report_bug", comment: "Settings view") case .visitTari: return NSLocalizedString("settings.item.visit_tari", comment: "Settings view") diff --git a/MobileWallet/UIElements/PasswordField/PasswordField.swift b/MobileWallet/UIElements/PasswordField/PasswordField.swift index a0cff585..8b083d78 100644 --- a/MobileWallet/UIElements/PasswordField/PasswordField.swift +++ b/MobileWallet/UIElements/PasswordField/PasswordField.swift @@ -53,6 +53,10 @@ class PasswordField: UIView, UITextFieldDelegate { var placeholder: String? { didSet { + let attributes = [ + NSAttributedString.Key.font: Theme.shared.fonts.settingsPasswordPlaceholder + ] + textField.attributedPlaceholder = NSAttributedString(string: placeholder ?? "", attributes: attributes) textField.placeholder = placeholder } } diff --git a/MobileWallet/en.lproj/Localizable.strings b/MobileWallet/en.lproj/Localizable.strings index 5e5759e3..fb2b733e 100644 --- a/MobileWallet/en.lproj/Localizable.strings +++ b/MobileWallet/en.lproj/Localizable.strings @@ -104,7 +104,7 @@ "secure_backup.header" = "Secure your iCloud backup"; "secure_backup.header_description_part1" = "Ensure your wallet is safe even if your iCloud is compromised. Select a password you will remember or"; "secure_backup.header_description_part2" = " you will not be able to recover your wallet."; -"secure_backup.enter_password_field.title" = "Enter Password"; +"secure_backup.enter_password_field.title" = "Create a Password"; "secure_backup.enter_password_field.placeholder" = "Make it a strong one!"; "secure_backup.confirm_password_field.title" = "Confirm Password"; "secure_backup.confirm_password_field.placeholder" = "Let’s see it again"; @@ -124,7 +124,7 @@ "settings.last_successful_backup.with_param" = "Last successful backup: %@"; -"settings.item.backup_wallet" = "Back Up Wallet"; +"settings.item.wallet_backups" = "Wallet Backups"; "settings.item.contribute_to_tari" = "Contribute to Tari Aurora"; "settings.item.disclaimer" = "Disclaimer"; "settings.item.privacy_policy" = "Privacy Policy";