瀏覽代碼

remove scanQRCell

nayooti 5 年之前
父節點
當前提交
19e2723575
共有 2 個文件被更改,包括 1 次插入30 次删除
  1. 1 0
      deltachat-ios/Controller/QRPageController.swift
  2. 0 30
      deltachat-ios/Controller/QrViewController.swift

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

@@ -25,6 +25,7 @@ class QRPageController: UIPageViewController {
         let control = UISegmentedControl(items: ["Show Left", "Show Right"])
         control.tintColor = DcColors.primary
         control.addTarget(self, action: #selector(qrSegmentControlChanged), for: .valueChanged)
+        control.selectedSegmentIndex = 0
         return control
     }()
 

+ 0 - 30
deltachat-ios/Controller/QrViewController.swift

@@ -4,7 +4,6 @@ import DcCore
 
 class QrViewController: UITableViewController {
     private let rowQRCode = 0
-    private let rowScanQR = 1
 
     weak var coordinator: QrViewCoordinator?
     let qrCodeReaderController = QrCodeReaderController()
@@ -39,8 +38,6 @@ class QrViewController: UITableViewController {
         switch row {
         case rowQRCode:
             return createQRCodeCell()
-        case rowScanQR:
-            return createQRCodeScanCell()
         default:
             return UITableViewCell(style: .default, reuseIdentifier: nil)
         }
@@ -58,8 +55,6 @@ class QrViewController: UITableViewController {
         switch indexPath.row {
         case rowQRCode:
             return 325
-        case rowScanQR:
-            return 48
         default:
             return 10
         }
@@ -178,17 +173,6 @@ class QrViewController: UITableViewController {
         return cell
     }
 
-    private func createQRCodeScanCell() -> UITableViewCell {
-        let cell = UITableViewCell(style: .default, reuseIdentifier: "scanQR")
-        let scanButton = createQRCodeScannerButton()
-        cell.contentView.addSubview(scanButton)
-        cell.selectionStyle = .none
-        let scanButtonConstraints = [scanButton.constraintCenterXTo(cell.contentView),
-                                     scanButton.constraintCenterYTo(cell.contentView)]
-        cell.contentView.addConstraints(scanButtonConstraints)
-        return cell
-    }
-
     private func createInfoLabel() -> UIView {
         let label = UILabel.init()
         label.translatesAutoresizingMaskIntoConstraints = false
@@ -202,20 +186,6 @@ class QrViewController: UITableViewController {
         return label
     }
 
-    private func createQRCodeScannerButton() -> UIView {
-        let btn = UIButton.init(type: UIButton.ButtonType.system)
-        btn.translatesAutoresizingMaskIntoConstraints = false
-        btn.setTitle(String.localized("qrscan_title"), for: .normal)
-        btn.addTarget(self, action: #selector(self.openQRCodeScanner), for: .touchUpInside)
-        return btn
-    }
-
-    @objc func openQRCodeScanner() {
-        let nav = UINavigationController(rootViewController: qrCodeReaderController)
-        nav.modalPresentationStyle = .fullScreen
-        present(nav, animated: true)
-    }
-
     private func createQRCodeView() -> UIView {
         let width: CGFloat = 230
         let frame = CGRect(origin: .zero, size: .init(width: width, height: width))