소스 검색

made computed variable

nayooti 5 년 전
부모
커밋
e610a7c544
1개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 4
      deltachat-ios/Controller/QrPageController.swift

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

@@ -9,7 +9,7 @@ class QrPageController: UIPageViewController, ProgressAlertHandler {
 
 
     private var selectedIndex: Int = 0
     private var selectedIndex: Int = 0
 
 
-    private func getQrCodeHint() -> String {
+    private var getQrCodeHint: String {
         var qrCodeHint = ""
         var qrCodeHint = ""
         if dcContext.isConfigured() {
         if dcContext.isConfigured() {
             // we cannot use dc_contact_get_displayname() as this would result in "Me" instead of the real name
             // we cannot use dc_contact_get_displayname() as this would result in "Me" instead of the real name
@@ -55,7 +55,7 @@ class QrPageController: UIPageViewController, ProgressAlertHandler {
         delegate = self
         delegate = self
         navigationItem.titleView = qrSegmentControl
         navigationItem.titleView = qrSegmentControl
 
 
-        let qrController = QrViewController(dcContext: dcContext, qrCodeHint: getQrCodeHint())
+        let qrController = QrViewController(dcContext: dcContext, qrCodeHint: getQrCodeHint)
         setViewControllers(
         setViewControllers(
             [qrController],
             [qrController],
             direction: .forward,
             direction: .forward,
@@ -83,7 +83,7 @@ class QrPageController: UIPageViewController, ProgressAlertHandler {
     // MARK: - actions
     // MARK: - actions
     @objc private func qrSegmentControlChanged(_ sender: UISegmentedControl) {
     @objc private func qrSegmentControlChanged(_ sender: UISegmentedControl) {
         if sender.selectedSegmentIndex == 0 {
         if sender.selectedSegmentIndex == 0 {
-            let qrController = QrViewController(dcContext: dcContext, qrCodeHint: getQrCodeHint())
+            let qrController = QrViewController(dcContext: dcContext, qrCodeHint: getQrCodeHint)
             setViewControllers([qrController], direction: .reverse, animated: true, completion: nil)
             setViewControllers([qrController], direction: .reverse, animated: true, completion: nil)
         } else {
         } else {
             let qrCodeReaderController = makeQRReader()
             let qrCodeReaderController = makeQRReader()
@@ -119,7 +119,7 @@ extension QrPageController: UIPageViewControllerDataSource, UIPageViewController
         if viewController is QrViewController {
         if viewController is QrViewController {
             return nil
             return nil
         }
         }
-        return QrViewController(dcContext: dcContext, qrCodeHint: getQrCodeHint())
+        return QrViewController(dcContext: dcContext, qrCodeHint: getQrCodeHint)
     }
     }
 
 
     func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? {
     func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? {