浏览代码

update qrCode too

nayooti 5 年之前
父节点
当前提交
42ef1b8a68
共有 1 个文件被更改,包括 13 次插入14 次删除
  1. 13 14
      deltachat-ios/Controller/QrViewController.swift

+ 13 - 14
deltachat-ios/Controller/QrViewController.swift

@@ -23,7 +23,8 @@ class QrViewController: UIViewController {
 
 
     var qrCodeHint: String {
     var qrCodeHint: String {
         willSet {
         willSet {
-            qrContentView.hintText = newValue
+            let qrCode = dcContext.getSecurejoinQr(chatId: chatId)
+            qrContentView.update(qrCode: qrCode, hint: newValue)
         }
         }
     }
     }
     private let chatId: Int
     private let chatId: Int
@@ -90,12 +91,6 @@ class QrViewController: UIViewController {
 // MARK: - QrViewContentView
 // MARK: - QrViewContentView
 class QrViewContentView: UIView {
 class QrViewContentView: UIView {
 
 
-    var hintText: String? {
-        willSet {
-            hintLabel.text = newValue
-        }
-    }
-
     private var qrCodeView: QRCodeView = {
     private var qrCodeView: QRCodeView = {
         let view = QRCodeView(frame: .zero)
         let view = QRCodeView(frame: .zero)
         return view
         return view
@@ -108,7 +103,6 @@ class QrViewContentView: UIView {
         label.textAlignment = .center
         label.textAlignment = .center
         label.font = .preferredFont(forTextStyle: .subheadline)
         label.font = .preferredFont(forTextStyle: .subheadline)
         label.adjustsFontForContentSizeCategory = true
         label.adjustsFontForContentSizeCategory = true
-        label.text = hintText
         return label
         return label
     }()
     }()
 
 
@@ -126,7 +120,16 @@ class QrViewContentView: UIView {
 
 
     init(qrCode: String?, hint: String) {
     init(qrCode: String?, hint: String) {
         super.init(frame: .zero)
         super.init(frame: .zero)
-        hintText = hint
+        update(qrCode: qrCode, hint: hint)
+        setupSubviews()
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    // MARK: - update
+    func update(qrCode: String?, hint: String?) {
         if let qrCode = qrCode {
         if let qrCode = qrCode {
             qrCodeView.generateCode(
             qrCodeView.generateCode(
                 qrCode,
                 qrCode,
@@ -134,11 +137,7 @@ class QrViewContentView: UIView {
                 backgroundColor: .white
                 backgroundColor: .white
             )
             )
         }
         }
-        setupSubviews()
-    }
-
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
+        hintLabel.text = hint
     }
     }
 
 
     private func setupSubviews() {
     private func setupSubviews() {