ru locale update for ios, refs #10496
This commit is contained in:
@@ -28,15 +28,15 @@ extension ZBarSymbolSet: Sequence {
|
||||
enum ButtonState {
|
||||
case card
|
||||
case phone
|
||||
|
||||
|
||||
var icon: UIImage {
|
||||
|
||||
|
||||
switch self {
|
||||
case .card: return UIImage(named: "card")!
|
||||
case .phone: return UIImage(named: "phone")!
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
var searchType: String {
|
||||
switch self {
|
||||
case .card: return "card"
|
||||
@@ -50,14 +50,14 @@ extension ZBarSymbolSet: Sequence {
|
||||
|
||||
var platformChannel: FlutterMethodChannel?
|
||||
let readerViewController = ZBarReaderViewController()
|
||||
|
||||
|
||||
|
||||
|
||||
//Вьюшка для верхнего меню
|
||||
let topView = UIView()
|
||||
|
||||
|
||||
//Окно ввода кода
|
||||
let textField = UITextField()
|
||||
|
||||
|
||||
//Кнопка настроек
|
||||
var settingButton: UIButton!
|
||||
|
||||
@@ -76,15 +76,15 @@ extension ZBarSymbolSet: Sequence {
|
||||
|
||||
func getCardHint() -> String {
|
||||
switch self.appLocale {
|
||||
case .ru: return "Ввести номер карты вручную"
|
||||
default: return "Enter the barcode manually"
|
||||
case .ru: return "Ввести номер карты"
|
||||
default: return "Enter the barcode"
|
||||
}
|
||||
}
|
||||
|
||||
func getPhoneHint() -> String {
|
||||
switch self.appLocale {
|
||||
case .ru: return "Ввести номер телефона вручную"
|
||||
default: return "Enter the phone manually"
|
||||
case .ru: return "Телефон 79XXXXXXXXX"
|
||||
default: return "Phone 79XXXXXXXXX"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -129,43 +129,43 @@ extension ZBarSymbolSet: Sequence {
|
||||
default: return "Dismiss"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
|
||||
readerViewController.readerDelegate = self
|
||||
readerViewController.readerView.zoom = 1.0
|
||||
readerViewController.showsZBarControls = false
|
||||
|
||||
|
||||
settingButton = UIButton(type: .system)
|
||||
settingButton.addTarget(self, action: #selector(ScannerViewController.buttonTouch), for: .touchUpInside)
|
||||
|
||||
|
||||
self.addChildViewController(readerViewController)
|
||||
self.view.addSubview(readerViewController.view)
|
||||
readerViewController.didMove(toParentViewController: self)
|
||||
|
||||
|
||||
readerViewController.view.addSubview(topView)
|
||||
topView.addSubview(textField)
|
||||
topView.addSubview(settingButton)
|
||||
|
||||
|
||||
textField.delegate = self
|
||||
//textField.keyboardType = .numberPad
|
||||
|
||||
|
||||
//Looks for single or multiple taps.
|
||||
let tap = UITapGestureRecognizer(target: self, action: #selector(ScannerViewController.hideKeyboard))
|
||||
readerViewController.view.addGestureRecognizer(tap)
|
||||
|
||||
|
||||
settingButton.setImage(self.buttonState.icon, for: .normal)
|
||||
textField.placeholder = self.getInputHint()
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
func hideKeyboard() {
|
||||
view.endEditing(false)
|
||||
}
|
||||
|
||||
|
||||
func buttonTouch(){
|
||||
|
||||
|
||||
switch self.buttonState {
|
||||
case .card: self.buttonState = .phone
|
||||
case .phone: self.buttonState = .card
|
||||
@@ -173,20 +173,20 @@ extension ZBarSymbolSet: Sequence {
|
||||
settingButton.setImage(self.buttonState.icon, for: .normal)
|
||||
textField.placeholder = self.getInputHint()
|
||||
}
|
||||
|
||||
|
||||
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
|
||||
|
||||
sendResult(textField.text!)
|
||||
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
|
||||
func sendResult(_ str: String) {
|
||||
platformChannel?.invokeMethod("findUser", arguments: [str, buttonState.searchType], result: { (result: Any?) in
|
||||
if result is FlutterError {
|
||||
self.showErrorAlert(str)
|
||||
} else {
|
||||
|
||||
|
||||
self.dismiss(animated: true) {
|
||||
self.platformChannel?.invokeMethod("purchase", arguments: [result, str])
|
||||
}
|
||||
@@ -195,7 +195,7 @@ extension ZBarSymbolSet: Sequence {
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
|
||||
func showErrorAlert(_ str: String) {
|
||||
let alertController = UIAlertController(
|
||||
title: self.getErrorTitle(),
|
||||
@@ -203,33 +203,33 @@ extension ZBarSymbolSet: Sequence {
|
||||
preferredStyle: UIAlertControllerStyle.alert
|
||||
)
|
||||
alertController.addAction(UIAlertAction(title: self.getDismissText(), style: UIAlertActionStyle.default,handler: nil))
|
||||
|
||||
|
||||
// if let appDelegate = UIApplication.shared.delegate as? FlutterAppDelegate {
|
||||
// appDelegate.window.rootViewController?.present(alertController, animated: true, completion: nil)
|
||||
// }
|
||||
self.present(alertController, animated: true, completion: nil)
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
override func viewWillAppear(_ animated: Bool) {
|
||||
topView.backgroundColor = UIColor.white
|
||||
textField.borderStyle = .roundedRect
|
||||
super.viewWillAppear(animated)
|
||||
}
|
||||
|
||||
|
||||
override func viewDidAppear(_ animated: Bool) {
|
||||
super.viewDidAppear(animated)
|
||||
}
|
||||
|
||||
|
||||
override func viewWillLayoutSubviews() {
|
||||
|
||||
|
||||
readerViewController.view.frame = view.bounds
|
||||
topView.frame = CGRect(x: 0, y: 0, width: readerViewController.view.frame.size.width, height: 40)
|
||||
textField.frame = CGRect(x: settingButton.frame.maxX + 8 + 20 + 5, y: 5, width: readerViewController.view.frame.size.width - 50, height: 30)
|
||||
settingButton.frame = CGRect(x: 8, y: 10, width: 20, height: 20)
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) {
|
||||
guard let symbols = info[ZBarReaderControllerResults] as? ZBarSymbolSet else { return }
|
||||
|
||||
@@ -237,12 +237,12 @@ extension ZBarSymbolSet: Sequence {
|
||||
|
||||
if let symbol = symbol as? ZBarSymbol, let data = symbol.data {
|
||||
sendResult(data)
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
override func didReceiveMemoryWarning() {
|
||||
super.didReceiveMemoryWarning()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user