From d7aef032562eeeac0e27ca4d98ce1a60b7b8eb70 Mon Sep 17 00:00:00 2001 From: Oleg Kolomyitesv Date: Thu, 10 Jan 2019 11:41:53 +0300 Subject: [PATCH 01/14] [BP-243] WalletRename storyboard constraints were improved --- .../WalletRename/WalletRename.storyboard | 55 +++++++++---------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/App/Modules/WalletRename/WalletRename.storyboard b/App/Modules/WalletRename/WalletRename.storyboard index 522a7a2a..4643c2d0 100644 --- a/App/Modules/WalletRename/WalletRename.storyboard +++ b/App/Modules/WalletRename/WalletRename.storyboard @@ -4,6 +4,7 @@ + @@ -17,40 +18,38 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + From be2843a488c3d893b1e6e64866857d58a7df6c23 Mon Sep 17 00:00:00 2001 From: Oleg Kolomyitesv Date: Thu, 10 Jan 2019 12:12:28 +0300 Subject: [PATCH 02/14] [BP-243] WalletRename.strings file was added --- .../WalletRename/RenameViewController.swift | 14 ++++++++++++-- App/Modules/WalletRename/WalletRename.strings | 10 ++++++++++ BankexWallet.xcodeproj/project.pbxproj | 4 ++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 App/Modules/WalletRename/WalletRename.strings diff --git a/App/Modules/WalletRename/RenameViewController.swift b/App/Modules/WalletRename/RenameViewController.swift index 6a3bc25c..0d5f22f6 100644 --- a/App/Modules/WalletRename/RenameViewController.swift +++ b/App/Modules/WalletRename/RenameViewController.swift @@ -34,13 +34,13 @@ class RenameViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() - let rightBarButton = UIBarButtonItem(title: NSLocalizedString("Save", comment: ""), style: .plain, target: self, action: #selector(self.saveWalletName)) + let rightBarButton = UIBarButtonItem(title: LocalizedStrings.save, style: .plain, target: self, action: #selector(self.saveWalletName)) navigationItem.setRightBarButton(rightBarButton, animated: false) } func addCancelButtonIfNeed() { let cancel = UIButton(type: .system) - cancel.setTitle("Cancel", for: .normal) + cancel.setTitle(LocalizedStrings.cancel, for: .normal) cancel.setTitleColor(UIColor.mainColor, for: .normal) cancel.titleLabel?.font = UIFont.systemFont(ofSize: 17) cancel.addTarget(self, action: #selector(fadeOut), for: .touchUpInside) @@ -95,3 +95,13 @@ class RenameViewController: BaseViewController { } } + + +private extension RenameViewController { + + struct LocalizedStrings { + static let save = NSLocalizedString("SaveBarButtonTitle", tableName: "WalletRename", comment: "") + static let cancel = NSLocalizedString("CancelBarButtonTitle", tableName: "WalletRename", comment: "") + } + +} diff --git a/App/Modules/WalletRename/WalletRename.strings b/App/Modules/WalletRename/WalletRename.strings new file mode 100644 index 00000000..ecf2e5e7 --- /dev/null +++ b/App/Modules/WalletRename/WalletRename.strings @@ -0,0 +1,10 @@ +/* + WalletRename.strings + BankexWallet + + Created by Oleg Kolomyitsev on 10/01/2019. + Copyright © 2019 BANKEX Foundation. All rights reserved. +*/ + +"SaveBarButtonTitle" = "Save"; +"CancelBarButtonTitle" = "Cancel"; diff --git a/BankexWallet.xcodeproj/project.pbxproj b/BankexWallet.xcodeproj/project.pbxproj index 42ffceae..f2b15483 100644 --- a/BankexWallet.xcodeproj/project.pbxproj +++ b/BankexWallet.xcodeproj/project.pbxproj @@ -242,6 +242,7 @@ 92BCEDEA21D0D805002264FE /* TransactionDetailsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92BCEDE921D0D805002264FE /* TransactionDetailsService.swift */; }; 92BCEDEC21D0E23D002264FE /* TransactionDetails.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92BCEDEB21D0E23D002264FE /* TransactionDetails.swift */; }; 92DF231521D3D65C00AF00A0 /* SFSafariViewController+AssetManagement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92DF231421D3D65C00AF00A0 /* SFSafariViewController+AssetManagement.swift */; }; + 92E27B1321E7402B0033D214 /* WalletRename.strings in Resources */ = {isa = PBXBuildFile; fileRef = 92E27B1221E7402B0033D214 /* WalletRename.strings */; }; B81B598E56469045FD5A9424 /* Pods_BankexWalletUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64A16C3A5FF4B56B886DA004 /* Pods_BankexWalletUITests.framework */; }; BC001E220296F73719F0697F /* Pods_Wallet_Widget.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C33ADE69F5E6B37793B41AB /* Pods_Wallet_Widget.framework */; }; C7B75CCA6F60C9EB0D8D5C74 /* Pods_BankexWallet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D481374BDCC0F5EA10FEDC13 /* Pods_BankexWallet.framework */; }; @@ -570,6 +571,7 @@ 92BCEDE921D0D805002264FE /* TransactionDetailsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionDetailsService.swift; sourceTree = ""; }; 92BCEDEB21D0E23D002264FE /* TransactionDetails.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionDetails.swift; sourceTree = ""; }; 92DF231421D3D65C00AF00A0 /* SFSafariViewController+AssetManagement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SFSafariViewController+AssetManagement.swift"; sourceTree = ""; }; + 92E27B1221E7402B0033D214 /* WalletRename.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = WalletRename.strings; sourceTree = ""; }; BD1E76CD13960E44B2411D0D /* Pods-BankexWalletUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BankexWalletUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BankexWalletUITests/Pods-BankexWalletUITests.debug.xcconfig"; sourceTree = ""; }; CD8DBF0DC86534920BCAE980 /* Pods-BankexWalletTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BankexWalletTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-BankexWalletTests/Pods-BankexWalletTests.release.xcconfig"; sourceTree = ""; }; CE3C7F6D77310F0641F1B97E /* Pods-Wallet Widget.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Wallet Widget.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Wallet Widget/Pods-Wallet Widget.debug.xcconfig"; sourceTree = ""; }; @@ -950,6 +952,7 @@ isa = PBXGroup; children = ( 71EB27A421D4CBEF00B9EE30 /* WalletRename.storyboard */, + 92E27B1221E7402B0033D214 /* WalletRename.strings */, 86BE227D2161895C00C1B18D /* RenameViewController.swift */, ); path = WalletRename; @@ -1814,6 +1817,7 @@ 71155E7421B4F3F700ED7B4E /* AssetManagementEthFailure.xcassets in Resources */, 71EB27A821D5001B00B9EE30 /* NetworkAdd.storyboard in Resources */, 86D7FB8721495AA0008245DE /* PlaceholderCell.xib in Resources */, + 92E27B1321E7402B0033D214 /* WalletRename.strings in Resources */, 7185063021E61A1B00CA204F /* TransactionProcessing.storyboard in Resources */, 714B5ADB21CBBBD400CA729A /* TransactionDetails.strings in Resources */, 71EB27B421D5FAB200B9EE30 /* ContactAdd.storyboard in Resources */, From b9f54b36cdde4f32e91973ef12a79606bd935f86 Mon Sep 17 00:00:00 2001 From: Oleg Kolomyitesv Date: Thu, 10 Jan 2019 12:44:53 +0300 Subject: [PATCH 03/14] [BP-243] UINavigationItem was added to storyboard --- .../WalletRename/RenameViewController.swift | 7 +++++-- .../WalletRename/WalletRename.storyboard | 17 +++++++++++++---- App/Modules/WalletRename/WalletRename.strings | 1 + 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/App/Modules/WalletRename/RenameViewController.swift b/App/Modules/WalletRename/RenameViewController.swift index 0d5f22f6..e9672b91 100644 --- a/App/Modules/WalletRename/RenameViewController.swift +++ b/App/Modules/WalletRename/RenameViewController.swift @@ -16,6 +16,7 @@ protocol RenameViewControllerDelegate:class { class RenameViewController: BaseViewController { @IBOutlet weak var nameWalletTF:UITextField! + @IBOutlet var saveBarButtonItem: UIBarButtonItem! var selectedWalletName:String! let service = HDWalletServiceImplementation() @@ -34,8 +35,9 @@ class RenameViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() - let rightBarButton = UIBarButtonItem(title: LocalizedStrings.save, style: .plain, target: self, action: #selector(self.saveWalletName)) - navigationItem.setRightBarButton(rightBarButton, animated: false) + + title = LocalizedStrings.title + saveBarButtonItem.title = LocalizedStrings.save } func addCancelButtonIfNeed() { @@ -100,6 +102,7 @@ class RenameViewController: BaseViewController { private extension RenameViewController { struct LocalizedStrings { + static let title = NSLocalizedString("Title", tableName: "WalletRename", comment: "") static let save = NSLocalizedString("SaveBarButtonTitle", tableName: "WalletRename", comment: "") static let cancel = NSLocalizedString("CancelBarButtonTitle", tableName: "WalletRename", comment: "") } diff --git a/App/Modules/WalletRename/WalletRename.storyboard b/App/Modules/WalletRename/WalletRename.storyboard index 4643c2d0..fd44d18a 100644 --- a/App/Modules/WalletRename/WalletRename.storyboard +++ b/App/Modules/WalletRename/WalletRename.storyboard @@ -13,13 +13,13 @@ - + - + - + - + @@ -52,8 +52,17 @@ + + + + + + + + + diff --git a/App/Modules/WalletRename/WalletRename.strings b/App/Modules/WalletRename/WalletRename.strings index ecf2e5e7..092aea9c 100644 --- a/App/Modules/WalletRename/WalletRename.strings +++ b/App/Modules/WalletRename/WalletRename.strings @@ -6,5 +6,6 @@ Copyright © 2019 BANKEX Foundation. All rights reserved. */ +"Title" = "Rename Wallet"; "SaveBarButtonTitle" = "Save"; "CancelBarButtonTitle" = "Cancel"; From 257b4de22d96f531751ddd0c3e22cf1c58af14a6 Mon Sep 17 00:00:00 2001 From: Oleg Kolomyitesv Date: Thu, 10 Jan 2019 15:23:07 +0300 Subject: [PATCH 04/14] [BP-243] Storyboard text localisation from code was added --- App/Modules/WalletRename/RenameViewController.swift | 8 ++++++-- App/Modules/WalletRename/WalletRename.storyboard | 1 + App/Modules/WalletRename/WalletRename.strings | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/App/Modules/WalletRename/RenameViewController.swift b/App/Modules/WalletRename/RenameViewController.swift index e9672b91..00dc6769 100644 --- a/App/Modules/WalletRename/RenameViewController.swift +++ b/App/Modules/WalletRename/RenameViewController.swift @@ -15,7 +15,8 @@ protocol RenameViewControllerDelegate:class { class RenameViewController: BaseViewController { - @IBOutlet weak var nameWalletTF:UITextField! + @IBOutlet var nameLabel: UILabel! + @IBOutlet var nameWalletTF: UITextField! @IBOutlet var saveBarButtonItem: UIBarButtonItem! var selectedWalletName:String! @@ -38,6 +39,8 @@ class RenameViewController: BaseViewController { title = LocalizedStrings.title saveBarButtonItem.title = LocalizedStrings.save + nameLabel.text = LocalizedStrings.nameLabelTitle + nameWalletTF.placeholder = LocalizedStrings.nameTextFieldPlaceholder } func addCancelButtonIfNeed() { @@ -98,13 +101,14 @@ class RenameViewController: BaseViewController { } - private extension RenameViewController { struct LocalizedStrings { static let title = NSLocalizedString("Title", tableName: "WalletRename", comment: "") static let save = NSLocalizedString("SaveBarButtonTitle", tableName: "WalletRename", comment: "") static let cancel = NSLocalizedString("CancelBarButtonTitle", tableName: "WalletRename", comment: "") + static let nameLabelTitle = NSLocalizedString("WalletNameLabelTitle", tableName: "WalletRename", comment: "") + static let nameTextFieldPlaceholder = NSLocalizedString("WalletNameTextFieldPlaceholder", tableName: "WalletRename", comment: "") } } diff --git a/App/Modules/WalletRename/WalletRename.storyboard b/App/Modules/WalletRename/WalletRename.storyboard index fd44d18a..2f74b8a7 100644 --- a/App/Modules/WalletRename/WalletRename.storyboard +++ b/App/Modules/WalletRename/WalletRename.storyboard @@ -61,6 +61,7 @@ + diff --git a/App/Modules/WalletRename/WalletRename.strings b/App/Modules/WalletRename/WalletRename.strings index 092aea9c..a5d0bcbf 100644 --- a/App/Modules/WalletRename/WalletRename.strings +++ b/App/Modules/WalletRename/WalletRename.strings @@ -9,3 +9,6 @@ "Title" = "Rename Wallet"; "SaveBarButtonTitle" = "Save"; "CancelBarButtonTitle" = "Cancel"; +"WalletNameLabelTitle" = "Name"; +"WalletNameTextFieldPlaceholder" = "Wallet Name"; + From 9097310b864adcd3c4ee1af68f7d237847555bcb Mon Sep 17 00:00:00 2001 From: Oleg Kolomyitesv Date: Fri, 11 Jan 2019 12:43:42 +0300 Subject: [PATCH 05/14] [BP-243] RootView layoutMargins was set to default, separator trailing constraint was attached to superview, titleLabel numberOfLines was set to zero in WalletRename storyboard --- App/Modules/WalletRename/WalletRename.storyboard | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/App/Modules/WalletRename/WalletRename.storyboard b/App/Modules/WalletRename/WalletRename.storyboard index 2f74b8a7..ea0d2ec2 100644 --- a/App/Modules/WalletRename/WalletRename.storyboard +++ b/App/Modules/WalletRename/WalletRename.storyboard @@ -19,16 +19,16 @@ - + - - + - + - + - From 40be329f74f9648a78b87e83f3374a96c09080fc Mon Sep 17 00:00:00 2001 From: Oleg Kolomyitesv Date: Fri, 11 Jan 2019 13:20:31 +0300 Subject: [PATCH 06/14] [BP-243] SystemBarButtonItems were used --- App/Modules/WalletRename/RenameViewController.swift | 10 +--------- App/Modules/WalletRename/WalletRename.storyboard | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/App/Modules/WalletRename/RenameViewController.swift b/App/Modules/WalletRename/RenameViewController.swift index 00dc6769..cc781f61 100644 --- a/App/Modules/WalletRename/RenameViewController.swift +++ b/App/Modules/WalletRename/RenameViewController.swift @@ -38,18 +38,12 @@ class RenameViewController: BaseViewController { super.viewDidLoad() title = LocalizedStrings.title - saveBarButtonItem.title = LocalizedStrings.save nameLabel.text = LocalizedStrings.nameLabelTitle nameWalletTF.placeholder = LocalizedStrings.nameTextFieldPlaceholder } func addCancelButtonIfNeed() { - let cancel = UIButton(type: .system) - cancel.setTitle(LocalizedStrings.cancel, for: .normal) - cancel.setTitleColor(UIColor.mainColor, for: .normal) - cancel.titleLabel?.font = UIFont.systemFont(ofSize: 17) - cancel.addTarget(self, action: #selector(fadeOut), for: .touchUpInside) - navigationItem.leftBarButtonItem = UIBarButtonItem(customView: cancel) + navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(fadeOut)) } @objc func fadeOut() { @@ -105,8 +99,6 @@ private extension RenameViewController { struct LocalizedStrings { static let title = NSLocalizedString("Title", tableName: "WalletRename", comment: "") - static let save = NSLocalizedString("SaveBarButtonTitle", tableName: "WalletRename", comment: "") - static let cancel = NSLocalizedString("CancelBarButtonTitle", tableName: "WalletRename", comment: "") static let nameLabelTitle = NSLocalizedString("WalletNameLabelTitle", tableName: "WalletRename", comment: "") static let nameTextFieldPlaceholder = NSLocalizedString("WalletNameTextFieldPlaceholder", tableName: "WalletRename", comment: "") } diff --git a/App/Modules/WalletRename/WalletRename.storyboard b/App/Modules/WalletRename/WalletRename.storyboard index ea0d2ec2..44a7583f 100644 --- a/App/Modules/WalletRename/WalletRename.storyboard +++ b/App/Modules/WalletRename/WalletRename.storyboard @@ -52,7 +52,7 @@ - + From b2b947683d569645b280400088861d439bde655b Mon Sep 17 00:00:00 2001 From: Oleg Kolomyitesv Date: Fri, 11 Jan 2019 15:04:29 +0300 Subject: [PATCH 07/14] [BP-243] Unnecessary localised strings were removed --- App/Modules/WalletRename/WalletRename.strings | 2 -- 1 file changed, 2 deletions(-) diff --git a/App/Modules/WalletRename/WalletRename.strings b/App/Modules/WalletRename/WalletRename.strings index a5d0bcbf..d3db91f5 100644 --- a/App/Modules/WalletRename/WalletRename.strings +++ b/App/Modules/WalletRename/WalletRename.strings @@ -7,8 +7,6 @@ */ "Title" = "Rename Wallet"; -"SaveBarButtonTitle" = "Save"; -"CancelBarButtonTitle" = "Cancel"; "WalletNameLabelTitle" = "Name"; "WalletNameTextFieldPlaceholder" = "Wallet Name"; From f4e81bed1f39f6af63d2ce96dc4c39132de0e41a Mon Sep 17 00:00:00 2001 From: Oleg Kolomyitesv Date: Thu, 10 Jan 2019 11:41:53 +0300 Subject: [PATCH 08/14] [BP-243] WalletRename storyboard constraints were improved --- .../WalletRename/WalletRename.storyboard | 55 +++++++++---------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/App/Modules/WalletRename/WalletRename.storyboard b/App/Modules/WalletRename/WalletRename.storyboard index 522a7a2a..4643c2d0 100644 --- a/App/Modules/WalletRename/WalletRename.storyboard +++ b/App/Modules/WalletRename/WalletRename.storyboard @@ -4,6 +4,7 @@ + @@ -17,40 +18,38 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + From c278d761fe16b2e26a1f2c904842358b3fa5f6b8 Mon Sep 17 00:00:00 2001 From: Oleg Kolomyitesv Date: Thu, 10 Jan 2019 12:12:28 +0300 Subject: [PATCH 09/14] [BP-243] WalletRename.strings file was added --- .../WalletRename/RenameViewController.swift | 14 ++++++++++++-- App/Modules/WalletRename/WalletRename.strings | 10 ++++++++++ BankexWallet.xcodeproj/project.pbxproj | 4 ++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 App/Modules/WalletRename/WalletRename.strings diff --git a/App/Modules/WalletRename/RenameViewController.swift b/App/Modules/WalletRename/RenameViewController.swift index 6a3bc25c..0d5f22f6 100644 --- a/App/Modules/WalletRename/RenameViewController.swift +++ b/App/Modules/WalletRename/RenameViewController.swift @@ -34,13 +34,13 @@ class RenameViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() - let rightBarButton = UIBarButtonItem(title: NSLocalizedString("Save", comment: ""), style: .plain, target: self, action: #selector(self.saveWalletName)) + let rightBarButton = UIBarButtonItem(title: LocalizedStrings.save, style: .plain, target: self, action: #selector(self.saveWalletName)) navigationItem.setRightBarButton(rightBarButton, animated: false) } func addCancelButtonIfNeed() { let cancel = UIButton(type: .system) - cancel.setTitle("Cancel", for: .normal) + cancel.setTitle(LocalizedStrings.cancel, for: .normal) cancel.setTitleColor(UIColor.mainColor, for: .normal) cancel.titleLabel?.font = UIFont.systemFont(ofSize: 17) cancel.addTarget(self, action: #selector(fadeOut), for: .touchUpInside) @@ -95,3 +95,13 @@ class RenameViewController: BaseViewController { } } + + +private extension RenameViewController { + + struct LocalizedStrings { + static let save = NSLocalizedString("SaveBarButtonTitle", tableName: "WalletRename", comment: "") + static let cancel = NSLocalizedString("CancelBarButtonTitle", tableName: "WalletRename", comment: "") + } + +} diff --git a/App/Modules/WalletRename/WalletRename.strings b/App/Modules/WalletRename/WalletRename.strings new file mode 100644 index 00000000..ecf2e5e7 --- /dev/null +++ b/App/Modules/WalletRename/WalletRename.strings @@ -0,0 +1,10 @@ +/* + WalletRename.strings + BankexWallet + + Created by Oleg Kolomyitsev on 10/01/2019. + Copyright © 2019 BANKEX Foundation. All rights reserved. +*/ + +"SaveBarButtonTitle" = "Save"; +"CancelBarButtonTitle" = "Cancel"; diff --git a/BankexWallet.xcodeproj/project.pbxproj b/BankexWallet.xcodeproj/project.pbxproj index b58434fa..bbd960fe 100644 --- a/BankexWallet.xcodeproj/project.pbxproj +++ b/BankexWallet.xcodeproj/project.pbxproj @@ -248,6 +248,7 @@ 92BCEDEA21D0D805002264FE /* TransactionDetailsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92BCEDE921D0D805002264FE /* TransactionDetailsService.swift */; }; 92BCEDEC21D0E23D002264FE /* TransactionDetails.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92BCEDEB21D0E23D002264FE /* TransactionDetails.swift */; }; 92DF231521D3D65C00AF00A0 /* SFSafariViewController+AssetManagement.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92DF231421D3D65C00AF00A0 /* SFSafariViewController+AssetManagement.swift */; }; + 92E27B1321E7402B0033D214 /* WalletRename.strings in Resources */ = {isa = PBXBuildFile; fileRef = 92E27B1221E7402B0033D214 /* WalletRename.strings */; }; B81B598E56469045FD5A9424 /* Pods_BankexWalletUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 64A16C3A5FF4B56B886DA004 /* Pods_BankexWalletUITests.framework */; }; BC001E220296F73719F0697F /* Pods_Wallet_Widget.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C33ADE69F5E6B37793B41AB /* Pods_Wallet_Widget.framework */; }; C7B75CCA6F60C9EB0D8D5C74 /* Pods_BankexWallet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D481374BDCC0F5EA10FEDC13 /* Pods_BankexWallet.framework */; }; @@ -580,6 +581,7 @@ 92BCEDE921D0D805002264FE /* TransactionDetailsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionDetailsService.swift; sourceTree = ""; }; 92BCEDEB21D0E23D002264FE /* TransactionDetails.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionDetails.swift; sourceTree = ""; }; 92DF231421D3D65C00AF00A0 /* SFSafariViewController+AssetManagement.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SFSafariViewController+AssetManagement.swift"; sourceTree = ""; }; + 92E27B1221E7402B0033D214 /* WalletRename.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = WalletRename.strings; sourceTree = ""; }; BD1E76CD13960E44B2411D0D /* Pods-BankexWalletUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BankexWalletUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BankexWalletUITests/Pods-BankexWalletUITests.debug.xcconfig"; sourceTree = ""; }; CD8DBF0DC86534920BCAE980 /* Pods-BankexWalletTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BankexWalletTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-BankexWalletTests/Pods-BankexWalletTests.release.xcconfig"; sourceTree = ""; }; CE3C7F6D77310F0641F1B97E /* Pods-Wallet Widget.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Wallet Widget.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Wallet Widget/Pods-Wallet Widget.debug.xcconfig"; sourceTree = ""; }; @@ -1046,6 +1048,7 @@ isa = PBXGroup; children = ( 71EB27A421D4CBEF00B9EE30 /* WalletRename.storyboard */, + 92E27B1221E7402B0033D214 /* WalletRename.strings */, 86BE227D2161895C00C1B18D /* RenameViewController.swift */, ); path = WalletRename; @@ -1861,6 +1864,7 @@ 71155E7421B4F3F700ED7B4E /* AssetManagementEthFailure.xcassets in Resources */, 71EB27A821D5001B00B9EE30 /* NetworkAdd.storyboard in Resources */, 86D7FB8721495AA0008245DE /* PlaceholderCell.xib in Resources */, + 92E27B1321E7402B0033D214 /* WalletRename.strings in Resources */, 7185063021E61A1B00CA204F /* TransactionProcessing.storyboard in Resources */, 714B5ADB21CBBBD400CA729A /* TransactionDetails.strings in Resources */, 71EB27B421D5FAB200B9EE30 /* ContactAdd.storyboard in Resources */, From a5c10ba072bed1b5c6ec9f058dc743faa40a71e3 Mon Sep 17 00:00:00 2001 From: Oleg Kolomyitesv Date: Thu, 10 Jan 2019 12:44:53 +0300 Subject: [PATCH 10/14] [BP-243] UINavigationItem was added to storyboard --- .../WalletRename/RenameViewController.swift | 7 +++++-- .../WalletRename/WalletRename.storyboard | 17 +++++++++++++---- App/Modules/WalletRename/WalletRename.strings | 1 + 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/App/Modules/WalletRename/RenameViewController.swift b/App/Modules/WalletRename/RenameViewController.swift index 0d5f22f6..e9672b91 100644 --- a/App/Modules/WalletRename/RenameViewController.swift +++ b/App/Modules/WalletRename/RenameViewController.swift @@ -16,6 +16,7 @@ protocol RenameViewControllerDelegate:class { class RenameViewController: BaseViewController { @IBOutlet weak var nameWalletTF:UITextField! + @IBOutlet var saveBarButtonItem: UIBarButtonItem! var selectedWalletName:String! let service = HDWalletServiceImplementation() @@ -34,8 +35,9 @@ class RenameViewController: BaseViewController { override func viewDidLoad() { super.viewDidLoad() - let rightBarButton = UIBarButtonItem(title: LocalizedStrings.save, style: .plain, target: self, action: #selector(self.saveWalletName)) - navigationItem.setRightBarButton(rightBarButton, animated: false) + + title = LocalizedStrings.title + saveBarButtonItem.title = LocalizedStrings.save } func addCancelButtonIfNeed() { @@ -100,6 +102,7 @@ class RenameViewController: BaseViewController { private extension RenameViewController { struct LocalizedStrings { + static let title = NSLocalizedString("Title", tableName: "WalletRename", comment: "") static let save = NSLocalizedString("SaveBarButtonTitle", tableName: "WalletRename", comment: "") static let cancel = NSLocalizedString("CancelBarButtonTitle", tableName: "WalletRename", comment: "") } diff --git a/App/Modules/WalletRename/WalletRename.storyboard b/App/Modules/WalletRename/WalletRename.storyboard index 4643c2d0..fd44d18a 100644 --- a/App/Modules/WalletRename/WalletRename.storyboard +++ b/App/Modules/WalletRename/WalletRename.storyboard @@ -13,13 +13,13 @@ - + - + - + - + @@ -52,8 +52,17 @@ + + + + + + + + + diff --git a/App/Modules/WalletRename/WalletRename.strings b/App/Modules/WalletRename/WalletRename.strings index ecf2e5e7..092aea9c 100644 --- a/App/Modules/WalletRename/WalletRename.strings +++ b/App/Modules/WalletRename/WalletRename.strings @@ -6,5 +6,6 @@ Copyright © 2019 BANKEX Foundation. All rights reserved. */ +"Title" = "Rename Wallet"; "SaveBarButtonTitle" = "Save"; "CancelBarButtonTitle" = "Cancel"; From 0bc47153045c2b48784486faaa896970c9bec697 Mon Sep 17 00:00:00 2001 From: Oleg Kolomyitesv Date: Thu, 10 Jan 2019 15:23:07 +0300 Subject: [PATCH 11/14] [BP-243] Storyboard text localisation from code was added --- App/Modules/WalletRename/RenameViewController.swift | 8 ++++++-- App/Modules/WalletRename/WalletRename.storyboard | 1 + App/Modules/WalletRename/WalletRename.strings | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/App/Modules/WalletRename/RenameViewController.swift b/App/Modules/WalletRename/RenameViewController.swift index e9672b91..00dc6769 100644 --- a/App/Modules/WalletRename/RenameViewController.swift +++ b/App/Modules/WalletRename/RenameViewController.swift @@ -15,7 +15,8 @@ protocol RenameViewControllerDelegate:class { class RenameViewController: BaseViewController { - @IBOutlet weak var nameWalletTF:UITextField! + @IBOutlet var nameLabel: UILabel! + @IBOutlet var nameWalletTF: UITextField! @IBOutlet var saveBarButtonItem: UIBarButtonItem! var selectedWalletName:String! @@ -38,6 +39,8 @@ class RenameViewController: BaseViewController { title = LocalizedStrings.title saveBarButtonItem.title = LocalizedStrings.save + nameLabel.text = LocalizedStrings.nameLabelTitle + nameWalletTF.placeholder = LocalizedStrings.nameTextFieldPlaceholder } func addCancelButtonIfNeed() { @@ -98,13 +101,14 @@ class RenameViewController: BaseViewController { } - private extension RenameViewController { struct LocalizedStrings { static let title = NSLocalizedString("Title", tableName: "WalletRename", comment: "") static let save = NSLocalizedString("SaveBarButtonTitle", tableName: "WalletRename", comment: "") static let cancel = NSLocalizedString("CancelBarButtonTitle", tableName: "WalletRename", comment: "") + static let nameLabelTitle = NSLocalizedString("WalletNameLabelTitle", tableName: "WalletRename", comment: "") + static let nameTextFieldPlaceholder = NSLocalizedString("WalletNameTextFieldPlaceholder", tableName: "WalletRename", comment: "") } } diff --git a/App/Modules/WalletRename/WalletRename.storyboard b/App/Modules/WalletRename/WalletRename.storyboard index fd44d18a..2f74b8a7 100644 --- a/App/Modules/WalletRename/WalletRename.storyboard +++ b/App/Modules/WalletRename/WalletRename.storyboard @@ -61,6 +61,7 @@ + diff --git a/App/Modules/WalletRename/WalletRename.strings b/App/Modules/WalletRename/WalletRename.strings index 092aea9c..a5d0bcbf 100644 --- a/App/Modules/WalletRename/WalletRename.strings +++ b/App/Modules/WalletRename/WalletRename.strings @@ -9,3 +9,6 @@ "Title" = "Rename Wallet"; "SaveBarButtonTitle" = "Save"; "CancelBarButtonTitle" = "Cancel"; +"WalletNameLabelTitle" = "Name"; +"WalletNameTextFieldPlaceholder" = "Wallet Name"; + From 555a4068590bf3848018f9278a36f58fdbd14ec4 Mon Sep 17 00:00:00 2001 From: Oleg Kolomyitesv Date: Fri, 11 Jan 2019 12:43:42 +0300 Subject: [PATCH 12/14] [BP-243] RootView layoutMargins was set to default, separator trailing constraint was attached to superview, titleLabel numberOfLines was set to zero in WalletRename storyboard --- App/Modules/WalletRename/WalletRename.storyboard | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/App/Modules/WalletRename/WalletRename.storyboard b/App/Modules/WalletRename/WalletRename.storyboard index 2f74b8a7..ea0d2ec2 100644 --- a/App/Modules/WalletRename/WalletRename.storyboard +++ b/App/Modules/WalletRename/WalletRename.storyboard @@ -19,16 +19,16 @@ - + - - + - + - + - From 6afc8fd0844636ae445d3a7e4e3aee253d6ef4e2 Mon Sep 17 00:00:00 2001 From: Oleg Kolomyitesv Date: Fri, 11 Jan 2019 13:20:31 +0300 Subject: [PATCH 13/14] [BP-243] SystemBarButtonItems were used --- App/Modules/WalletRename/RenameViewController.swift | 10 +--------- App/Modules/WalletRename/WalletRename.storyboard | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/App/Modules/WalletRename/RenameViewController.swift b/App/Modules/WalletRename/RenameViewController.swift index 00dc6769..cc781f61 100644 --- a/App/Modules/WalletRename/RenameViewController.swift +++ b/App/Modules/WalletRename/RenameViewController.swift @@ -38,18 +38,12 @@ class RenameViewController: BaseViewController { super.viewDidLoad() title = LocalizedStrings.title - saveBarButtonItem.title = LocalizedStrings.save nameLabel.text = LocalizedStrings.nameLabelTitle nameWalletTF.placeholder = LocalizedStrings.nameTextFieldPlaceholder } func addCancelButtonIfNeed() { - let cancel = UIButton(type: .system) - cancel.setTitle(LocalizedStrings.cancel, for: .normal) - cancel.setTitleColor(UIColor.mainColor, for: .normal) - cancel.titleLabel?.font = UIFont.systemFont(ofSize: 17) - cancel.addTarget(self, action: #selector(fadeOut), for: .touchUpInside) - navigationItem.leftBarButtonItem = UIBarButtonItem(customView: cancel) + navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(fadeOut)) } @objc func fadeOut() { @@ -105,8 +99,6 @@ private extension RenameViewController { struct LocalizedStrings { static let title = NSLocalizedString("Title", tableName: "WalletRename", comment: "") - static let save = NSLocalizedString("SaveBarButtonTitle", tableName: "WalletRename", comment: "") - static let cancel = NSLocalizedString("CancelBarButtonTitle", tableName: "WalletRename", comment: "") static let nameLabelTitle = NSLocalizedString("WalletNameLabelTitle", tableName: "WalletRename", comment: "") static let nameTextFieldPlaceholder = NSLocalizedString("WalletNameTextFieldPlaceholder", tableName: "WalletRename", comment: "") } diff --git a/App/Modules/WalletRename/WalletRename.storyboard b/App/Modules/WalletRename/WalletRename.storyboard index ea0d2ec2..44a7583f 100644 --- a/App/Modules/WalletRename/WalletRename.storyboard +++ b/App/Modules/WalletRename/WalletRename.storyboard @@ -52,7 +52,7 @@ - + From 6eeb75b05f89d31b7e456958ff899ca54a334f08 Mon Sep 17 00:00:00 2001 From: Oleg Kolomyitesv Date: Fri, 11 Jan 2019 15:04:29 +0300 Subject: [PATCH 14/14] [BP-243] Unnecessary localised strings were removed --- App/Modules/WalletRename/WalletRename.strings | 2 -- 1 file changed, 2 deletions(-) diff --git a/App/Modules/WalletRename/WalletRename.strings b/App/Modules/WalletRename/WalletRename.strings index a5d0bcbf..d3db91f5 100644 --- a/App/Modules/WalletRename/WalletRename.strings +++ b/App/Modules/WalletRename/WalletRename.strings @@ -7,8 +7,6 @@ */ "Title" = "Rename Wallet"; -"SaveBarButtonTitle" = "Save"; -"CancelBarButtonTitle" = "Cancel"; "WalletNameLabelTitle" = "Name"; "WalletNameTextFieldPlaceholder" = "Wallet Name";