|
@@ -11,7 +11,9 @@ class QrPageController: UIPageViewController, ProgressAlertHandler {
|
|
|
private var selectedIndex: Int = 0
|
|
|
|
|
|
private lazy var qrSegmentControl: UISegmentedControl = {
|
|
|
- let control = UISegmentedControl(items: [String.localized("qrshow_title"), String.localized("qrscan_title")])
|
|
|
+ let control = UISegmentedControl(
|
|
|
+ items: [String.localized("qrshow_title"), String.localized("qrscan_title")]
|
|
|
+ )
|
|
|
control.tintColor = DcColors.primary
|
|
|
control.addTarget(self, action: #selector(qrSegmentControlChanged), for: .valueChanged)
|
|
|
control.selectedSegmentIndex = 0
|
|
@@ -34,7 +36,7 @@ class QrPageController: UIPageViewController, ProgressAlertHandler {
|
|
|
delegate = self
|
|
|
navigationItem.titleView = qrSegmentControl
|
|
|
|
|
|
- let qrController = makeQrViewController()
|
|
|
+ let qrController = QrViewController(dcContext: dcContext)
|
|
|
setViewControllers(
|
|
|
[qrController],
|
|
|
direction: .forward,
|
|
@@ -50,7 +52,7 @@ class QrPageController: UIPageViewController, ProgressAlertHandler {
|
|
|
// MARK: - actions
|
|
|
@objc private func qrSegmentControlChanged(_ sender: UISegmentedControl) {
|
|
|
if sender.selectedSegmentIndex == 0 {
|
|
|
- let qrController = makeQrViewController()
|
|
|
+ let qrController = QrViewController(dcContext: dcContext)
|
|
|
setViewControllers([qrController], direction: .reverse, animated: true, completion: nil)
|
|
|
} else {
|
|
|
let qrCodeReaderController = makeQRReader()
|
|
@@ -59,11 +61,6 @@ class QrPageController: UIPageViewController, ProgressAlertHandler {
|
|
|
}
|
|
|
|
|
|
// MARK: - factory
|
|
|
- private func makeQrViewController() -> QrViewController {
|
|
|
- let controller = QrViewController(dcContext: dcContext)
|
|
|
- return controller
|
|
|
- }
|
|
|
-
|
|
|
private func makeQRReader() -> QrCodeReaderController {
|
|
|
let qrReader = QrCodeReaderController()
|
|
|
qrReader.delegate = self
|
|
@@ -77,7 +74,7 @@ extension QrPageController: UIPageViewControllerDataSource, UIPageViewController
|
|
|
if viewController is QrViewController {
|
|
|
return nil
|
|
|
}
|
|
|
- return makeQrViewController()
|
|
|
+ return QrViewController(dcContext: dcContext)
|
|
|
}
|
|
|
|
|
|
func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? {
|