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

upgrade r.swift pod #7101

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

upgrade r.swift pod #7101

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
1 change: 1 addition & 0 deletions AlphaWallet/AppCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import AlphaWalletFoundation
import AlphaWalletLogger
import AlphaWalletTrackAPICalls
import AlphaWalletNotifications


class AppCoordinator: NSObject, Coordinator, ApplicationNavigatable {
private let navigationSubject = CurrentValueSubject<ApplicationNavigation, Never>(.onboarding)
Expand Down
2 changes: 1 addition & 1 deletion AlphaWallet/Features/FeaturesViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class FeaturesViewController: UIViewController {
private func configureViewController() {
addTableViewController()
addButton()
navigationItem.title = R.string.localizable.advancedSettingsFeaturesTitle(preferredLanguages: nil)
navigationItem.title = R.string.localizable.advancedSettingsFeaturesTitle()
}

private func addTableViewController() {
Expand Down
8 changes: 4 additions & 4 deletions AlphaWallet/Settings/ViewControllers/SaveCustomRpcBrowseViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ class SaveCustomRpcBrowseViewController: UIViewController {

private func configureAddNetworkButton() {
buttonsBar.configure()
buttonsBar.buttons[0].setTitle(R.string.localizable.addrpcServerSaveButtonTitle(preferredLanguages: nil), for: .normal)
addSaveButtonTarget(self, action: #selector(handleAddButtonAction(_:)))
buttonsBar.buttons[0].setTitle(R.string.localizable.addrpcServerSaveButtonTitle(), for: .normal)
addSaveButtonTarget(self, action: #selector(handleAddButtonAction(_:)))
enableAddFunction(false)

view.addSubview(footerView)
Expand Down Expand Up @@ -248,11 +248,11 @@ extension SaveCustomRpcBrowseViewController: HandleAddMultipleCustomRpcViewContr
tableViewController.tableView.reloadData()
var errorMessage: String = ""
if let failed: [CustomRPC] = failed as? [CustomRPC], !failed.isEmpty {
errorMessage = R.string.localizable.addMultipleCustomRpcError(preferredLanguages: nil)
errorMessage = R.string.localizable.addMultipleCustomRpcError()
reportFailures(customRpcs: failed)
}
if let duplicates: [CustomRPC] = duplicates as? [CustomRPC], !duplicates.isEmpty {
errorMessage = R.string.localizable.addMultipleCustomRpcError(preferredLanguages: nil)
errorMessage = R.string.localizable.addMultipleCustomRpcError()
}
if !errorMessage.isEmpty {
displayError(message: errorMessage)
Expand Down
2 changes: 1 addition & 1 deletion AlphaWallet/Settings/ViewControllers/SaveCustomRpcManualEntryViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class SaveCustomRpcManualEntryViewController: UIViewController, SaveCustomRpcHan
case .explorerEndpointInvalidField:
editView.explorerEndpointTextField.status = .error(R.string.localizable.addrpcServerBlockExplorerUrlError())
case .chainIDDuplicateField:
editView.chainIDTextField.status = .error(R.string.localizable.editCustomRPCChainIDErrorDuplicate(preferredLanguages: nil))
editView.chainIDTextField.status = .error(R.string.localizable.editCustomRPCChainIDErrorDuplicate())
}
}
editView.allTextFields.first(where: { !$0.statusLabel.text.isEmpty })?.becomeFirstResponder()
Expand Down
2 changes: 1 addition & 1 deletion AlphaWallet/Settings/Views/SaveCustomRpcManualEntryView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class SaveCustomRpcManualEntryView: UIView {

func configureView() {
buttonsBar.configure()
buttonsBar.buttons[0].setTitle(R.string.localizable.editCustomRPCSaveButtonTitle(preferredLanguages: nil), for: .normal)
buttonsBar.buttons[0].setTitle(R.string.localizable.editCustomRPCSaveButtonTitle(), for: .normal)
configureInputAccessoryView()
}

Expand Down
2 changes: 1 addition & 1 deletion Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ source 'https://cdn.cocoapods.org/'
target 'AlphaWallet' do
use_frameworks!
pod 'BigInt', '~> 3.1'
pod 'R.swift'
pod 'R.swift','7.3.2'
pod 'MBProgressHUD'
pod 'StatefulViewController'
pod 'QRCodeReaderViewController', :git=>'https://github.com/AlphaWallet/QRCodeReaderViewController.git', :commit=>'09da2d4b835589972ecacd022a75bc27b2c1d1bd'
Expand Down