nayooti 5 роки тому
батько
коміт
be0dc95946

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

@@ -151,7 +151,7 @@
 		AEACE2E51FB32E1900DCDD78 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEACE2E41FB32E1900DCDD78 /* Utils.swift */; };
 		AEC67A1C241CE9E4007DDBE1 /* AppStateRestorer.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEC67A1B241CE9E4007DDBE1 /* AppStateRestorer.swift */; };
 		AEC67A1E241FCFE0007DDBE1 /* ChatListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEC67A1D241FCFE0007DDBE1 /* ChatListViewModel.swift */; };
-		AECEF03E244F2D55006C90DA /* QRPageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AECEF03D244F2D55006C90DA /* QRPageController.swift */; };
+		AECEF03E244F2D55006C90DA /* QrPageController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AECEF03D244F2D55006C90DA /* QrPageController.swift */; };
 		AEE56D762253431E007DC082 /* AccountSetupController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEE56D752253431E007DC082 /* AccountSetupController.swift */; };
 		AEE56D7D2253ADB4007DC082 /* HudHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEE56D7C2253ADB4007DC082 /* HudHandler.swift */; };
 		AEE56D80225504DB007DC082 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEE56D7F225504DB007DC082 /* Extensions.swift */; };
@@ -403,7 +403,7 @@
 		AEACE2E41FB32E1900DCDD78 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
 		AEC67A1B241CE9E4007DDBE1 /* AppStateRestorer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppStateRestorer.swift; sourceTree = "<group>"; };
 		AEC67A1D241FCFE0007DDBE1 /* ChatListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatListViewModel.swift; sourceTree = "<group>"; };
-		AECEF03D244F2D55006C90DA /* QRPageController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRPageController.swift; sourceTree = "<group>"; };
+		AECEF03D244F2D55006C90DA /* QrPageController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QrPageController.swift; sourceTree = "<group>"; };
 		AEE56D752253431E007DC082 /* AccountSetupController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountSetupController.swift; sourceTree = "<group>"; tabWidth = 4; };
 		AEE56D7C2253ADB4007DC082 /* HudHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HudHandler.swift; sourceTree = "<group>"; };
 		AEE56D7F225504DB007DC082 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
@@ -798,7 +798,7 @@
 				AEA0F6A024474146009F887B /* ProfileInfoViewController.swift */,
 				789E879521D6CB58003ED1C5 /* QrCodeReaderController.swift */,
 				30A4D9AD2332672600544344 /* QrInviteViewController.swift */,
-				AECEF03D244F2D55006C90DA /* QRPageController.swift */,
+				AECEF03D244F2D55006C90DA /* QrPageController.swift */,
 				30149D9222F21129003C12B5 /* QrViewController.swift */,
 				B21005DA23383664004C70C5 /* SettingsClassicViewController.swift */,
 				78E45E3921D3CFBC00D4B15E /* SettingsController.swift */,
@@ -1301,7 +1301,7 @@
 				AE851AC5227C755A00ED86F0 /* Protocols.swift in Sources */,
 				AE728F15229D5C390047565B /* PhotoPickerAlertAction.swift in Sources */,
 				305961F42346125100C80F33 /* TextMessageCell.swift in Sources */,
-				AECEF03E244F2D55006C90DA /* QRPageController.swift in Sources */,
+				AECEF03E244F2D55006C90DA /* QrPageController.swift in Sources */,
 				AEACE2E31FB32B5C00DCDD78 /* Constants.swift in Sources */,
 				305962052346125100C80F33 /* ContactMessageSizeCalculator.swift in Sources */,
 			);

+ 3 - 3
deltachat-ios/Controller/QrPageController.swift

@@ -1,7 +1,7 @@
 import UIKit
 import DcCore
 
-class QRPageController: UIPageViewController, ProgressAlertHandler {
+class QrPageController: UIPageViewController, ProgressAlertHandler {
 
     weak var coordinator: QrViewCoordinator?
 
@@ -70,7 +70,7 @@ class QRPageController: UIPageViewController, ProgressAlertHandler {
 }
 
 // MARK: - UIPageViewControllerDataSource, UIPageViewControllerDelegate
-extension QRPageController: UIPageViewControllerDataSource, UIPageViewControllerDelegate {
+extension QrPageController: UIPageViewControllerDataSource, UIPageViewControllerDelegate {
     func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? {
         if viewController is QrViewController {
             return nil
@@ -97,7 +97,7 @@ extension QRPageController: UIPageViewControllerDataSource, UIPageViewController
 }
 
 // MARK: - QRCodeDelegate
-extension QRPageController: QrCodeReaderDelegate {
+extension QrPageController: QrCodeReaderDelegate {
 
     func handleQrCode(_ code: String) {
         self.processQrCode(code)

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

@@ -44,7 +44,7 @@ class AppCoordinator: NSObject, Coordinator {
     // MARK: viewControllers
 
     private lazy var qrPageController: UIViewController = {
-        let pageController = QRPageController(dcContext: dcContext)
+        let pageController = QrPageController(dcContext: dcContext)
         let nav = UINavigationController(rootViewController: pageController)
         let coordinator = QrViewCoordinator(navigationController: nav)
         self.childCoordinators.append(coordinator)