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