Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

autobackups ui tweaks #505

Merged
merged 1 commit into from
Jul 24, 2020
Merged

autobackups ui tweaks #505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MobileWallet/Common/Theme.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
2 changes: 1 addition & 1 deletion MobileWallet/Screens/Settings/SettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 4 additions & 0 deletions MobileWallet/UIElements/PasswordField/PasswordField.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand Down
4 changes: 2 additions & 2 deletions MobileWallet/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand Down