Pārlūkot izejas kodu

set segment titles - set coordinator

nayooti 5 gadi atpakaļ
vecāks
revīzija
169487cd92

+ 1 - 1
deltachat-ios.xcodeproj/project.pbxproj

@@ -798,13 +798,13 @@
 				AEA0F6A024474146009F887B /* ProfileInfoViewController.swift */,
 				789E879521D6CB58003ED1C5 /* QrCodeReaderController.swift */,
 				30A4D9AD2332672600544344 /* QrInviteViewController.swift */,
+				AECEF03D244F2D55006C90DA /* QRPageController.swift */,
 				30149D9222F21129003C12B5 /* QrViewController.swift */,
 				B21005DA23383664004C70C5 /* SettingsClassicViewController.swift */,
 				78E45E3921D3CFBC00D4B15E /* SettingsController.swift */,
 				B20462E32440A4A600367A57 /* SettingsAutodelOverviewController.swift */,
 				B20462E52440C99600367A57 /* SettingsAutodelSetController.swift */,
 				AE76E5ED242BF2EA003CF461 /* WelcomeViewController.swift */,
-				AECEF03D244F2D55006C90DA /* QRPageController.swift */,
 			);
 			path = Controller;
 			sourceTree = "<group>";

+ 1 - 1
deltachat-ios/Controller/QRPageController.swift

@@ -11,7 +11,7 @@ class QRPageController: UIPageViewController {
     private var selectedIndex: Int = 0
 
     private lazy var qrSegmentControl: UISegmentedControl = {
-        let control = UISegmentedControl(items: ["Show Left", "Show Right"])
+        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

+ 2 - 2
deltachat-ios/Coordinator/AppCoordinator.swift

@@ -45,9 +45,9 @@ class AppCoordinator: NSObject, Coordinator {
 
     private lazy var qrPageController: UIViewController = {
         let pageController = QRPageController(dcContext: dcContext)
-        let dummyVC = UIViewController()
-        dummyVC.view.backgroundColor = .green
         let nav = UINavigationController(rootViewController: pageController)
+        let coordinator = QrViewCoordinator(navigationController: nav)
+        pageController.coordinator = coordinator
         let settingsImage = UIImage(named: "qr_code")
         nav.tabBarItem = UITabBarItem(title: String.localized("qr_code"), image: settingsImage, tag: qrTab)
         return nav